SmartDukaan – /

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

Rev 4882 – Removed some of the unused parameters. Corrected some include statements ...

rajveer — Mon, 02 Apr 2012 17:50:36 +0530

rajveer – 8 file(s) modified
Removed some of the unused parameters. Corrected some include statements to remove unused warnings.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShareProducts.java
x /trunk/Website/src/main/resources/in/shop2020/serving/controllers/OrderController.properties
~ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ProceedToPayController.properties
x /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ShippingController.properties

Rev 4881 – added preferred vendor and default warehouse additem function

phani.kumar — Mon, 02 Apr 2012 15:00:11 +0530

phani.kumar – 2 file(s) modified
added preferred vendor and default warehouse additem function

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 4880 – As per ticket all services on support, CRM and STAGING ...

rajveer — Mon, 02 Apr 2012 14:36:54 +0530

rajveer – 1 file(s) modified
As per ticket all services on support, CRM and STAGING machine should connect to hadb2.

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

Rev 4879 – Corrected some parts of the content population

rajveer — Mon, 02 Apr 2012 14:28:05 +0530

rajveer – 1 file(s) modified
Corrected some parts of the content population

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

Rev 4878 – Added sheets for all categories.

rajveer — Mon, 02 Apr 2012 13:49:01 +0530

rajveer – 1 file(s) modified
Added sheets for all categories.

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

Rev 4877 – added mail sending using sendEmail

amit.gupta — Mon, 02 Apr 2012 13:28:23 +0530

amit.gupta – 1 file(s) modified
added mail sending using sendEmail

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

Rev 4876 – Sending mail not through Sendgrid

mandeep.dhir — Mon, 02 Apr 2012 13:28:04 +0530

mandeep.dhir – 1 file(s) modified
Sending mail not through Sendgrid

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

Rev 4875 – Ticket #1038 - Separated method to upload COD settlements

varun.gupta — Mon, 02 Apr 2012 13:23:51 +0530

varun.gupta – 11 file(s) modified
Ticket #1038 - Separated method to upload COD settlements

~ /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/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CODPaymentSettlement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4874 – changed Label for GA event OOS Lighbox shown from product ...

amit.gupta — Mon, 02 Apr 2012 12:57:27 +0530

amit.gupta – 1 file(s) modified
changed Label for GA event OOS Lighbox shown from product id to product name

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

Rev 4873 – Trac#1012 scanning as sale return for orders taht are cancelled ...

mandeep.dhir — Mon, 02 Apr 2012 00:25:57 +0530

mandeep.dhir – 3 file(s) modified
Trac#1012 scanning as sale return for orders taht are cancelled after billing
Trac#1066 Persisting missed updates so that they can reapplied to inventory as well

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

Rev 4872 – added mail sending using mutt

amit.gupta — Sun, 01 Apr 2012 23:32:40 +0530

amit.gupta – 1 file(s) modified
added mail sending using mutt

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

Rev 4871 – Fixed variable name.

rajveer — Sat, 31 Mar 2012 20:27:15 +0530

rajveer – 1 file(s) modified
Fixed variable name.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py