SmartDukaan – /

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

Rev 4900 – Not considering working group category

mandeep.dhir — Wed, 04 Apr 2012 11:41:24 +0530

mandeep.dhir – 1 file(s) modified
Not considering working group category

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.py

Rev 4899 – Corrected script and removed one unused part

rajveer — Wed, 04 Apr 2012 11:16:09 +0530

rajveer – 1 file(s) modified
Corrected script and removed one unused part

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

Rev 4898 – Updating as per new schema of item and vendoritemmapping

mandeep.dhir — Wed, 04 Apr 2012 11:13:34 +0530

mandeep.dhir – 1 file(s) modified
Updating as per new schema of item and vendoritemmapping

~ /trunk/runutils/daily-inventory-report.sh

Rev 4897 – Added Procurement delay table for the vendors.

rajveer — Tue, 03 Apr 2012 19:15:03 +0530

rajveer – 2 file(s) modified
Added Procurement delay table for the vendors.

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

Rev 4896 – Added Ashutosh in report receipients.

rajveer — Tue, 03 Apr 2012 19:11:15 +0530

rajveer – 1 file(s) modified
Added Ashutosh in report receipients.

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

Rev 4895 – removed the time parameter from catalog.sql and added equality check ...

amit.gupta — Tue, 03 Apr 2012 16:35:53 +0530

amit.gupta – 1 file(s) modified
removed the time parameter from catalog.sql and added equality check for non-zero values

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

Rev 4894 – script to build and copy

phani.kumar — Tue, 03 Apr 2012 16:27:49 +0530

phani.kumar – 1 file(s) modified
script to build and copy

+ /trunk/runutils/build-for-production.sh

Rev 4893 – Ticket Id : #966 Reviewed by :Rajveer Singh

amar.kumar — Tue, 03 Apr 2012 14:59:59 +0530

amar.kumar – 4 file(s) modified
Ticket Id : #966
Reviewed by :Rajveer Singh

~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/resources/log4j.properties

Rev 4892 – Uncommented method call to get export path

varun.gupta — Tue, 03 Apr 2012 14:52:44 +0530

varun.gupta – 1 file(s) modified
Uncommented method call to get export path

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

Rev 4891 – Added email validation in Registration controller

varun.gupta — Tue, 03 Apr 2012 14:51:00 +0530

varun.gupta – 2 file(s) modified
Added email validation in Registration controller

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

Rev 4890 – Added the hack to create duplicate ids for new page ...

amit.gupta — Tue, 03 Apr 2012 12:00:44 +0530

amit.gupta – 1 file(s) modified
Added the hack to create duplicate ids for new page creation

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

Rev 4889 – calling catalog-content-validation.sh dont rsync/scp if exit code is non-zero

amit.gupta — Tue, 03 Apr 2012 10:51:42 +0530

amit.gupta – 1 file(s) modified
calling catalog-content-validation.sh dont rsync/scp if exit code is non-zero

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 4888 – added exit code 1 if ALERT is to be raised

amit.gupta — Tue, 03 Apr 2012 10:47:58 +0530

amit.gupta – 1 file(s) modified
added exit code 1 if ALERT is to be raised

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

Rev 4887 – Not Updating availability while updating reserved count for Mahipalpur

mandeep.dhir — Tue, 03 Apr 2012 09:44:27 +0530

mandeep.dhir – 2 file(s) modified
Not Updating availability while updating reserved count for Mahipalpur

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

Rev 4886 – Ticket Id : #966 Reviewed by : Anupam Singh

amar.kumar — Tue, 03 Apr 2012 00:11:53 +0530

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

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

Rev 4885 – Ticket #896 - Fixed the method to enqueue email, for ...

varun.gupta — Mon, 02 Apr 2012 21:46:21 +0530

varun.gupta – 1 file(s) modified
Ticket #896 - Fixed the method to enqueue email, for shipping confirmation and updated delivery time

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

Rev 4884 – Ticket Id : #966 Reviewed by : Anupam Singh

amar.kumar — Mon, 02 Apr 2012 20:47:35 +0530

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

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

Rev 4883 – If some problem occurs while updating content, it will roll ...

rajveer — Mon, 02 Apr 2012 19:07:32 +0530

rajveer – 1 file(s) modified
If some problem occurs while updating content, it will roll back to the previous.

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