SmartDukaan – /

Rev 4993 – Trac#1069 Pushing changes to VendorItemMapping to productionas well when 'Push ...

mandeep.dhir — Sun, 15 Apr 2012 11:10:04 +0530

mandeep.dhir – 1 file(s) modified
Trac#1069
Pushing changes to VendorItemMapping to productionas well when 'Push to Production' button is hit

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

Rev 4992 – Letting negative availability cases be autofixed Trac#1118

mandeep.dhir — Sat, 14 Apr 2012 19:54:40 +0530

mandeep.dhir – 1 file(s) modified
Letting negative availability cases be autofixed
Trac#1118

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

Rev 4991 – PLB related changes Changing type of quantity from long to ...

mandeep.dhir — Sat, 14 Apr 2012 14:47:04 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Changing type of quantity from long to Double
Trac#1118

~ /trunk/Support/src/main/java/in/shop2020/support/models/PLBDetails.java

Rev 4990 – PLB related changes Changing type of quantity from long to ...

mandeep.dhir — Sat, 14 Apr 2012 14:44:46 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Changing type of quantity from long to Double
Trac#1118

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

Rev 4989 – PLB related changes Query fix Trac#1118

mandeep.dhir — Sat, 14 Apr 2012 13:50:17 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Query fix
Trac#1118

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

Rev 4988 – PLB related changes Missed imports Trac#1118

mandeep.dhir — Sat, 14 Apr 2012 13:17:44 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Missed imports
Trac#1118

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

Rev 4987 – PLB related changes Support related cahnges where we need to ...

mandeep.dhir — Sat, 14 Apr 2012 12:34:39 +0530

mandeep.dhir – 18 file(s) modified
PLB related changes
Support related cahnges where we need to process the PLB response and reset availability
Trac#1118

x /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/WarehouseController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/PLBDetails.java
x /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
x /trunk/Support/src/main/webapp/js/purchase.js
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-create.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-index.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-show.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/updates-lsuccess.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/warehouse-index.vm

Rev 4986 – PLB related changes Running queries to fetch inventory from PLB ...

mandeep.dhir — Sat, 14 Apr 2012 12:18:16 +0530

mandeep.dhir – 1 file(s) modified
PLB related changes
Running queries to fetch inventory from PLB table. Posting these to fix the availability.
Trac#1118

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

Rev 4985 – PLB related changes Added methods in service to read the ...

mandeep.dhir — Sat, 14 Apr 2012 12:17:05 +0530

mandeep.dhir – 7 file(s) modified
PLB related changes
Added methods in service to read the keys of missed inventory updates.
Trac#1118

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4984 – Ticket #1087 - Adding to closed Compare List widget will ...

varun.gupta — Fri, 13 Apr 2012 20:35:50 +0530

varun.gupta – 2 file(s) modified
Ticket #1087 - Adding to closed Compare List widget will now open it & deleting from it, all items will collapse it

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

Rev 4983 – Ticket #1117 AWB Displays and then Vanishes from My Account

phani.kumar — Fri, 13 Apr 2012 20:03:25 +0530

phani.kumar – 8 file(s) modified
Ticket #1117 AWB Displays and then Vanishes from My Account

~ /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/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm

Rev 4982 – Added another status to mark as Delivered.

rajveer — Fri, 13 Apr 2012 18:47:39 +0530

rajveer – 1 file(s) modified
Added another status to mark as Delivered.

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

Rev 4981 – Removed the default selected, as now we are getting all ...

rajveer — Fri, 13 Apr 2012 17:30:28 +0530

rajveer – 1 file(s) modified
Removed the default selected, as now we are getting all them as dynamic.

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

Rev 4980 – Ticket #1119 Suggestion are not populated correctly reviewer: Rajveer

phani.kumar — Fri, 13 Apr 2012 17:07:56 +0530

phani.kumar – 1 file(s) modified
Ticket #1119 Suggestion are not populated correctly
reviewer: Rajveer

~ /trunk/Website/src/main/java/in/shop2020/serving/services/AutoSuggestService.java

Rev 4979 – Modelling of holidays on for all vendors. This will take ...

rajveer — Fri, 13 Apr 2012 16:48:46 +0530

rajveer – 6 file(s) modified
Modelling of holidays on for all vendors. This will take care of monthly, weekly and specific holidays for all vendors.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.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/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4978 – Fixing order statuses

mandeep.dhir — Fri, 13 Apr 2012 16:35:21 +0530

mandeep.dhir – 1 file(s) modified
Fixing order statuses

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

Rev 4977 – #1123: USB Cable - USB Version - Make it recommended

amit.gupta — Fri, 13 Apr 2012 15:37:38 +0530

amit.gupta – 1 file(s) modified
#1123: USB Cable - USB Version - Make it recommended

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

Rev 4976 – Ticket Id : #1111 Reviewed by : Phani Kumar, Anupam ...

amar.kumar — Fri, 13 Apr 2012 13:19:09 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #1111
Reviewed by : Phani Kumar, Anupam Singh

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/AddDataLogServlet.java

Rev 4975 – Ticket #1119 Suggestion are not populated correctly reviewer: Rajveer

phani.kumar — Fri, 13 Apr 2012 12:38:25 +0530

phani.kumar – 1 file(s) modified
Ticket #1119 Suggestion are not populated correctly
reviewer: Rajveer

~ /trunk/Website/src/main/java/in/shop2020/serving/services/AutoSuggestService.java

Rev 4974 – bug fix for required check for child slides

amit.gupta — Fri, 13 Apr 2012 10:24:08 +0530

amit.gupta – 1 file(s) modified
bug fix for required check for child slides

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm

Rev 4973 – Escaping special characters in Color field also

mandeep.dhir — Thu, 12 Apr 2012 18:41:34 +0530

mandeep.dhir – 1 file(s) modified
Escaping special characters in Color field also

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

Rev 4972 – Ticket Id : #1100 Reviewed by : Rajveer Singh

amar.kumar — Thu, 12 Apr 2012 18:12:27 +0530

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

~ /trunk/Website/src/main/java/in/shop2020/serving/services/ContentServingService.java

Rev 4971 – Trac#1070 Not sending emails in case

mandeep.dhir — Thu, 12 Apr 2012 18:06:18 +0530

mandeep.dhir – 1 file(s) modified
Trac#1070 Not sending emails in case

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

Rev 4970 – added logs of amazon prices and availability

amit.gupta — Thu, 12 Apr 2012 17:52:18 +0530

amit.gupta – 1 file(s) modified
added logs of amazon prices and availability

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

Rev 4969 – Commented out confirmation mail.

amit.gupta — Thu, 12 Apr 2012 17:50:16 +0530

amit.gupta – 1 file(s) modified
Commented out confirmation mail.

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

Rev 4968 – Fixed bugs reported by content team. 1. Auto check was ...

amit.gupta — Thu, 12 Apr 2012 17:10:24 +0530

amit.gupta – 1 file(s) modified
Fixed bugs reported by content team.
1. Auto check was getting removed in case of child slides.
2. Links for freeform content/youtube url was not working for child slides.

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm

Rev 4967 – Added new enum value for Connector Type for Data Cables. ...

amit.gupta — Thu, 12 Apr 2012 16:04:21 +0530

amit.gupta – 1 file(s) modified
Added new enum value for Connector Type for Data Cables.
#1128

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

Rev 4966 – phone number of warehouse in charges removed from mails and ...

phani.kumar — Thu, 12 Apr 2012 14:55:52 +0530

phani.kumar – 1 file(s) modified
phone number of warehouse in charges removed from mails and name of in charge changed for one warehouse

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

Rev 4965 – Raise the warning if the files are not found for ...

rajveer — Thu, 12 Apr 2012 13:13:43 +0530

rajveer – 1 file(s) modified
Raise the warning if the files are not found for Product properties.

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

Rev 4964 – #1104 Changed titles as recomended

amit.gupta — Thu, 12 Apr 2012 13:04:35 +0530

amit.gupta – 1 file(s) modified
#1104
Changed titles as recomended

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

Rev 4963 – Logging different types of exceptions separately

varun.gupta — Thu, 12 Apr 2012 12:57:10 +0530

varun.gupta – 1 file(s) modified
Logging different types of exceptions separately

~ /trunk/Common/src/main/java/in/shop2020/utils/DataLogger.java

Rev 4962 – #1104

amit.gupta — Thu, 12 Apr 2012 12:34:45 +0530

amit.gupta – 1 file(s) modified
#1104

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

Rev 4961 – Corrected the permissions

rajveer — Thu, 12 Apr 2012 12:31:03 +0530

rajveer – 1 file(s) modified
Corrected the permissions

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

Rev 4960 – Removing because permissions are not correct

rajveer — Thu, 12 Apr 2012 12:30:06 +0530

rajveer – 1 file(s) modified
Removing because permissions are not correct

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

Rev 4959 – Added support for child slide being optional #1108

amit.gupta — Thu, 12 Apr 2012 12:29:32 +0530

amit.gupta – 12 file(s) modified
Added support for child slide being optional
#1108

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editSlide.vm
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/ChildSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/DefinitionsContainer.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/SlideDefinition.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/ChildSlideType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/SlideDefinitionType.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedChildSlideDefinition.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ExpandedSlideDefinition.java
x /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/MM.java
~ /trunk/ContentStore/src/xml/metamodel/core.xsd
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 4958 – Added script for building on shop2020

rajveer — Thu, 12 Apr 2012 12:12:25 +0530

rajveer – 1 file(s) modified
Added script for building on shop2020

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

Rev 4957 – Ticket #1026 Enhancement need in selection criteria for master sheet ...

phani.kumar — Thu, 12 Apr 2012 11:50:46 +0530

phani.kumar – 13 file(s) modified
Ticket #1026 Enhancement need in selection criteria for master sheet generator
reviewer: Rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4956 – Activated authentication interceptor

varun.gupta — Thu, 12 Apr 2012 11:46:48 +0530

varun.gupta – 1 file(s) modified
Activated authentication interceptor

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

Rev 4955 – Start reloading the config server properties after each restart of ...

rajveer — Thu, 12 Apr 2012 11:33:32 +0530

rajveer – 9 file(s) modified
Start reloading the config server properties after each restart of service.

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

Rev 4954 – Added back with execute premissions.

rajveer — Thu, 12 Apr 2012 11:26:04 +0530

rajveer – 1 file(s) modified
Added back with execute premissions.

+ /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py