SmartDukaan – /

Rev 6630 – Changes for following 1) Creating purchase after scans are validated ...

amar.kumar — Wed, 09 Jan 2013 18:04:55 +0530

amar.kumar – 17 file(s) modified
Changes for following
1) Creating purchase after scans are validated
2) Change to get entire inventory from inventory dashboard instead of only serialized
3) Adding the check to not allow duplicate invoiceNumber for a supplier.
4) Changing the code to use preferredVendor's transferprice while raising PO for Dummy Vendor

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InvoiceController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6629 – setting promised and expected shipping timestamp while cloning an order ...

anupam.singh — Wed, 09 Jan 2013 17:38:00 +0530

anupam.singh – 1 file(s) modified
setting promised and expected shipping timestamp while cloning an order for reshipping

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

Rev 6628 – Added filename to log

amit.gupta — Wed, 09 Jan 2013 16:10:59 +0530

amit.gupta – 1 file(s) modified
Added filename to log

~ /trunk/ContentStore/src/main/java/in/shop2020/util/DBUtils.java

Rev 6627 – FirstFlight Tracking service.

kshitij.sood — Wed, 09 Jan 2013 13:15:40 +0530

kshitij.sood – 4 file(s) modified
FirstFlight Tracking service.

~ /trunk/Common/pom.xml
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FirstFlightTrackingService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FirstflightUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/firstflight-updates-show.vm

Rev 6626 – ignore coming soon products with price not to be shown ...

amit.gupta — Tue, 08 Jan 2013 22:31:26 +0530

amit.gupta – 1 file(s) modified
ignore coming soon products with price not to be shown as well.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 6625 – ignore products with price not to be shown.

amit.gupta — Tue, 08 Jan 2013 21:47:17 +0530

amit.gupta – 1 file(s) modified
ignore products with price not to be shown.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 6624 – No need to call again all active items.

rajveer — Tue, 08 Jan 2013 15:49:06 +0530

rajveer – 1 file(s) modified
No need to call again all active items.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 6623 – Printing the exception.

rajveer — Tue, 08 Jan 2013 14:46:00 +0530

rajveer – 1 file(s) modified
Printing the exception.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 6622 – Added logs at various places and removed product feed.

rajveer — Tue, 08 Jan 2013 14:37:30 +0530

rajveer – 1 file(s) modified
Added logs at various places and removed product feed.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 6621 – Shipping to delivery

amit.gupta — Tue, 08 Jan 2013 11:39:04 +0530

amit.gupta – 1 file(s) modified
Shipping to delivery

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6620 – Cod should be shown by default.

amit.gupta — Tue, 08 Jan 2013 11:38:15 +0530

amit.gupta – 1 file(s) modified
Cod should be shown by default.

~ /trunk/Website/src/main/webapp/css/entity.css

Rev 6619 – uncommented main

amit.gupta — Mon, 07 Jan 2013 17:24:19 +0530

amit.gupta – 1 file(s) modified
uncommented main

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py

Rev 6618 – removed uncommented code

amit.gupta — Mon, 07 Jan 2013 17:13:10 +0530

amit.gupta – 1 file(s) modified
removed uncommented code

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py

Rev 6617 – Changing Subject and Body of Change in Transfer Price mails ...

amar.kumar — Mon, 07 Jan 2013 17:03:15 +0530

amar.kumar – 1 file(s) modified
Changing Subject and Body of Change in Transfer Price mails to include Brand/Model/Color

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

Rev 6616 – removed unnecessary padding on the emi widget.

amit.gupta — Mon, 07 Jan 2013 16:50:39 +0530

amit.gupta – 1 file(s) modified
removed unnecessary padding on the emi widget.

~ /trunk/Website/src/main/webapp/css/widgets.css

Rev 6615 – Changes in updatePincode method

amar.kumar — Mon, 07 Jan 2013 15:16:23 +0530

amar.kumar – 1 file(s) modified
Changes in updatePincode method

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 6614 – Handling thrift failues due to connection closed.

amit.gupta — Mon, 07 Jan 2013 14:28:16 +0530

amit.gupta – 1 file(s) modified
Handling thrift failues due to connection closed.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 6613 – If some exception while getting availability info from the service. ...

amit.gupta — Mon, 07 Jan 2013 12:57:27 +0530

amit.gupta – 1 file(s) modified
If some exception while getting availability info from the service.
Initialize immediately and try again.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 6612 – Adding log statements

amar.kumar — Mon, 07 Jan 2013 12:38:05 +0530

amar.kumar – 1 file(s) modified
Adding log statements

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

Rev 6611 – Fixing bug for specific pincodes.

amit.gupta — Mon, 07 Jan 2013 11:46:27 +0530

amit.gupta – 1 file(s) modified
Fixing bug for specific pincodes.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 6610 –

amit.gupta — Sun, 06 Jan 2013 14:50:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 6609 – import statement corrected.

amit.gupta — Sat, 05 Jan 2013 15:48:41 +0530

amit.gupta – 1 file(s) modified
import statement corrected.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py

Rev 6608 – Revised EMI rates for HDFC.

kshitij.sood — Sat, 05 Jan 2013 11:15:16 +0530

kshitij.sood – 1 file(s) modified
Revised EMI rates for HDFC.

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6607 – corrected facet id

amit.gupta — Fri, 04 Jan 2013 22:55:01 +0530

amit.gupta – 1 file(s) modified
corrected facet id

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 6606 – Added filter for availability.

rajveer — Fri, 04 Jan 2013 19:07:21 +0530

rajveer – 1 file(s) modified
Added filter for availability.

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 6605 – Handling the case when XFF is empty while searching for ...

anupam.singh — Fri, 04 Jan 2013 18:31:32 +0530

anupam.singh – 1 file(s) modified
Handling the case when XFF is empty while searching for IP.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java

Rev 6604 – Adding links to my recharge and my wallet in orderdetails ...

anupam.singh — Fri, 04 Jan 2013 18:00:34 +0530

anupam.singh – 1 file(s) modified
Adding links to my recharge and my wallet in orderdetails template vm

~ /trunk/Website/src/main/resources/templates/orderdetails.vm

Rev 6603 – Refund option now available on website for recharge order.

anupam.singh — Fri, 04 Jan 2013 17:42:57 +0530

anupam.singh – 4 file(s) modified
Refund option now available on website for recharge order.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/js/myaccount.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm

Rev 6602 – Adding Availability facet.

amit.gupta — Fri, 04 Jan 2013 14:36:30 +0530

amit.gupta – 8 file(s) modified
Adding Availability facet.

+ /trunk/ContentStore/src/jython/irdatarules/availability.py
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml

Rev 6601 – Using X-Forward-For header to get the client's IP Address

anupam.singh — Thu, 03 Jan 2013 18:28:23 +0530

anupam.singh – 1 file(s) modified
Using X-Forward-For header to get the client's IP Address

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java

Rev 6600 – Added a new resolution type

amit.gupta — Thu, 03 Jan 2013 17:39:16 +0530

amit.gupta – 2 file(s) modified
Added a new resolution type

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

Rev 6599 – added right image path

amit.gupta — Thu, 03 Jan 2013 17:18:22 +0530

amit.gupta – 1 file(s) modified
added right image path

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 6598 – changed url

amit.gupta — Thu, 03 Jan 2013 17:17:21 +0530

amit.gupta – 1 file(s) modified
changed url

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6597 – set refund timestamp to null initially.

rajveer — Thu, 03 Jan 2013 15:34:50 +0530

rajveer – 1 file(s) modified
set refund timestamp to null initially.

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

Rev 6596 – Script to get blocked IP's list.

kshitij.sood — Thu, 03 Jan 2013 14:17:20 +0530

kshitij.sood – 1 file(s) modified
Script to get blocked IP's list.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/GetDeniedIpRange.sh

Rev 6595 – Script to get blocked IP's list.

kshitij.sood — Thu, 03 Jan 2013 12:23:55 +0530

kshitij.sood – 1 file(s) modified
Script to get blocked IP's list.

+ /trunk/PyProj/src/shop2020/model/v1/order/script/GetDeniedIpRange.sh

Rev 6594 – Changed field types to bigInt for "blockediprange" table

anupam.singh — Thu, 03 Jan 2013 12:19:56 +0530

anupam.singh – 1 file(s) modified
Changed field types to bigInt for "blockediprange" table

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

Rev 6593 – MP3 category is now live.

amit.gupta — Thu, 03 Jan 2013 01:23:59 +0530

amit.gupta – 2 file(s) modified
MP3 category is now live.

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

Rev 6592 – Music Players is a better category.

amit.gupta — Thu, 03 Jan 2013 01:05:56 +0530

amit.gupta – 1 file(s) modified
Music Players is a better category.

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

Rev 6591 – Added ip address recognition and blocking of malicious ip addresses ...

anupam.singh — Wed, 02 Jan 2013 21:04:11 +0530

anupam.singh – 11 file(s) modified
Added ip address recognition and blocking of malicious ip addresses for rechargeOrders. Also started to log addresses which are blocked.

~ /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/model/BaseOrder.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java