SmartDukaan – /

Rev 4940 – Page to display quick links added

varun.gupta — Tue, 10 Apr 2012 16:41:22 +0530

varun.gupta – 4 file(s) modified
Page to display quick links added

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/QuicklinksController.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm

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 4938 – Added condition of warehouse for hotspot.

rajveer — Tue, 10 Apr 2012 13:16:20 +0530

rajveer – 1 file(s) modified
Added condition of warehouse for hotspot.

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

Rev 4937 – Adding three new points to Refund Policy

varun.gupta — Mon, 09 Apr 2012 17:18:07 +0530

varun.gupta – 1 file(s) modified
Adding three new points to Refund Policy

~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm

Rev 4936 – if start date is null return filter to true.

amit.gupta — Mon, 09 Apr 2012 16:52:42 +0530

amit.gupta – 1 file(s) modified
if start date is null return filter to true.

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

Rev 4935 – Ticket Id : #1094 Reviewed By : Varun Gupta

amar.kumar — Mon, 09 Apr 2012 15:08:13 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #1094
Reviewed By : Varun Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp

Rev 4934 – Added changes for Loading items with least delivery date on ...

amit.gupta — Mon, 09 Apr 2012 15:02:59 +0530

amit.gupta – 15 file(s) modified
Added changes for Loading items with least delivery date on top...

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4933 – Added Default option Getting Colors

amit.gupta — Mon, 09 Apr 2012 14:58:52 +0530

amit.gupta – 1 file(s) modified
Added Default option Getting Colors

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

Rev 4932 – Ticket Id : #1094 Reviewed By : Varun Gupta

amar.kumar — Mon, 09 Apr 2012 14:51:49 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #1094
Reviewed By : Varun Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp

Rev 4931 – Ticket #1086 - added for showing count of selected ...

varun.gupta — Mon, 09 Apr 2012 14:31:22 +0530

varun.gupta – 1 file(s) modified
Ticket #1086 - added <span> for showing count of selected items in Compare List widget

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

Rev 4930 – Added color info in OOS mails.

rajveer — Mon, 09 Apr 2012 14:31:05 +0530

rajveer – 1 file(s) modified
Added color info in OOS mails.

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

Rev 4929 – #1088 Added to OS enum : Windows Mobile 6.5

amit.gupta — Mon, 09 Apr 2012 14:02:59 +0530

amit.gupta – 2 file(s) modified
#1088
Added to OS enum : Windows Mobile 6.5

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 4928 – Symlinks are not allowed in the tomcat. So removing symlinks ...

rajveer — Mon, 09 Apr 2012 13:57:28 +0530

rajveer – 1 file(s) modified
Symlinks are not allowed in the tomcat. So removing symlinks and copying directly.

~ /trunk/runutils/update-content-and-catalog.sh

Rev 4927 – Symlinks are not allowed in the tomcat. So removing symlinks ...

rajveer — Mon, 09 Apr 2012 13:54:48 +0530

rajveer – 1 file(s) modified
Symlinks are not allowed in the tomcat. So removing symlinks and copying directly.

~ /trunk/runutils/deploy-everything.sh

Rev 4926 – Ticket #991 - Now products of different categories cannot be ...

varun.gupta — Mon, 09 Apr 2012 13:11:33 +0530

varun.gupta – 3 file(s) modified
Ticket #991 - Now products of different categories cannot be compared from Compare List widget

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 4925 – Ticket #1041 Generation of logistics report for orders pending local ...

phani.kumar — Mon, 09 Apr 2012 12:50:23 +0530

phani.kumar – 1 file(s) modified
Ticket #1041 Generation of logistics report for orders pending local connection

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

Rev 4924 – Ticket #1041 Generation of logistics report for orders pending local ...

phani.kumar — Mon, 09 Apr 2012 12:43:33 +0530

phani.kumar – 2 file(s) modified
Ticket #1041 Generation of logistics report for orders pending local connection

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

Rev 4923 – Ticket #854 - Fixed the alignment for discount

varun.gupta — Mon, 09 Apr 2012 04:38:36 +0530

varun.gupta – 2 file(s) modified
Ticket #854 - Fixed the alignment for discount

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css

Rev 4922 – Ticket #1086 - Count of selected items in Compare List ...

varun.gupta — Sun, 08 Apr 2012 12:54:14 +0530

varun.gupta – 2 file(s) modified
Ticket #1086 - Count of selected items in Compare List widget is now fixed

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

Rev 4921 – Adding new configuration for london support machine.

rajveer — Sat, 07 Apr 2012 17:00:22 +0530

rajveer – 1 file(s) modified
Adding new configuration for london support machine.

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

Rev 4920 – Ticket #1039 To introduce & implement 3 new OrderStatus states ...

phani.kumar — Thu, 05 Apr 2012 20:21:31 +0530

phani.kumar – 2 file(s) modified
Ticket #1039 To introduce & implement 3 new OrderStatus states for undelivered orders
reviewer: Rajveer

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

Rev 4919 – removed sysout

amit.gupta — Thu, 05 Apr 2012 17:55:22 +0530

amit.gupta – 1 file(s) modified
removed sysout

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

Rev 4918 – Added check to only add valid items to the ItemMap. ...

amit.gupta — Thu, 05 Apr 2012 17:41:52 +0530

amit.gupta – 1 file(s) modified
Added check to only add valid items to the ItemMap.

Also added Operating System info for tablets

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

Rev 4917 – added default values to brand,model_name,model_number,color,category reviewer:rajveer

phani.kumar — Thu, 05 Apr 2012 16:00:46 +0530

phani.kumar – 1 file(s) modified
added default values to brand,model_name,model_number,color,category
reviewer:rajveer

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

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 4915 – Made Helper client flexible to connect with Helper service running ...

varun.gupta — Thu, 05 Apr 2012 13:07:14 +0530

varun.gupta – 3 file(s) modified
Made Helper client flexible to connect with Helper service running on a server of choice (decided on run-time)

~ /trunk/PyProj/src/shop2020/clients/HelperClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

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 4912 – Ticket Id : #1083 Reviewed by : Varun Gupta

amar.kumar — Thu, 05 Apr 2012 12:01:03 +0530

amar.kumar – 2 file(s) modified
Ticket Id : #1083
Reviewed by : Varun Gupta

+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/captcha-stats.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 4911 – Fixed the condition checking validity of email address

varun.gupta — Thu, 05 Apr 2012 04:45:02 +0530

varun.gupta – 1 file(s) modified
Fixed the condition checking validity of email address

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

Rev 4910 – Ticket #1039 To introduce & implement 3 new OrderStatus states ...

phani.kumar — Wed, 04 Apr 2012 20:44:30 +0530

phani.kumar – 14 file(s) modified
Ticket #1039 To introduce & implement 3 new OrderStatus states for undelivered orders
Ticket #1040 CRM ticket creation related to undelivery of order
Ticket #1041 Generation of logistics report for orders pending local connection
reviewer: Rajveer

~ /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/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateRtoData.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/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4909 – Ticket Id : #1048 Reviewed by : Anupam Singh

amar.kumar — Wed, 04 Apr 2012 17:23:27 +0530

amar.kumar – 2 file(s) modified
Ticket Id : #1048
Reviewed by : Anupam Singh

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
+ /trunk/runutils/init.d/email-sender

Rev 4908 – Added code to rollback the content if there is some ...

rajveer — Wed, 04 Apr 2012 15:51:24 +0530

rajveer – 2 file(s) modified
Added code to rollback the content if there is some problem

~ /trunk/runutils/ContentUpdationManager.sh
~ /trunk/runutils/update-content-and-catalog.sh

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 4906 – Bug fix. Creating PhonesIOwnSnippets.vm for mobile phones only

mandeep.dhir — Wed, 04 Apr 2012 15:21:18 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Creating PhonesIOwnSnippets.vm for mobile phones only

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.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 4904 – formatting float value to #.##

amit.gupta — Wed, 04 Apr 2012 13:05:04 +0530

amit.gupta – 1 file(s) modified
formatting float value to #.##

~ /trunk/runutils/catalog-content-validation.sh

Rev 4903 – Checking for the status.

rajveer — Wed, 04 Apr 2012 12:31:40 +0530

rajveer – 1 file(s) modified
Checking for the status.

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

Rev 4902 – Checking for the status.

rajveer — Wed, 04 Apr 2012 12:20:15 +0530

rajveer – 1 file(s) modified
Checking for the status.

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

Rev 4901 – Checking for the status.

rajveer — Wed, 04 Apr 2012 12:17:03 +0530

rajveer – 1 file(s) modified
Checking for the status.

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