SmartDukaan – /

Rev 5884 – Adding restriction to viewing of Store Pickup tickets, so that ...

amar.kumar — Fri, 24 Aug 2012 12:58:29 +0530

amar.kumar – 2 file(s) modified
Adding restriction to viewing of Store Pickup tickets, so that it can be only viewed by Outbound team

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 5883 – Declaration of variables was not compatible with IE6 guidelines. Added ...

anupam.singh — Fri, 24 Aug 2012 11:01:16 +0530

anupam.singh – 1 file(s) modified
Declaration of variables was not compatible with IE6 guidelines. Added "var" keyword wherever it was missing.

~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5882 – changes related to lengthy bullet

amit.gupta — Thu, 23 Aug 2012 21:13:32 +0530

amit.gupta – 1 file(s) modified
changes related to lengthy bullet

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

Rev 5881 – changes related to lengthy bullet

amit.gupta — Thu, 23 Aug 2012 21:13:05 +0530

amit.gupta – 1 file(s) modified
changes related to lengthy bullet

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

Rev 5880 – Added Expected Delivery Date in pay success controller.

rajveer — Thu, 23 Aug 2012 20:01:08 +0530

rajveer – 2 file(s) modified
Added Expected Delivery Date in pay success controller.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 5879 – Added estimated delivery date to the order confirmation email.

rajveer — Thu, 23 Aug 2012 19:38:10 +0530

rajveer – 1 file(s) modified
Added estimated delivery date to the order confirmation email.

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

Rev 5878 – Initialize the store object..

rajveer — Thu, 23 Aug 2012 18:38:48 +0530

rajveer – 1 file(s) modified
Initialize the store object..

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

Rev 5877 – Display Store name.

rajveer — Thu, 23 Aug 2012 18:30:43 +0530

rajveer – 1 file(s) modified
Display Store name.

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

Rev 5876 – Display Store name.

rajveer — Thu, 23 Aug 2012 18:17:14 +0530

rajveer – 1 file(s) modified
Display Store name.

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

Rev 5875 – Added new icon for cameras.

amit.gupta — Thu, 23 Aug 2012 17:47:38 +0530

amit.gupta – 2 file(s) modified
Added new icon for cameras.

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 5874 – Dashboard for pickup store orders.

rajveer — Thu, 23 Aug 2012 17:13:33 +0530

rajveer – 9 file(s) modified
Dashboard for pickup store orders.

~ /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/PickupStoreStatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-statistics-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5873 – Added filters for cameras. related changes and website header ...

amit.gupta — Thu, 23 Aug 2012 16:49:53 +0530

amit.gupta – 13 file(s) modified
Added filters for cameras. related changes and
website header changes + filter related changes in website.

+ /trunk/ContentStore/src/jython/irdatarules/cameras
+ /trunk/ContentStore/src/jython/irdatarules/cameras/display.py
+ /trunk/ContentStore/src/jython/irdatarules/cameras/optical-zoom.py
+ /trunk/ContentStore/src/jython/irdatarules/cameras/resolution.py
~ /trunk/ContentStore/src/xml/model/categoryfacetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 5872 – Modifying the vat cutoff value

mandeep.dhir — Thu, 23 Aug 2012 15:02:09 +0530

mandeep.dhir – 1 file(s) modified
Modifying the vat cutoff value

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 5871 – Corrected code to set order attribute.

rajveer — Thu, 23 Aug 2012 14:19:21 +0530

rajveer – 1 file(s) modified
Corrected code to set order attribute.

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

Rev 5870 – Removed unused parameters.

rajveer — Thu, 23 Aug 2012 12:35:29 +0530

rajveer – 1 file(s) modified
Removed unused parameters.

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

Rev 5869 – Corrected the pickup store return process.

rajveer — Thu, 23 Aug 2012 12:24:27 +0530

rajveer – 1 file(s) modified
Corrected the pickup store return process.

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

Rev 5868 – Get delivery timestamp from logistics service.

rajveer — Thu, 23 Aug 2012 08:18:02 +0530

rajveer – 1 file(s) modified
Get delivery timestamp from logistics service.

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

Rev 5867 – Added some order statuses.

rajveer — Wed, 22 Aug 2012 18:33:33 +0530

rajveer – 3 file(s) modified
Added some order statuses.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5866 – Changed refercences for method to send email.

rajveer — Wed, 22 Aug 2012 17:18:10 +0530

rajveer – 3 file(s) modified
Changed refercences for method to send email.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/InformUsers.py

Rev 5865 – Corrected call to SaveUserEmail

amar.kumar — Wed, 22 Aug 2012 17:08:45 +0530

amar.kumar – 1 file(s) modified
Corrected call to SaveUserEmail

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 5864 – Changes in email sender to support cc and bcc.

rajveer — Wed, 22 Aug 2012 16:45:50 +0530

rajveer – 11 file(s) modified
Changes in email sender to support cc and bcc.

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.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/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserEmail.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 5863 – Added email for store.

rajveer — Wed, 22 Aug 2012 13:02:58 +0530

rajveer – 6 file(s) modified
Added email for store.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickupStore.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 5862 – Adding next slide links in every slide in product page ...

amit.gupta — Wed, 22 Aug 2012 12:54:57 +0530

amit.gupta – 3 file(s) modified
Adding next slide links in every slide in product page
Reviewed By Amit

On behalf of Amar

~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/js/entity.js

Rev 5861 – Changed the address of the invoice generation..

rajveer — Wed, 22 Aug 2012 12:32:59 +0530

rajveer – 1 file(s) modified
Changed the address of the invoice generation..

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InvoiceGenerationService.properties

Rev 5860 – Removed zaffar and added gaurav in mailing list.

rajveer — Wed, 22 Aug 2012 12:18:14 +0530

rajveer – 1 file(s) modified
Removed zaffar and added gaurav in mailing list.

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

Rev 5859 – Removed Mi-425 from the list of phones with recharge offer.

rajveer — Wed, 22 Aug 2012 11:06:35 +0530

rajveer – 1 file(s) modified
Removed Mi-425 from the list of phones with recharge offer.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5858 – Change to show open ticket count for store Pickup category ...

amar.kumar — Wed, 22 Aug 2012 01:12:40 +0530

amar.kumar – 3 file(s) modified
Change to show open ticket count for store Pickup category in sidebar

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 5857 – Extracting HotspotId instead of Id from pickupStore table.

anupam.singh — Wed, 22 Aug 2012 00:54:01 +0530

anupam.singh – 1 file(s) modified
Extracting HotspotId instead of Id from pickupStore table.

~ /trunk/pentaho/data-integration/transformations/ordersLoader.ktr

Rev 5856 – Paymode now says "In-store", "COD" and "Prepaid" instead of only ...

anupam.singh — Tue, 21 Aug 2012 20:26:05 +0530

anupam.singh – 1 file(s) modified
Paymode now says "In-store", "COD" and "Prepaid" instead of only "COD" and "Prepaid" which was inferred based on whether the logistic partner saw the order as COD or Prepaid. Payment Mode is not displayed in the bill now.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 5855 – Added return statement to the get secret code method.

rajveer — Tue, 21 Aug 2012 19:26:40 +0530

rajveer – 1 file(s) modified
Added return statement to the get secret code method.

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

Rev 5854 – updated list of open order types requested by anupam

amit.gupta — Tue, 21 Aug 2012 18:05:55 +0530

amit.gupta – 2 file(s) modified
updated list of open order types requested by anupam

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java

Rev 5853 – Terms and conditions are updated.

amit.gupta — Tue, 21 Aug 2012 17:30:14 +0530

amit.gupta – 1 file(s) modified
Terms and conditions are updated.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5852 – Range has standard values like "a/b inch" where a and ...

amit.gupta — Tue, 21 Aug 2012 17:25:30 +0530

amit.gupta – 1 file(s) modified
Range has standard values like "a/b inch" where a and b are numbers and require string type to be represented in this format

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

Rev 5851 – Started monitoring of new tickets through Alert Service. Warning and ...

amar.kumar — Tue, 21 Aug 2012 16:37:43 +0530

amar.kumar – 1 file(s) modified
Started monitoring of new tickets through Alert Service. Warning and Critical Threshold is taken as 4hrs and 6hrs. Any subsequent activity in ticket will stop monitoring.
Reviewed By : Amit Gupta

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 5850 – Change reverted in contentmodel for cameras suggested by vrinda unit ...

amit.gupta — Tue, 21 Aug 2012 14:10:14 +0530

amit.gupta – 1 file(s) modified
Change reverted in contentmodel for cameras suggested by vrinda
unit for camera should be in meter

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

Rev 5849 – Adding date in layout for Active Alerts log file

amar.kumar — Tue, 21 Aug 2012 14:00:38 +0530

amar.kumar – 1 file(s) modified
Adding date in layout for Active Alerts log file

~ /trunk/AlertService/src/main/resources/log4j.properties

Rev 5848 – Correcting time for varying alert thresholds according to time

amar.kumar — Tue, 21 Aug 2012 13:30:17 +0530

amar.kumar – 1 file(s) modified
Correcting time for varying alert thresholds according to time

~ /trunk/runutils/logMonitor/stat4j/src/net/sourceforge/stat4j/Threshold.java

Rev 5847 – Changes in contentmodel for cameras suggested by vrinda

amit.gupta — Tue, 21 Aug 2012 12:42:31 +0530

amit.gupta – 2 file(s) modified
Changes in contentmodel for cameras suggested by vrinda

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

Rev 5846 – Sending shipping mail to Ops as well for store pickups

mandeep.dhir — Mon, 20 Aug 2012 21:50:29 +0530

mandeep.dhir – 1 file(s) modified
Sending shipping mail to Ops as well for store pickups

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

Rev 5845 – Displaying store address

mandeep.dhir — Mon, 20 Aug 2012 11:10:59 +0530

mandeep.dhir – 2 file(s) modified
Displaying store address

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm