SmartDukaan – /

Rev 5227 – Inorporated Content Generation for coming soon Items. #1131 Reviewer : ...

amit.gupta — Tue, 22 May 2012 11:44:16 +0530

amit.gupta – 2 file(s) modified
Inorporated Content Generation for coming soon Items.
#1131
Reviewer : Mandeep

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

Rev 5226 – Adding asghar

anupam.singh — Mon, 21 May 2012 19:49:28 +0530

anupam.singh – 1 file(s) modified
Adding asghar

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 5225 – Disallowing agent to create activity with empty description

amar.kumar — Mon, 21 May 2012 18:48:15 +0530

amar.kumar – 2 file(s) modified
Disallowing agent to create activity with empty description

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js

Rev 5224 – changes to fix issues in creation of activitites for existing ...

amar.kumar — Mon, 21 May 2012 18:12:53 +0530

amar.kumar – 3 file(s) modified
changes to fix issues in creation of activitites for existing customer

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm

Rev 5223 – Did some formatting. Fixed password.

mandeep.dhir — Mon, 21 May 2012 17:42:46 +0530

mandeep.dhir – 1 file(s) modified
Did some formatting. Fixed password.

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

Rev 5222 – Added log statements. Fixed a bug while posting data.

mandeep.dhir — Mon, 21 May 2012 16:54:03 +0530

mandeep.dhir – 1 file(s) modified
Added log statements. Fixed a bug while posting data.

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 5221 – Creating the client object again

mandeep.dhir — Mon, 21 May 2012 16:37:41 +0530

mandeep.dhir – 1 file(s) modified
Creating the client object again

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

Rev 5220 – Adding a log statement

mandeep.dhir — Mon, 21 May 2012 15:35:50 +0530

mandeep.dhir – 1 file(s) modified
Adding a log statement

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

Rev 5219 – Added Catalog Support for Coming soon. #1279

amit.gupta — Mon, 21 May 2012 14:46:52 +0530

amit.gupta – 1 file(s) modified
Added Catalog Support for Coming soon.
#1279

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java

Rev 5218 – Creating the client object again

mandeep.dhir — Mon, 21 May 2012 14:23:07 +0530

mandeep.dhir – 1 file(s) modified
Creating the client object again

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

Rev 5217 – Added Catalog Support for Coming soon. #1279

amit.gupta — Mon, 21 May 2012 13:22:23 +0530

amit.gupta – 20 file(s) modified
Added Catalog Support for Coming soon.
#1279

+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ComingSoon.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ComingSoonDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ComingSoonDialog.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /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/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5216 – removed mail id of rajneesharora@spiceretail.co.in as he is on leave

phani.kumar — Mon, 21 May 2012 12:55:15 +0530

phani.kumar – 1 file(s) modified
removed mail id of rajneesharora@spiceretail.co.in as he is on leave

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties

Rev 5215 – Adding a null check

mandeep.dhir — Mon, 21 May 2012 12:36:53 +0530

mandeep.dhir – 1 file(s) modified
Adding a null check

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

Rev 5214 – Putting parsing logic for itemId inside try catch block to ...

amar.kumar — Mon, 21 May 2012 12:17:37 +0530

amar.kumar – 1 file(s) modified
Putting parsing logic for itemId inside try catch block to avoid call to ExceptionController for this ajax call.

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

Rev 5213 – Trac#1167 No PLB sync for Negative running availability

mandeep.dhir — Sun, 20 May 2012 23:15:46 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 No PLB sync for Negative running availability

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

Rev 5212 – Trac#1167 Adding support for mismatches email

mandeep.dhir — Sun, 20 May 2012 20:19:49 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 Adding support for mismatches email

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

Rev 5211 – Trac#1167 Adding support for mismatches email

mandeep.dhir — Sun, 20 May 2012 20:19:41 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 Adding support for mismatches email

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 5210 – Trac#1167 Daily PLB Sync setup

mandeep.dhir — Sun, 20 May 2012 19:15:46 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 Daily PLB Sync setup

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

Rev 5209 – Trac#1167 Daily PLB Sync setup

mandeep.dhir — Sun, 20 May 2012 19:15:37 +0530

mandeep.dhir – 2 file(s) modified
Trac#1167 Daily PLB Sync setup

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java
~ /ClientAgent/src/main/resources/agent.conf

Rev 5208 – Updated Vendor Recon

varun.gupta — Fri, 18 May 2012 14:59:42 +0530

varun.gupta – 7 file(s) modified
Updated Vendor Recon

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5207 – removed whitespae from on the model

amit.gupta — Fri, 18 May 2012 14:54:02 +0530

amit.gupta – 1 file(s) modified
removed whitespae from on the model

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 5206 – Added space to the Operating system as given in the ...

amit.gupta — Thu, 17 May 2012 19:46:58 +0530

amit.gupta – 1 file(s) modified
Added space to the Operating system as given in the enum

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/operatingsystem.py

Rev 5205 – Added space to the Operating system as given in the ...

amit.gupta — Thu, 17 May 2012 19:46:23 +0530

amit.gupta – 1 file(s) modified
Added space to the Operating system as given in the enum

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 5204 – Processors scores reverted

amit.gupta — Thu, 17 May 2012 19:18:02 +0530

amit.gupta – 1 file(s) modified
Processors scores reverted

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 5203 – Ticket Id : #1265 #1277 Reviewed by : Anupam Singh ...

amar.kumar — Thu, 17 May 2012 18:57:54 +0530

amar.kumar – 6 file(s) modified
Ticket Id : #1265 #1277
Reviewed by : Anupam Singh

Enhancements in Activity creation/display and ticket/activity reports.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm

Rev 5202 – Added type of airway bill number along with provider.

rajveer — Thu, 17 May 2012 16:30:12 +0530

rajveer – 1 file(s) modified
Added type of airway bill number along with provider.

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py

Rev 5201 – To change the awb numbers for given ser of orders.

rajveer — Thu, 17 May 2012 15:27:00 +0530

rajveer – 1 file(s) modified
To change the awb numbers for given ser of orders.

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

Rev 5200 – Separating bookingCube and salesCube

anupam.singh — Thu, 17 May 2012 14:25:41 +0530

anupam.singh – 1 file(s) modified
Separating bookingCube and salesCube

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 5199 – Fixed bugs where reservation field was not getting appropriately updated ...

mandeep.dhir — Thu, 17 May 2012 11:19:10 +0530

mandeep.dhir – 1 file(s) modified
Fixed bugs where reservation field was not getting appropriately updated
Reviewer: Rajveer

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

Rev 5198 – Corrected a logged statement

varun.gupta — Thu, 17 May 2012 08:06:45 +0530

varun.gupta – 1 file(s) modified
Corrected a logged statement

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

Rev 5197 – Checking for empty string

anupam.singh — Wed, 16 May 2012 18:47:15 +0530

anupam.singh – 1 file(s) modified
Checking for empty string

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 5196 – Added Title to Glossary listing page

varun.gupta — Wed, 16 May 2012 18:03:36 +0530

varun.gupta – 1 file(s) modified
Added Title to Glossary listing page

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

Rev 5195 – Using 18th column instead of 14th.

anupam.singh — Wed, 16 May 2012 17:57:12 +0530

anupam.singh – 1 file(s) modified
Using 18th column instead of 14th.

~ /trunk/pentaho/scripts/start-pentaho

Rev 5194 – Trac #1290 Reviewer : Mandeep Dhir Added capability in ...

anupam.singh — Wed, 16 May 2012 17:54:55 +0530

anupam.singh – 1 file(s) modified
Trac #1290
Reviewer : Mandeep Dhir

Added capability in EmailSender of sending mails to multiple users.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 5193 – Corrected paths in email sender start up script.

rajveer — Wed, 16 May 2012 17:50:42 +0530

rajveer – 1 file(s) modified
Corrected paths in email sender start up script.

~ /trunk/runutils/init.d/email-sender

Rev 5192 – Modified title parsing logic

varun.gupta — Wed, 16 May 2012 16:02:57 +0530

varun.gupta – 1 file(s) modified
Modified title parsing logic

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

Rev 5191 – changing loglevel for GAE logging failure to WARN from ERROR ...

amar.kumar — Wed, 16 May 2012 15:17:45 +0530

amar.kumar – 1 file(s) modified
changing loglevel for GAE logging failure to WARN from ERROR and adding some parameters in log

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

Rev 5190 – Added Most Compared Phones index

varun.gupta — Wed, 16 May 2012 14:01:36 +0530

varun.gupta – 1 file(s) modified
Added Most Compared Phones index

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

Rev 5189 – Vendor Reconciliation - added unsettled orders sheet

varun.gupta — Wed, 16 May 2012 13:31:05 +0530

varun.gupta – 11 file(s) modified
Vendor Reconciliation - added unsettled orders sheet

~ /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/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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5188 – Create user client if required, otherwise not.

rajveer — Wed, 16 May 2012 13:12:41 +0530

rajveer – 1 file(s) modified
Create user client if required, otherwise not.

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