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

Rev 5241 – Bugfix. Using == instead of equals

mandeep.dhir — Tue, 22 May 2012 16:15:58 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Using == instead of equals

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

Rev 5240 – Creating the client object again

mandeep.dhir — Tue, 22 May 2012 16:05:02 +0530

mandeep.dhir – 1 file(s) modified
Creating the client object again

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

Rev 5237 – Trac#1167 Caching all vendor item mappings for faster lookup

mandeep.dhir — Tue, 22 May 2012 15:16:54 +0530

mandeep.dhir – 6 file(s) modified
Trac#1167 Caching all vendor item mappings for faster lookup

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5231 – Creating the client object again

mandeep.dhir — Tue, 22 May 2012 13:14:56 +0530

mandeep.dhir – 1 file(s) modified
Creating the client object again

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

Rev 5230 – Adding a null check

mandeep.dhir — Tue, 22 May 2012 13:12:44 +0530

mandeep.dhir – 1 file(s) modified
Adding a null check

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

Rev 5223 – Did some formatting. Fixed password.

mandeep.dhir — Mon, 21 May 2012 17:42:46 +0530

mandeep.dhir – 1 file(s) modified
Did some formatting. Fixed password.

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

Rev 5221 – Creating the client object again

mandeep.dhir — Mon, 21 May 2012 16:37:41 +0530

mandeep.dhir – 1 file(s) modified
Creating the client object again

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

Rev 5220 – Adding a log statement

mandeep.dhir — Mon, 21 May 2012 15:35:50 +0530

mandeep.dhir – 1 file(s) modified
Adding a log statement

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

Rev 5218 – Creating the client object again

mandeep.dhir — Mon, 21 May 2012 14:23:07 +0530

mandeep.dhir – 1 file(s) modified
Creating the client object again

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

Rev 5215 – Adding a null check

mandeep.dhir — Mon, 21 May 2012 12:36:53 +0530

mandeep.dhir – 1 file(s) modified
Adding a null check

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

Rev 5212 – Trac#1167 Adding support for mismatches email

mandeep.dhir — Sun, 20 May 2012 20:19:49 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 Adding support for mismatches email

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

Rev 5210 – Trac#1167 Daily PLB Sync setup

mandeep.dhir — Sun, 20 May 2012 19:15:46 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 Daily PLB Sync setup

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

Rev 5208 – Updated Vendor Recon

varun.gupta — Fri, 18 May 2012 14:59:42 +0530

varun.gupta – 7 file(s) modified
Updated Vendor Recon

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

Rev 5198 – Corrected a logged statement

varun.gupta — Thu, 17 May 2012 08:06:45 +0530

varun.gupta – 1 file(s) modified
Corrected a logged statement

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

Rev 5189 – Vendor Reconciliation - added unsettled orders sheet

varun.gupta — Wed, 16 May 2012 13:31:05 +0530

varun.gupta – 11 file(s) modified
Vendor Reconciliation - added unsettled orders sheet

~ /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/OrderServiceHandler.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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5185 – Trac#981 DOA replacement support. Fixing reserved field when order is ...

mandeep.dhir — Wed, 16 May 2012 10:14:51 +0530

mandeep.dhir – 32 file(s) modified
Trac#981 DOA replacement support. Fixing reserved field when order is cancelled from PO_RAISED etc. states > 7(BILLED).

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/doa.js
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.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/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 5149 – Uncommented the authentication

varun.gupta — Thu, 10 May 2012 18:02:06 +0530

varun.gupta – 1 file(s) modified
Uncommented the authentication

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

Rev 5148 – Added catching for org.json.JSONException

varun.gupta — Thu, 10 May 2012 17:55:54 +0530

varun.gupta – 1 file(s) modified
Added catching for org.json.JSONException

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

Rev 5108 – Now extracting AWB for order identity in place of OrderId ...

varun.gupta — Thu, 03 May 2012 14:54:38 +0530

varun.gupta – 1 file(s) modified
Now extracting AWB for order identity in place of OrderId for Aramex report

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

Rev 5098 – Modified handling of Bluedart report

varun.gupta — Wed, 02 May 2012 14:53:25 +0530

varun.gupta – 2 file(s) modified
Modified handling of Bluedart report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm

Rev 5069 – Changed download file type to csv

varun.gupta — Thu, 26 Apr 2012 18:48:37 +0530

varun.gupta – 2 file(s) modified
Changed download file type to csv

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/OrderMonitorController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/order-monitor-index.vm

Rev 5068 – Ticket #1148 - Order Monitor report to see status wise ...

varun.gupta — Thu, 26 Apr 2012 18:33:47 +0530

varun.gupta – 3 file(s) modified
Ticket #1148 - Order Monitor report to see status wise order counts

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/OrderMonitorController.java
+ /trunk/Support/src/main/webapp/js/order-monitor.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/order-monitor-index.vm

Rev 5055 – Ticket #1156 - Email addresses from product notifications, sent in ...

varun.gupta — Tue, 24 Apr 2012 18:08:25 +0530

varun.gupta – 8 file(s) modified
Ticket #1156 - Email addresses from product notifications, sent in past, can now be downloaded

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/product-notifications-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 5020 – Ticket #1137 - Vendor Reconciliation Report generator tool can handle ...

varun.gupta — Wed, 18 Apr 2012 16:44:33 +0530

varun.gupta – 3 file(s) modified
Ticket #1137 - Vendor Reconciliation Report generator tool can handle string values for reference Id and amount

~ /trunk/Support/pom.xml
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm

Rev 4996 – Trac #1127 - Added functionality to modify existing quick-links

varun.gupta — Mon, 16 Apr 2012 12:04:21 +0530

varun.gupta – 11 file(s) modified
Trac #1127 - Added functionality to modify existing quick-links

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/QuickLink.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 4991 – PLB related changes Changing type of quantity from long to ...

mandeep.dhir — Sat, 14 Apr 2012 14:47:04 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Changing type of quantity from long to Double
Trac#1118

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

Rev 4990 – PLB related changes Changing type of quantity from long to ...

mandeep.dhir — Sat, 14 Apr 2012 14:44:46 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Changing type of quantity from long to Double
Trac#1118

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

Rev 4987 – PLB related changes Support related cahnges where we need to ...

mandeep.dhir — Sat, 14 Apr 2012 12:34:39 +0530

mandeep.dhir – 18 file(s) modified
PLB related changes
Support related cahnges where we need to process the PLB response and reset availability
Trac#1118

x /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/WarehouseController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/PLBDetails.java
x /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
x /trunk/Support/src/main/webapp/js/purchase.js
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-create.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-index.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-show.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/updates-lsuccess.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/warehouse-index.vm

Rev 4956 – Activated authentication interceptor

varun.gupta — Thu, 12 Apr 2012 11:46:48 +0530

varun.gupta – 1 file(s) modified
Activated authentication interceptor

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

Rev 4939 – Helper Client will now connect to production Helper Service

varun.gupta — Tue, 10 Apr 2012 13:53:41 +0530

varun.gupta – 1 file(s) modified
Helper Client will now connect to production Helper Service

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

Rev 4916 – Fixed the new line printing issues in report.

rajveer — Thu, 05 Apr 2012 14:21:26 +0530

rajveer – 1 file(s) modified
Fixed the new line printing issues in report.

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

Rev 4914 – Display the similar items for items which are currently out ...

rajveer — Thu, 05 Apr 2012 13:06:34 +0530

rajveer – 1 file(s) modified
Display the similar items for items which are currently out of stock.

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

Rev 4913 – Display the similar items for items which are currently out ...

rajveer — Thu, 05 Apr 2012 13:03:42 +0530

rajveer – 1 file(s) modified
Display the similar items for items which are currently out of stock.

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

Rev 4907 – Replaced method call to save to new payment settlements master ...

varun.gupta — Wed, 04 Apr 2012 15:43:51 +0530

varun.gupta – 1 file(s) modified
Replaced method call to save to new payment settlements master table

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

Rev 4905 – Now all the settlements are saved into one master table ...

varun.gupta — Wed, 04 Apr 2012 15:17:49 +0530

varun.gupta – 11 file(s) modified
Now all the settlements are saved into one master table where PaymentId is now replaced by ReferenceId which will be PaymentId for prepaid transactions and Order Id in case of COD

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

Rev 4878 – Added sheets for all categories.

rajveer — Mon, 02 Apr 2012 13:49:01 +0530

rajveer – 1 file(s) modified
Added sheets for all categories.

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

Rev 4875 – Ticket #1038 - Separated method to upload COD settlements

varun.gupta — Mon, 02 Apr 2012 13:23:51 +0530

varun.gupta – 11 file(s) modified
Ticket #1038 - Separated method to upload COD settlements

~ /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/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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CODPaymentSettlement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4830 – After 3 o'clock next day deliverable items should not be ...

rajveer — Wed, 28 Mar 2012 17:37:21 +0530

rajveer – 1 file(s) modified
After 3 o'clock next day deliverable items should not be changed. Also expected delivery time column.

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

Rev 4828 – Handling the exception locally.

rajveer — Wed, 28 Mar 2012 16:11:28 +0530

rajveer – 1 file(s) modified
Handling the exception locally.

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

Rev 4826 – Handling the exception locally.

rajveer — Wed, 28 Mar 2012 16:07:13 +0530

rajveer – 1 file(s) modified
Handling the exception locally.

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