SmartDukaan – /

Rev 3958 – Corrected the grammar

chandranshu — Mon, 31 Oct 2011 19:50:48 +0530

chandranshu – 1 file(s) modified
Corrected the grammar

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

Rev 3957 – Removed diwali cashback offer from website.

rajveer — Mon, 31 Oct 2011 18:37:53 +0530

rajveer – 3 file(s) modified
Removed diwali cashback offer from website.

~ /trunk/Website/src/main/resources/templates/mainbanner.vm
x /trunk/Website/src/main/webapp/images/diwali-cashback-offer.jpg
x /trunk/Website/src/main/webapp/WEB-INF/content/diwali-cashback-terms-conditions.vm

Rev 3956 – Added support to upload COD reconciliation report and process it

chandranshu — Mon, 31 Oct 2011 18:36:59 +0530

chandranshu – 18 file(s) modified
Added support to upload COD reconciliation report and process it

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/IPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /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/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 3955 – Catching every Exceptionfor async calls

mandeep.dhir — Mon, 31 Oct 2011 17:04:15 +0530

mandeep.dhir – 1 file(s) modified
Catching every Exceptionfor async calls

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

Rev 3954 – Trac #592 Fixed the image overflowing issue.

rajveer — Mon, 31 Oct 2011 15:48:12 +0530

rajveer – 1 file(s) modified
Trac #592 Fixed the image overflowing issue.

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

Rev 3953 – Changed names of of sections in proceed to pay controller.

rajveer — Mon, 31 Oct 2011 13:44:12 +0530

rajveer – 1 file(s) modified
Changed names of of sections in proceed to pay controller.

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3952 – Making default communication type as OTHER

mandeep.dhir — Mon, 31 Oct 2011 12:54:16 +0530

mandeep.dhir – 1 file(s) modified
Making default communication type as OTHER

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

Rev 3951 – Deleted unused scripts

rajveer — Mon, 31 Oct 2011 12:30:27 +0530

rajveer – 2 file(s) modified
Deleted unused scripts

x /trunk/runutils/generate-static-html-new.sh
x /trunk/runutils/generate-static-html.sh

Rev 3950 – Added method to get catalogId from itemId.

rajveer — Mon, 31 Oct 2011 12:26:49 +0530

rajveer – 1 file(s) modified
Added method to get catalogId from itemId.

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

Rev 3949 – Making admin as default assignee

mandeep.dhir — Mon, 31 Oct 2011 11:55:06 +0530

mandeep.dhir – 1 file(s) modified
Making admin as default assignee

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

Rev 3948 – Sync static server of london at time of content generation

rajveer — Mon, 31 Oct 2011 11:30:54 +0530

rajveer – 1 file(s) modified
Sync static server of london at time of content generation

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

Rev 3947 – Adding newline at EOF

mandeep.dhir — Mon, 31 Oct 2011 10:01:54 +0530

mandeep.dhir – 1 file(s) modified
Adding newline at EOF

~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm

Rev 3946 – updated linking command

rajveer — Sat, 29 Oct 2011 11:04:18 +0530

rajveer – 1 file(s) modified
updated linking command

~ /trunk/runutils/deploy-everything.sh

Rev 3945 – Trac#506 Generating icon, thumbnails files in static and website directories ...

mandeep.dhir — Sat, 29 Oct 2011 00:35:16 +0530

mandeep.dhir – 1 file(s) modified
Trac#506 Generating icon, thumbnails files in static and website directories in case default.jpg files are not available through FFC.
Identifying default.jpg files through label names

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java

Rev 3944 – Trac#506 Reading website images from export/images/website

mandeep.dhir — Fri, 28 Oct 2011 18:45:03 +0530

mandeep.dhir – 3 file(s) modified
Trac#506 Reading website images from export/images/website

~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/fblike-test-show.vm

Rev 3943 – Updated static content file

rajveer — Fri, 28 Oct 2011 17:56:35 +0530

rajveer – 1 file(s) modified
Updated static content file

~ /trunk/runutils/update-static-content.sh

Rev 3942 – Updated link after the website has been deployed

rajveer — Fri, 28 Oct 2011 17:52:03 +0530

rajveer – 1 file(s) modified
Updated link after the website has been deployed

~ /trunk/runutils/deploy-everything.sh

Rev 3941 – Ticket #609: Pin Code in cart details header now getting ...

varun.gupta — Fri, 28 Oct 2011 17:43:01 +0530

varun.gupta – 2 file(s) modified
Ticket #609: Pin Code in cart details header now getting updated

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

Rev 3940 – Corrected rsync path

rajveer — Fri, 28 Oct 2011 17:35:27 +0530

rajveer – 1 file(s) modified
Corrected rsync path

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

Rev 3939 – Modified update content scripts

rajveer — Fri, 28 Oct 2011 17:33:14 +0530

rajveer – 2 file(s) modified
Modified update content scripts

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

Rev 3938 – Updating rsync script

rajveer — Fri, 28 Oct 2011 17:25:03 +0530

rajveer – 1 file(s) modified
Updating rsync script

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

Rev 3937 – Email string comparison made case insensitive

varun.gupta — Fri, 28 Oct 2011 17:08:26 +0530

varun.gupta – 1 file(s) modified
Email string comparison made case insensitive

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_diwali_gift_voucher.py

Rev 3936 – Added a redirect to the reports dashboard in case a ...

chandranshu — Fri, 28 Oct 2011 16:43:23 +0530

chandranshu – 10 file(s) modified
Added a redirect to the reports dashboard in case a user is not authorized to view a report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/CodReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java

Rev 3935 – Handling none object.

rajveer — Fri, 28 Oct 2011 15:17:36 +0530

rajveer – 1 file(s) modified
Handling none object.

~ /trunk/ContentStore/src/jython/irmetadatarules/brand.py

Rev 3934 – Trac#506 Making content generation incremental

mandeep.dhir — Fri, 28 Oct 2011 15:05:33 +0530

mandeep.dhir – 9 file(s) modified
Trac#506 Making content generation incremental

~ /trunk/runutils/clean-content.sh
~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/runutils/generate-static-html-new.sh
~ /trunk/runutils/generate-static-html.sh
~ /trunk/runutils/get-content-from-prod-server.sh
~ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content-for-one-entity.sh
~ /trunk/runutils/update-content.sh
~ /trunk/runutils/update-static-content.sh

Rev 3933 – Trac#506 Making content generation incremental

mandeep.dhir — Fri, 28 Oct 2011 14:59:03 +0530

mandeep.dhir – 1 file(s) modified
Trac#506 Making content generation incremental

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

Rev 3932 – Trac#506 Making changes in website to load icon and thumbnail ...

mandeep.dhir — Fri, 28 Oct 2011 14:54:05 +0530

mandeep.dhir – 4 file(s) modified
Trac#506 Making changes in website to load icon and thumbnail images from newer location

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/fblike-test-show.vm

Rev 3931 – Trac#506 Making changes in vm files to read images etc. ...

mandeep.dhir — Fri, 28 Oct 2011 14:48:40 +0530

mandeep.dhir – 10 file(s) modified
Trac#506 Making changes in vm files to read images etc. from new path and with versioned names

~ /trunk/ContentStore/src/velocity/AfterSales.vm
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/PhonesIOwnSnippet.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm

Rev 3930 – Trac#506 Uncommenting the mail sending part

mandeep.dhir — Fri, 28 Oct 2011 14:45:52 +0530

mandeep.dhir – 1 file(s) modified
Trac#506 Uncommenting the mail sending part

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

Rev 3929 – Trac#506 Making changes to make content generation process incremental

mandeep.dhir — Fri, 28 Oct 2011 14:45:06 +0530

mandeep.dhir – 6 file(s) modified
Trac#506 Making changes to make content generation process incremental

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/EntityUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
+ /trunk/ContentStore/src/main/resources/log4j.properties

Rev 3928 – Added right alignment to 'Add to Compare' link

varun.gupta — Fri, 28 Oct 2011 13:55:12 +0530

varun.gupta – 1 file(s) modified
Added right alignment to 'Add to Compare' link

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

Rev 3927 – Added Samsung bada os in comparison scoring.

rajveer — Fri, 28 Oct 2011 12:44:49 +0530

rajveer – 1 file(s) modified
Added Samsung bada os in comparison scoring.

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 3926 – Added item (SE Xperia SK17i White/Pink)

varun.gupta — Fri, 28 Oct 2011 12:13:39 +0530

varun.gupta – 1 file(s) modified
Added item (SE Xperia SK17i White/Pink)

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Android_BDay.py

Rev 3925 – Reprocessing some missed COD txns

mandeep.dhir — Fri, 28 Oct 2011 10:17:10 +0530

mandeep.dhir – 1 file(s) modified
Reprocessing some missed COD txns

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTxnProcessor.java

Rev 3924 – Clear Home page cache when item is paused by risk. ...

rajveer — Thu, 27 Oct 2011 18:57:40 +0530

rajveer – 2 file(s) modified
Clear Home page cache when item is paused by risk. So that we wont show out of stock item at home page.

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

Rev 3923 – Avoiding NPEs in case no features are defined for a ...

mandeep.dhir — Thu, 27 Oct 2011 18:49:38 +0530

mandeep.dhir – 1 file(s) modified
Avoiding NPEs in case no features are defined for a slide

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedSlide.java

Rev 3922 – Simplified the mechanism to count the pushes to production

chandranshu — Thu, 27 Oct 2011 18:15:58 +0530

chandranshu – 2 file(s) modified
Simplified the mechanism to count the pushes to production

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/resources/log4j.properties

Rev 3921 – Updated javadocs and comments

chandranshu — Thu, 27 Oct 2011 18:00:35 +0530

chandranshu – 1 file(s) modified
Updated javadocs and comments

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java

Rev 3920 – Corrected the base path for all services

chandranshu — Thu, 27 Oct 2011 15:34:18 +0530

chandranshu – 7 file(s) modified
Corrected the base path for all services

~ /trunk/runutils/init.d/catalog-server
~ /trunk/runutils/init.d/config-server
~ /trunk/runutils/init.d/helper-server
~ /trunk/runutils/init.d/inventory-history-server
~ /trunk/runutils/init.d/order-server
~ /trunk/runutils/init.d/promotion-server
~ /trunk/runutils/init.d/user-server

Rev 3919 – Start py services should start services and not stop them

chandranshu — Thu, 27 Oct 2011 15:28:33 +0530

chandranshu – 1 file(s) modified
Start py services should start services and not stop them

~ /trunk/runutils/start-py-services.sh