SmartDukaan – /

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

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

Rev 680 – Thrift files for Payments

rajveer — Thu, 27 Jan 2011 16:45:46 +0530

rajveer – 2 file(s) modified
Thrift files for Payments

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

Rev 679 – Added support for courier companies to download the daily report

chandranshu — Thu, 27 Jan 2011 03:38:06 +0530

chandranshu – 6 file(s) modified
Added support for courier companies to download the daily report

~ /trunk/Support/.classpath
~ /trunk/Support/build.xml
+ /trunk/Support/src/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/in/shop2020/support/services/ManifestGenerator.java
+ /trunk/Support/WebContent/WEB-INF/content/courier-details-lsuccess.vm

Rev 678 – Added the latest version of Apache POI for creating spreadsheets, ...

chandranshu — Thu, 27 Jan 2011 03:34:32 +0530

chandranshu – 17 file(s) modified
Added the latest version of Apache POI for creating spreadsheets, documents, ppts, etc

+ /trunk/thirdparty/readonly/apache/poi-3.7
+ /trunk/thirdparty/readonly/apache/poi-3.7/lib
+ /trunk/thirdparty/readonly/apache/poi-3.7/lib/commons-logging-1.1.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/lib/junit-3.8.1.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/lib/log4j-1.2.13.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/LICENSE
+ /trunk/thirdparty/readonly/apache/poi-3.7/NOTICE
+ /trunk/thirdparty/readonly/apache/poi-3.7/ooxml-lib
+ /trunk/thirdparty/readonly/apache/poi-3.7/ooxml-lib/dom4j-1.6.1.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/ooxml-lib/xmlbeans-2.3.0.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/poi-3.7-20101029.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/poi-examples-3.7-20101029.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/poi-ooxml-3.7-20101029.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/poi-ooxml-schemas-3.7-20101029.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/poi-scratchpad-3.7-20101029.jar
+ /trunk/thirdparty/readonly/apache/poi-3.7/RELEASE_NOTES.txt

Rev 677 – Added option to print the manifest file from the dashboard ...

chandranshu — Thu, 27 Jan 2011 01:50:07 +0530

chandranshu – 4 file(s) modified
Added option to print the manifest file from the dashboard by selecting a provider

~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
+ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/ProviderInfoBox.java
+ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/LogisticsUtils.java

Rev 676 – Added support to generate the manifest file

chandranshu — Thu, 27 Jan 2011 01:48:16 +0530

chandranshu – 4 file(s) modified
Added support to generate the manifest file

+ /trunk/Support/src/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/in/shop2020/support/services/InvoiceGenerationService.java
+ /trunk/Support/src/in/shop2020/support/services/ManifestGenerator.java
+ /trunk/Support/WebContent/WEB-INF/content/manifest-lsuccess.vm

Rev 675 – Added impl for method getAllProviders to logistics

chandranshu — Thu, 27 Jan 2011 01:45:34 +0530

chandranshu – 3 file(s) modified
Added impl for method getAllProviders to logistics

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

Rev 674 – Generated java code for an added method

chandranshu — Thu, 27 Jan 2011 01:43:58 +0530

chandranshu – 1 file(s) modified
Generated java code for an added method

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

Rev 673 – Added a method to the Logistics Service to get all ...

chandranshu — Thu, 27 Jan 2011 01:43:11 +0530

chandranshu – 1 file(s) modified
Added a method to the Logistics Service to get all providers

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

Rev 672 – Changed delivery cutoff time to be 3pm from 5pm

chandranshu — Wed, 26 Jan 2011 19:08:03 +0530

chandranshu – 1 file(s) modified
Changed delivery cutoff time to be 3pm from 5pm

~ /trunk/Common/conf/shop2020.cfg

Rev 671 – Removed duplicated code for converting a thrift order to an ...

chandranshu — Wed, 26 Jan 2011 19:02:01 +0530

chandranshu – 12 file(s) modified
Removed duplicated code for converting a thrift order to an order from 10 different places.

~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/AllOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/BilledOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/NostockOrderhandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/NostockOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/RejectedOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/ShippedOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/shared/actions/Order.java

Rev 670 – Changed the InvoiceGenerationService to print the invoice in the new ...

chandranshu — Wed, 26 Jan 2011 18:59:00 +0530

chandranshu – 5 file(s) modified
Changed the InvoiceGenerationService to print the invoice in the new format. Added the Barcode font and Spice logo to the classpath. Added the ThriftConfig project to the classpath and removed the dependency on the JAR in the lib folder

~ /trunk/Support/.classpath
~ /trunk/Support/src/in/shop2020/support/services/InvoiceGenerationService.java
+ /trunk/Support/WebContent/WEB-INF/classes
+ /trunk/Support/WebContent/WEB-INF/classes/C39TXME.TTF
+ /trunk/Support/WebContent/WEB-INF/classes/logo.png

Rev 669 – Changed for printing the invoice

chandranshu — Wed, 26 Jan 2011 18:56:02 +0530

chandranshu – 11 file(s) modified
Changed for printing the invoice

~ /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/DataService.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
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 668 – Generated java files for changed to Order, LineItem and Provider

chandranshu — Wed, 26 Jan 2011 18:54:26 +0530

chandranshu – 4 file(s) modified
Generated java files for changed to Order, LineItem and Provider

~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/in/shop2020/logistics/Provider.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/Order.java

Rev 667 – Changed for printing the invoice. Added city and state information ...

chandranshu — Wed, 26 Jan 2011 18:53:06 +0530

chandranshu – 2 file(s) modified
Changed for printing the invoice. Added city and state information to the order and color to the lineItem

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