SmartDukaan – /

Rev 740 – Added a private constructor back to Order which was accidentally ...

chandranshu — Wed, 02 Feb 2011 14:04:47 +0530

chandranshu – 1 file(s) modified
Added a private constructor back to Order which was accidentally deleted

~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/shared/actions/Order.java

Rev 739 – Added support to create entities for items in process in ...

chandranshu — Wed, 02 Feb 2011 11:22:11 +0530

chandranshu – 2 file(s) modified
Added support to create entities for items in process in catalog

~ /trunk/ContentCreation
~ /trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java

Rev 738 – Removed the unnecessary and unintuitive usage of get_c_status and get_t_status ...

chandranshu — Tue, 01 Feb 2011 19:38:41 +0530

chandranshu – 8 file(s) modified
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

Rev 737 – Started handling the second address line for the Order

chandranshu — Tue, 01 Feb 2011 19:36:51 +0530

chandranshu – 4 file(s) modified
Started handling the second address line for the Order

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

Rev 736 – Added the field for second address line to the Order

chandranshu — Tue, 01 Feb 2011 19:36:13 +0530

chandranshu – 1 file(s) modified
Added the field for second address line to the Order

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

Rev 735 – Added the field for second address line to the Order

chandranshu — Tue, 01 Feb 2011 19:36:00 +0530

chandranshu – 1 file(s) modified
Added the field for second address line to the Order

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

Rev 734 – Started using provider specific barcode. Added the 3-letter code to ...

chandranshu — Tue, 01 Feb 2011 19:33:51 +0530

chandranshu – 11 file(s) modified
Started using provider specific barcode. Added the 3-letter code to the invoice. Started using the new logo.

~ /trunk/Support/build.xml
~ /trunk/Support/src/in/shop2020/support/controllers/InvoiceController.java
~ /trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/in/shop2020/support/services/InvoiceGenerationService.java
+ /trunk/Support/WebContent/WEB-INF/classes/aramex
+ /trunk/Support/WebContent/WEB-INF/classes/aramex/barcode.TTF
+ /trunk/Support/WebContent/WEB-INF/classes/bluedart
+ /trunk/Support/WebContent/WEB-INF/classes/bluedart/barcode.TTF
+ /trunk/Support/WebContent/WEB-INF/classes/bluedart/carrier.TTF
+ /trunk/Support/WebContent/WEB-INF/classes/logo.jpg
~ /trunk/Support/WebContent/WEB-INF/classes/logo.png

Rev 733 – reduced number of call to userclient

rajveer — Tue, 01 Feb 2011 17:32:21 +0530

rajveer – 1 file(s) modified
reduced number of call to userclient

~ /trunk/ContentStore/src/in/shop2020/util/IR.java

Rev 732 – Added a method to get the destination code of a ...

chandranshu — Tue, 01 Feb 2011 17:22:17 +0530

chandranshu – 2 file(s) modified
Added a method to get the destination code of a pincode for a provider

~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py

Rev 731 – Added a method to get the destination code of a ...

chandranshu — Tue, 01 Feb 2011 17:21:44 +0530

chandranshu – 3 file(s) modified
Added a method to get the destination code of a pincode for a provider

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py

Rev 730 – Added a method to get the destination code of a ...

chandranshu — Tue, 01 Feb 2011 17:20:52 +0530

chandranshu – 1 file(s) modified
Added a method to get the destination code of a pincode for a provider

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

Rev 729 – Added a method to get the destination code of a ...

chandranshu — Tue, 01 Feb 2011 17:20:30 +0530

chandranshu – 1 file(s) modified
Added a method to get the destination code of a pincode for a provider

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

Rev 728 – Added KB, GB and MB as memory units.

rajveer — Tue, 01 Feb 2011 10:46:09 +0530

rajveer – 1 file(s) modified
Added KB, GB and MB as memory units.

~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 727 – Added the eclipse output directory to svn ignore list

chandranshu — Mon, 31 Jan 2011 19:16:36 +0530

chandranshu – 1 file(s) modified
Added the eclipse output directory to svn ignore list

~ /trunk/ContentStore

Rev 726 – Corrected a spelling

chandranshu — Mon, 31 Jan 2011 19:14:51 +0530

chandranshu – 1 file(s) modified
Corrected a spelling

~ /trunk/ContentStore/src/in/shop2020/metamodel/util/SequenceGenerator.java

Rev 725 – Added support to mark an item as content complete in ...

chandranshu — Mon, 31 Jan 2011 19:09:46 +0530

chandranshu – 4 file(s) modified
Added support to mark an item as content complete in the catalog

~ /trunk/ContentCreation/.classpath
~ /trunk/ContentCreation/build.xml
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentCreation/src/velocity/entity-index.vm

Rev 724 – Added support to load transfer price and hotspot category

chandranshu — Mon, 31 Jan 2011 19:06:19 +0530

chandranshu – 4 file(s) modified
Added support to load transfer price and hotspot category

~ /trunk/PyProj/src/samplesheets/ItemList.xls
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py

Rev 723 – Added support to mark all items with the same entityId ...

chandranshu — Mon, 31 Jan 2011 19:04:31 +0530

chandranshu – 2 file(s) modified
Added support to mark all items with the same entityId as content complete

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py

Rev 722 – Python files generated for Catalog service

chandranshu — Mon, 31 Jan 2011 19:03:38 +0530

chandranshu – 3 file(s) modified
Python files generated for Catalog service

~ /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

Rev 721 – Java files generated for the catalog service

chandranshu — Mon, 31 Jan 2011 19:02:55 +0530

chandranshu – 3 file(s) modified
Java files generated for the catalog service

~ /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/status.java

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