SmartDukaan – /

Rev 7080 – Changes in RechargeWebapp

anupam.singh — Wed, 03 Apr 2013 14:18:10 +0530

anupam.singh – 19 file(s) modified
Changes in RechargeWebapp

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FRC.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7079 – Corrected the path of folder.

rajveer — Wed, 03 Apr 2013 14:11:37 +0530

rajveer – 1 file(s) modified
Corrected the path of folder.

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

Rev 7078 – Trim the customer name.

rajveer — Wed, 03 Apr 2013 13:18:26 +0530

rajveer – 1 file(s) modified
Trim the customer name.

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

Rev 7077 – Added user id as part of fetching invoice

rajveer — Tue, 02 Apr 2013 19:05:37 +0530

rajveer – 1 file(s) modified
Added user id as part of fetching invoice

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

Rev 7076 – Added discount amount.

rajveer — Tue, 02 Apr 2013 19:00:55 +0530

rajveer – 2 file(s) modified
Added discount amount.

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

Rev 7075 – Added support to handle transactions for recharge transactions.

rajveer — Tue, 02 Apr 2013 18:26:49 +0530

rajveer – 9 file(s) modified
Added support to handle transactions for recharge transactions.

~ /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/model/v1/order/script/ProcessRechargeTransaction.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7074 – classpath changed

anupam.singh — Tue, 02 Apr 2013 16:16:45 +0530

anupam.singh – 2 file(s) modified
classpath changed

~ /RechargeDashboard
~ /RechargeDashboard/.classpath

Rev 7073 – Changes for rechargeFromStore

anupam.singh — Tue, 02 Apr 2013 16:12:55 +0530

anupam.singh – 25 file(s) modified
Changes for rechargeFromStore

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
x /RechargeDashboard/src/main/webapp/css/common.css
+ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css (copied from /RechargeDashboard/src/main/webapp/css/common.css@7068)
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/service-provider.vm
~ /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/model/v1/order/impl/RechargeService.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/Company.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PayMethod.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletForCompany.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletHistoryForCompany.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7072 – Fixed small bug.

rajveer — Tue, 02 Apr 2013 14:58:22 +0530

rajveer – 1 file(s) modified
Fixed small bug.

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

Rev 7071 – Adding log statement

amar.kumar — Tue, 02 Apr 2013 14:23:23 +0530

amar.kumar – 1 file(s) modified
Adding log statement

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java

Rev 7070 – Added Redexpress as courier partner.

rajveer — Tue, 02 Apr 2013 12:46:50 +0530

rajveer – 1 file(s) modified
Added Redexpress as courier partner.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 7069 – Added Redexpress as courier partner.

rajveer — Tue, 02 Apr 2013 12:45:38 +0530

rajveer – 1 file(s) modified
Added Redexpress as courier partner.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 7068 – Committing the RechargeDashboard Webapp

anupam.singh — Mon, 01 Apr 2013 11:46:21 +0530

anupam.singh – 62 file(s) modified
Committing the RechargeDashboard Webapp

+ /RechargeDashboard/.classpath
+ /RechargeDashboard/.project
+ /RechargeDashboard/.settings
+ /RechargeDashboard/.settings/org.eclipse.jdt.core.prefs
+ /RechargeDashboard/.settings/org.maven.ide.eclipse.prefs
+ /RechargeDashboard/pom.xml
+ /RechargeDashboard/src
+ /RechargeDashboard/src/main
+ /RechargeDashboard/src/main/java
+ /RechargeDashboard/src/main/java/in
+ /RechargeDashboard/src/main/java/in/shop2020
+ /RechargeDashboard/src/main/java/in/shop2020/recharge
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/BaseController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/service
+ /RechargeDashboard/src/main/java/in/shop2020/serving
+ /RechargeDashboard/src/main/java/in/shop2020/serving/auth
+ /RechargeDashboard/src/main/java/in/shop2020/serving/auth/InventoryAuthorizingRealm.java
+ /RechargeDashboard/src/main/java/in/shop2020/serving/auth/VerboseFilter.java
+ /RechargeDashboard/src/main/resources
+ /RechargeDashboard/src/main/resources/log4j.properties
+ /RechargeDashboard/src/main/resources/shiro.ini
+ /RechargeDashboard/src/main/resources/struts.xml
+ /RechargeDashboard/src/main/webapp
+ /RechargeDashboard/src/main/webapp/change-password.html
+ /RechargeDashboard/src/main/webapp/css
+ /RechargeDashboard/src/main/webapp/css/common.css
+ /RechargeDashboard/src/main/webapp/css/demo_page.css
+ /RechargeDashboard/src/main/webapp/css/demo_table.css
+ /RechargeDashboard/src/main/webapp/css/demo_table_jui.css
+ /RechargeDashboard/src/main/webapp/css/TableTools.css
+ /RechargeDashboard/src/main/webapp/images
+ /RechargeDashboard/src/main/webapp/images/+91.png
+ /RechargeDashboard/src/main/webapp/images/add.png
+ /RechargeDashboard/src/main/webapp/images/copy.png
+ /RechargeDashboard/src/main/webapp/images/copy_hover.png
+ /RechargeDashboard/src/main/webapp/images/csv.png
+ /RechargeDashboard/src/main/webapp/images/csv_hover.png
+ /RechargeDashboard/src/main/webapp/images/pdf.png
+ /RechargeDashboard/src/main/webapp/images/pdf_hover.png
+ /RechargeDashboard/src/main/webapp/images/print.png
+ /RechargeDashboard/src/main/webapp/images/print_hover.png
+ /RechargeDashboard/src/main/webapp/images/Rupee.png
+ /RechargeDashboard/src/main/webapp/images/topbar.png
+ /RechargeDashboard/src/main/webapp/images/xls.png
+ /RechargeDashboard/src/main/webapp/images/xls_hover.png
+ /RechargeDashboard/src/main/webapp/js
+ /RechargeDashboard/src/main/webapp/js/jquery-1.4.2.js
+ /RechargeDashboard/src/main/webapp/js/jquery.colorbox-min.js
+ /RechargeDashboard/src/main/webapp/js/jquery.dataTables.min.js
+ /RechargeDashboard/src/main/webapp/js/jquery.validate.js
+ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/js/TableTools.min.js
+ /RechargeDashboard/src/main/webapp/login.html
+ /RechargeDashboard/src/main/webapp/WEB-INF
+ /RechargeDashboard/src/main/webapp/WEB-INF/content
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/velocity.properties
+ /RechargeDashboard/src/main/webapp/WEB-INF/web.xml

Rev 7067 – Adding RechargeDashboard Webapp

anupam.singh — Mon, 01 Apr 2013 11:42:06 +0530

anupam.singh – 1 file(s) modified
Adding RechargeDashboard Webapp

+ /RechargeDashboard

Rev 7066 – Request from vrinda TabletsNew Battery Battery capacity Unit -Add - ...

amit.gupta — Mon, 01 Apr 2013 11:24:09 +0530

amit.gupta – 2 file(s) modified
Request from vrinda
TabletsNew
Battery
Battery capacity
Unit -Add - WHr
Decimal should be accepted

Ref - iPads

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

Rev 7065 – Bug fix

kshitij.sood — Fri, 29 Mar 2013 18:04:01 +0530

kshitij.sood – 3 file(s) modified
Bug fix

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 7064 – Added to Shrawan and Ritesh to some categories

anupam.singh — Fri, 29 Mar 2013 14:58:16 +0530

anupam.singh – 1 file(s) modified
Added to Shrawan and Ritesh to some categories

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 7063 – Typo mistake

kshitij.sood — Fri, 29 Mar 2013 13:48:01 +0530

kshitij.sood – 1 file(s) modified
Typo mistake

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

Rev 7062 – Adding inline style.

kshitij.sood — Fri, 29 Mar 2013 13:33:01 +0530

kshitij.sood – 1 file(s) modified
Adding inline style.

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

Rev 7061 – Side banner.

kshitij.sood — Fri, 29 Mar 2013 12:52:15 +0530

kshitij.sood – 5 file(s) modified
Side banner.

~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 7060 – Offer text to be displayed in red

anupam.singh — Fri, 29 Mar 2013 00:29:03 +0530

anupam.singh – 1 file(s) modified
Offer text to be displayed in red

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

Rev 7059 – Bug fix related to inactive agents logging

kshitij.sood — Thu, 28 Mar 2013 19:46:35 +0530

kshitij.sood – 1 file(s) modified
Bug fix related to inactive agents logging

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java

Rev 7058 – Bug fix

kshitij.sood — Thu, 28 Mar 2013 18:31:15 +0530

kshitij.sood – 1 file(s) modified
Bug fix

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

Rev 7057 – Insurance amount should not be considered while calculating sales tax

amar.kumar — Thu, 28 Mar 2013 16:33:28 +0530

amar.kumar – 1 file(s) modified
Insurance amount should not be considered while calculating sales tax

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

Rev 7056 – Adding checks

amar.kumar — Thu, 28 Mar 2013 15:35:25 +0530

amar.kumar – 1 file(s) modified
Adding checks

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

Rev 7055 – Adding checks

amar.kumar — Thu, 28 Mar 2013 15:32:34 +0530

amar.kumar – 1 file(s) modified
Adding checks

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

Rev 7054 – Script to create new blk Order for Freebie to be ...

amar.kumar — Thu, 28 Mar 2013 15:24:07 +0530

amar.kumar – 1 file(s) modified
Script to create new blk Order for Freebie to be given along with A110

+ /trunk/PyProj/src/shop2020/model/v1/order/script/A110Processor.py

Rev 7053 – Created a new data type definition for video recording in ...

anupam.singh — Thu, 28 Mar 2013 12:53:55 +0530

anupam.singh – 2 file(s) modified
Created a new data type definition for video recording in tablets

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

Rev 7052 – Made processor speed data type as floating point

anupam.singh — Thu, 28 Mar 2013 11:20:05 +0530

anupam.singh – 1 file(s) modified
Made processor speed data type as floating point

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

Rev 7051 – Updated

kshitij.sood — Tue, 26 Mar 2013 18:32:12 +0530

kshitij.sood – 1 file(s) modified
Updated

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

Rev 7050 – Reverted changes.

kshitij.sood — Tue, 26 Mar 2013 18:23:27 +0530

kshitij.sood – 1 file(s) modified
Reverted changes.

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

Rev 7049 – Added a method in Payment service that returns Payment where ...

anupam.singh — Tue, 26 Mar 2013 17:06:03 +0530

anupam.singh – 9 file(s) modified
Added a method in Payment service that returns Payment where isDigital = 1

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 7048 – Recharge page side banner

kshitij.sood — Tue, 26 Mar 2013 16:17:17 +0530

kshitij.sood – 1 file(s) modified
Recharge page side banner

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

Rev 7047 –

kshitij.sood — Tue, 26 Mar 2013 15:48:02 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/Website/src/main/webapp/images/banner-side.jpg

Rev 7046 –

kshitij.sood — Tue, 26 Mar 2013 14:36:23 +0530

kshitij.sood – 1 file(s) modified

x /trunk/Website/src/main/webapp/images/banner-side.jpg

Rev 7045 – Processor type for tablets was wrong, Video recording feature had ...

anupam.singh — Tue, 26 Mar 2013 12:56:50 +0530

anupam.singh – 2 file(s) modified
Processor type for tablets was wrong, Video recording feature had video playback enums

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

Rev 7044 –

kshitij.sood — Mon, 25 Mar 2013 18:21:25 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryUpdateMonitor.py

Rev 7043 – Made card type feature for storage slide in camera category ...

anupam.singh — Mon, 25 Mar 2013 15:28:29 +0530

anupam.singh – 1 file(s) modified
Made card type feature for storage slide in camera category as optional

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

Rev 7042 – Adding 18 Month Emi to the list of Hdfc Emi ...

amar.kumar — Mon, 25 Mar 2013 15:04:47 +0530

amar.kumar – 1 file(s) modified
Adding 18 Month Emi to the list of Hdfc Emi ids

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 7041 – Side banner.

kshitij.sood — Mon, 25 Mar 2013 14:07:59 +0530

kshitij.sood – 2 file(s) modified
Side banner.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
+ /trunk/Website/src/main/webapp/images/banner-side.jpg