SmartDukaan – /

Rev 6677 – Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

amar.kumar — Mon, 14 Jan 2013 20:02:01 +0530

amar.kumar – 3 file(s) modified
Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 6676 – Now showing the otg flag in crm

anupam.singh — Mon, 14 Jan 2013 19:43:15 +0530

anupam.singh – 1 file(s) modified
Now showing the otg flag in crm

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 6675 – Break in the email for shipping confirmation for OTG case.

rajveer — Mon, 14 Jan 2013 18:53:25 +0530

rajveer – 1 file(s) modified
Break in the email for shipping confirmation for OTG case.

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

Rev 6674 – Added recharge info to delivery success mail as well in ...

amit.gupta — Mon, 14 Jan 2013 18:49:05 +0530

amit.gupta – 1 file(s) modified
Added recharge info to delivery success mail as well in case of otg + delay

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

Rev 6673 – minor change.

amit.gupta — Mon, 14 Jan 2013 18:40:30 +0530

amit.gupta – 1 file(s) modified
minor change.

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

Rev 6672 – change Expected date to promised delivery date.

amit.gupta — Mon, 14 Jan 2013 18:38:49 +0530

amit.gupta – 2 file(s) modified
change Expected date to promised delivery date.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm

Rev 6671 – id to class otg_know_more

amit.gupta — Mon, 14 Jan 2013 18:01:14 +0530

amit.gupta – 3 file(s) modified
id to class otg_know_more

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

Rev 6670 – Added recharge on otg tnc and popup.

amit.gupta — Mon, 14 Jan 2013 17:49:34 +0530

amit.gupta – 2 file(s) modified
Added recharge on otg tnc and popup.

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

Rev 6669 – fixed business count logically after discussing it with Rajveer.

amit.gupta — Mon, 14 Jan 2013 15:37:43 +0530

amit.gupta – 1 file(s) modified
fixed business count logically after discussing it with Rajveer.

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

Rev 6668 – 1) Setting Amit Sirohi's emailId instead of Suraj Sharma 2) ...

amar.kumar — Mon, 14 Jan 2013 15:19:16 +0530

amar.kumar – 6 file(s) modified
1) Setting Amit Sirohi's emailId instead of Suraj Sharma
2) Setting Received_Return timestamp when order is cancelled after billing

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py

Rev 6667 – Changing AgentId for certain types of tickets

amar.kumar — Mon, 14 Jan 2013 14:24:36 +0530

amar.kumar – 4 file(s) modified
Changing AgentId for certain types of tickets

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/FlaggedPaymentProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

Rev 6666 – Update expected delivery timestamp at the time of shipping.

rajveer — Mon, 14 Jan 2013 14:00:55 +0530

rajveer – 1 file(s) modified
Update expected delivery timestamp at the time of shipping.

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

Rev 6665 – corrected logic to calculate sundays.

amit.gupta — Mon, 14 Jan 2013 13:29:15 +0530

amit.gupta – 1 file(s) modified
corrected logic to calculate sundays.

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

Rev 6664 – On time guarantee field added for updating dashboard.

rajveer — Mon, 14 Jan 2013 12:35:57 +0530

rajveer – 1 file(s) modified
On time guarantee field added for updating dashboard.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 6663 – Added order id in pickup request email.

rajveer — Mon, 14 Jan 2013 12:24:44 +0530

rajveer – 1 file(s) modified
Added order id in pickup request email.

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

Rev 6662 – Updated shipping email to inform customers accordingly in case of ...

rajveer — Mon, 14 Jan 2013 12:06:16 +0530

rajveer – 1 file(s) modified
Updated shipping email to inform customers accordingly in case of OTG.

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

Rev 6661 – Enter and query while searching instead of or query.

rajveer — Mon, 14 Jan 2013 11:25:53 +0530

rajveer – 1 file(s) modified
Enter and query while searching instead of or query.

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

Rev 6660 – Removed br between We pay if we delay.

amit.gupta — Sun, 13 Jan 2013 15:23:21 +0530

amit.gupta – 1 file(s) modified
Removed br between We pay if we delay.

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

Rev 6659 – added empty row between two orders

amit.gupta — Sun, 13 Jan 2013 15:14:57 +0530

amit.gupta – 1 file(s) modified
added empty row between two orders

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

Rev 6658 – changed

amit.gupta — Sun, 13 Jan 2013 13:33:55 +0530

amit.gupta – 1 file(s) modified
changed

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

Rev 6657 – Slide featuredefinitions are added appropriately....

amit.gupta — Sun, 13 Jan 2013 02:37:43 +0530

amit.gupta – 1 file(s) modified
Slide featuredefinitions are added appropriately....

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

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