SmartDukaan – /

Rev 6656 – changed

amit.gupta — Sat, 12 Jan 2013 23:57:16 +0530

amit.gupta – 1 file(s) modified
changed

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

Rev 6655 – Changed mail to send otg text in case of OTG.

rajveer — Fri, 11 Jan 2013 18:14:01 +0530

rajveer – 1 file(s) modified
Changed mail to send otg text in case of OTG.

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

Rev 6654 – added hr between two products.

amit.gupta — Fri, 11 Jan 2013 18:08:28 +0530

amit.gupta – 1 file(s) modified
added hr between two products.

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

Rev 6653 – Changed the height of lightbox for otg

amit.gupta — Fri, 11 Jan 2013 17:31:53 +0530

amit.gupta – 1 file(s) modified
Changed the height of lightbox for otg

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

Rev 6652 – Added Chaitnaya to Last day order reports.

anupam.singh — Fri, 11 Jan 2013 17:06:12 +0530

anupam.singh – 2 file(s) modified
Added Chaitnaya to Last day order reports.

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 6651 – Adding itemId in mail for Change in Transfer Price

amar.kumar — Fri, 11 Jan 2013 16:12:27 +0530

amar.kumar – 1 file(s) modified
Adding itemId in mail for Change in Transfer Price

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

Rev 6650 – Changes made to subject

amit.gupta — Fri, 11 Jan 2013 16:00:43 +0530

amit.gupta – 1 file(s) modified
Changes made to subject

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

Rev 6649 – Created out separate promotion for otg i.e.28

amit.gupta — Fri, 11 Jan 2013 13:55:38 +0530

amit.gupta – 2 file(s) modified
Created out separate promotion for otg i.e.28

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

Rev 6648 – otg related enhancements.

amit.gupta — Fri, 11 Jan 2013 13:52:54 +0530

amit.gupta – 2 file(s) modified
otg related enhancements.

~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

Rev 6647 – Added amit sirohi to escalation mails instead of suraj sharma.

anupam.singh — Fri, 11 Jan 2013 12:49:06 +0530

anupam.singh – 1 file(s) modified
Added amit sirohi to escalation mails instead of suraj sharma.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 6646 – Scores are modified as discussed by vrinda

amit.gupta — Fri, 11 Jan 2013 12:38:56 +0530

amit.gupta – 2 file(s) modified
Scores are modified as discussed by vrinda

~ /trunk/ContentStore/src/jython/comparisonrules/lemp_messaging.py
~ /trunk/ContentStore/src/jython/comparisonrules/memory_math.py

Rev 6645 – Added shrawan and ritesh instead of gaurabh and suraj mailing ...

anupam.singh — Thu, 10 Jan 2013 20:14:56 +0530

anupam.singh – 1 file(s) modified
Added shrawan and ritesh instead of gaurabh and suraj mailing list for pickup request

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

Rev 6644 – Removed dependency of awb on awbupdate.

rajveer — Thu, 10 Jan 2013 17:58:00 +0530

rajveer – 1 file(s) modified
Removed dependency of awb on awbupdate.

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

Rev 6643 – Added support to store awb updates in our system.

rajveer — Thu, 10 Jan 2013 16:24:05 +0530

rajveer – 17 file(s) modified
Added support to store awb updates in our system.

~ /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/AwbNumberAlerter.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ProcurementReportProcessor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.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/utils/orderTablePoller.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/AwbUpdate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 6642 – Setting timestamp of PurchaseReturn

amar.kumar — Thu, 10 Jan 2013 15:36:58 +0530

amar.kumar – 1 file(s) modified
Setting timestamp of PurchaseReturn

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 6641 – Change in Scanning Logic to avoid creation of multiple Grns

amar.kumar — Thu, 10 Jan 2013 15:25:27 +0530

amar.kumar – 1 file(s) modified
Change in Scanning Logic to avoid creation of multiple Grns

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java

Rev 6640 – Added full run

amit.gupta — Thu, 10 Jan 2013 15:18:55 +0530

amit.gupta – 1 file(s) modified
Added full run

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

Rev 6639 – costemtic changes related to otg.

amit.gupta — Thu, 10 Jan 2013 15:10:27 +0530

amit.gupta – 3 file(s) modified
costemtic changes related to otg.

~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6638 – Change for getting invoice in case invoice is not present ...

amar.kumar — Thu, 10 Jan 2013 12:38:09 +0530

amar.kumar – 1 file(s) modified
Change for getting invoice in case invoice is not present for the invoiceNumber and supplier

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 6637 – Typo corrected

amit.gupta — Wed, 09 Jan 2013 22:18:02 +0530

amit.gupta – 1 file(s) modified
Typo corrected

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

Rev 6636 – Prefix is removed

amit.gupta — Wed, 09 Jan 2013 20:38:43 +0530

amit.gupta – 1 file(s) modified
Prefix is removed

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

Rev 6635 – Multiple refund buttons on recharge page now work fine.

anupam.singh — Wed, 09 Jan 2013 20:05:38 +0530

anupam.singh – 2 file(s) modified
Multiple refund buttons on recharge page now work fine.

~ /trunk/Website/src/main/webapp/js/myaccount.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm

Rev 6634 – Changing mailing list

amar.kumar — Wed, 09 Jan 2013 19:42:41 +0530

amar.kumar – 1 file(s) modified
Changing mailing list

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 6633 – added helper_service_server_host_prod field for for test machine

amit.gupta — Wed, 09 Jan 2013 18:59:06 +0530

amit.gupta – 1 file(s) modified
added helper_service_server_host_prod field for for test machine

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 6632 – Added checks for first delivery timestamp

amit.gupta — Wed, 09 Jan 2013 18:31:30 +0530

amit.gupta – 1 file(s) modified
Added checks for first delivery timestamp

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

Rev 6631 – Added checks for first delivery timestamp

amit.gupta — Wed, 09 Jan 2013 18:17:53 +0530

amit.gupta – 1 file(s) modified
Added checks for first delivery timestamp

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

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