SmartDukaan – /trunk/Support/src/main/java/in/

Rev 3897 – Started catching the Exception class in place of TException

chandranshu — Tue, 25 Oct 2011 16:28:54 +0530

chandranshu – 1 file(s) modified
Started catching the Exception class in place of TException

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java

Rev 3867 – Added support to close a purchase

chandranshu — Mon, 24 Oct 2011 14:26:38 +0530

chandranshu – 2 file(s) modified
Added support to close a purchase

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 3501 – Trac#504 Removing unnecessary txn lookup

mandeep.dhir — Fri, 30 Sep 2011 15:28:39 +0530

mandeep.dhir – 1 file(s) modified
Trac#504 Removing unnecessary txn lookup

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 3449 – Added a courier-reconciliation report. Removed some unused classes.

chandranshu — Tue, 27 Sep 2011 18:48:52 +0530

chandranshu – 9 file(s) modified
Added a courier-reconciliation report. Removed some unused classes.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
x /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
x /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-reconciliation-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/payment-details-authsuccess.vm

Rev 3427 – Added the courier reconciliation report

chandranshu — Mon, 26 Sep 2011 18:19:36 +0530

chandranshu – 9 file(s) modified
Added the courier reconciliation report

~ /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/CourierReconciliationController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-reconciliation-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3423 – Started showing error messages on the UI for processing purchases

chandranshu — Mon, 26 Sep 2011 16:17:42 +0530

chandranshu – 3 file(s) modified
Started showing error messages on the UI for processing purchases

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 3420 – Added support to record error messages

chandranshu — Mon, 26 Sep 2011 11:12:38 +0530

chandranshu – 1 file(s) modified
Added support to record error messages

~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java

Rev 3389 – Dashboard to monitor coupon statistics.

varun.gupta — Wed, 21 Sep 2011 11:52:22 +0530

varun.gupta – 2 file(s) modified
Dashboard to monitor coupon statistics.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/promotions-index.vm

Rev 3381 – Added support to scan in items against a Purchase Order

chandranshu — Tue, 20 Sep 2011 14:51:58 +0530

chandranshu – 9 file(s) modified
Added support to scan in items against a Purchase Order

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/WarehouseController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-create.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-show.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/warehouse-index.vm

Rev 3378 – Get rid of string column to store the event type.

vikas — Tue, 20 Sep 2011 13:13:41 +0530

vikas – 13 file(s) modified
Get rid of string column to store the event type.

~ /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/UserDataAccessors.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
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java

Rev 3364 – Added inventory stock report to the reports dashboard

chandranshu — Mon, 19 Sep 2011 16:41:35 +0530

chandranshu – 4 file(s) modified
Added inventory stock report to the reports dashboard

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/utils/FileUtils.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/stock-reports-index.vm

Rev 3343 – Add Total row.

vikas — Fri, 16 Sep 2011 15:41:38 +0530

vikas – 1 file(s) modified
Add Total row.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 3341 – Fix a bug. Check for only orderd that are delivered ...

vikas — Fri, 16 Sep 2011 14:06:46 +0530

vikas – 1 file(s) modified
Fix a bug. Check for only orderd that are delivered successfully.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 3326 – Added support to update the inventory history and inventory snapshot ...

chandranshu — Thu, 15 Sep 2011 16:52:52 +0530

chandranshu – 1 file(s) modified
Added support to update the inventory history and inventory snapshot on different machines

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Rev 3315 – Changes to affilate report as per Satya.

vikas — Thu, 15 Sep 2011 15:06:29 +0530

vikas – 2 file(s) modified
Changes to affilate report as per Satya.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm

Rev 3293 – Make affiliate report secured. Added date range filter for reports.

vikas — Wed, 14 Sep 2011 15:38:09 +0530

vikas – 8 file(s) modified
Make affiliate report secured. Added date range filter for reports.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3214 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:54:52 +0530

chandranshu – 1 file(s) modified
Removed printStackTrace

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java

Rev 3213 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:39:43 +0530

chandranshu – 8 file(s) modified
Removed printStackTrace

Rev 3166 – Added authorized payments to the payment details report

chandranshu — Fri, 02 Sep 2011 11:03:56 +0530

chandranshu – 1 file(s) modified
Added authorized payments to the payment details report

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 3125 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:09:54 +0530

rajveer – 17 file(s) modified
Side effect of name changing of clients.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java

Rev 3107 – Added more logging statements and removed the newline in warehouse ...

chandranshu — Wed, 31 Aug 2011 13:35:05 +0530

chandranshu – 3 file(s) modified
Added more logging statements and removed the newline in warehouse location

~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java

Rev 3105 – Replaced e.printStackTraces with logger.error

chandranshu — Wed, 31 Aug 2011 13:17:39 +0530

chandranshu – 5 file(s) modified
Replaced e.printStackTraces with logger.error

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 3104 – Added logging using logger

chandranshu — Wed, 31 Aug 2011 12:37:28 +0530

chandranshu – 1 file(s) modified
Added logging using logger

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Rev 3078 – Showing status description instead of status name

chandranshu — Mon, 29 Aug 2011 13:00:02 +0530

chandranshu – 1 file(s) modified
Showing status description instead of status name

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java

Rev 3071 – Added support to display the type of order and added ...

chandranshu — Mon, 29 Aug 2011 11:56:50 +0530

chandranshu – 2 file(s) modified
Added support to display the type of order and added logging messages

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm

Rev 3062 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:35:14 +0530

chandranshu – 5 file(s) modified
Changes for COD

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm

Rev 3044 – Changes to accomodate multiple details for the same provider ensuring ...

chandranshu — Thu, 25 Aug 2011 13:37:14 +0530

chandranshu – 18 file(s) modified
Changes to accomodate multiple details for the same provider ensuring all existing things will continue to work

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.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/logistics/service/script/AwbNumberLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/DeliveryType.java
~ /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/logistics/ProviderDetails.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 2980 – Only list completed orders in affiliate report.

vikas — Thu, 18 Aug 2011 19:02:43 +0530

vikas – 1 file(s) modified
Only list completed orders in affiliate report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2904 – Added javadocs to classes explaining what they intend to do

chandranshu — Wed, 10 Aug 2011 17:47:30 +0530

chandranshu – 3 file(s) modified
Added javadocs to classes explaining what they intend to do

Rev 2785 – Ignored the Reshipped orders from the Payment Details report

chandranshu — Mon, 01 Aug 2011 15:54:00 +0530

chandranshu – 1 file(s) modified
Ignored the Reshipped orders from the Payment Details report

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 2784 – Added support for our own billing.

chandranshu — Mon, 01 Aug 2011 14:54:31 +0530

chandranshu – 4 file(s) modified
Added support for our own billing.

~ /trunk/Support/pom.xml
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authfail.vm

Rev 2501 – Support to generate single report for all affiliates.

vikas — Fri, 08 Jul 2011 16:48:59 +0530

vikas – 2 file(s) modified
Support to generate single report for all affiliates.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/affiliate-report.vm

Rev 2492 – Added hotspot reconciliation report to reports dashboard. Back to dashboard ...

ankur.singhal — Thu, 07 Jul 2011 19:50:54 +0530

ankur.singhal – 4 file(s) modified
Added hotspot reconciliation report to reports dashboard. Back to dashboard link in user orders report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/hotspot-reconciliation-report.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-orders-report.vm

Rev 2393 – Remove duplicate payments from affiliate report.

vikas — Thu, 30 Jun 2011 18:34:50 +0530

vikas – 1 file(s) modified
Remove duplicate payments from affiliate report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2360 – [Trac#410]: Added order Id

ankur.singhal — Wed, 29 Jun 2011 14:16:06 +0530

ankur.singhal – 1 file(s) modified
[Trac#410]: Added order Id

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java

Rev 2345 – Fix some bugs in affiliate reports.

vikas — Mon, 27 Jun 2011 16:29:18 +0530

vikas – 1 file(s) modified
Fix some bugs in affiliate reports.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2340 – add item name and amount in affiliate report.

vikas — Mon, 27 Jun 2011 13:40:34 +0530

vikas – 1 file(s) modified
add item name and amount in affiliate report.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java

Rev 2310 – Added payment method in the report. Also done some formatting

ankur.singhal — Wed, 22 Jun 2011 15:25:37 +0530

ankur.singhal – 1 file(s) modified
Added payment method in the report. Also done some formatting

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 2190 – Removed an unused field

chandranshu — Tue, 14 Jun 2011 17:38:40 +0530

chandranshu – 1 file(s) modified
Removed an unused field

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java

Rev 2090 – added column GatewayTxnStatus in the report.

ankur.singhal — Tue, 07 Jun 2011 14:15:16 +0530

ankur.singhal – 1 file(s) modified
added column GatewayTxnStatus in the report.

~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java