SmartDukaan – /

Rev 5998 – changed type to float instead of int.

amit.gupta — Wed, 12 Sep 2012 15:39:21 +0530

amit.gupta – 1 file(s) modified
changed type to float instead of int.

~ /trunk/ContentStore/src/jython/irdatarules/cameras/optical-zoom.py

Rev 5997 – Updated Coupon definition.

amit.gupta — Wed, 12 Sep 2012 14:55:38 +0530

amit.gupta – 1 file(s) modified
Updated Coupon definition.

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

Rev 5996 – Added SJunglee as private coupon.

amit.gupta — Wed, 12 Sep 2012 14:52:37 +0530

amit.gupta – 1 file(s) modified
Added SJunglee as private coupon.

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

Rev 5995 – Added items whose values should not get updated to Junglee

amit.gupta — Wed, 12 Sep 2012 14:24:08 +0530

amit.gupta – 1 file(s) modified
Added items whose values should not get updated to Junglee

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

Rev 5994 – Removed unused imports

rajveer — Wed, 12 Sep 2012 14:17:23 +0530

rajveer – 1 file(s) modified
Removed unused imports

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

Rev 5993 – Changed the mail to be sent to customers to include ...

rajveer — Wed, 12 Sep 2012 13:30:25 +0530

rajveer – 1 file(s) modified
Changed the mail to be sent to customers to include oh my god text.

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

Rev 5992 – Changed the mail to be sent to customers to include ...

rajveer — Wed, 12 Sep 2012 13:30:07 +0530

rajveer – 1 file(s) modified
Changed the mail to be sent to customers to include oh my god text.

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

Rev 5991 – Added message for OH My GOD Contest.

rajveer — Wed, 12 Sep 2012 13:15:28 +0530

rajveer – 1 file(s) modified
Added message for OH My GOD Contest.

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

Rev 5990 – Convert date to pydate before storing it.

rajveer — Wed, 12 Sep 2012 13:13:52 +0530

rajveer – 1 file(s) modified
Convert date to pydate before storing it.

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

Rev 5989 – Return response if the order is not getting billed.

rajveer — Wed, 12 Sep 2012 13:06:15 +0530

rajveer – 1 file(s) modified
Return response if the order is not getting billed.

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

Rev 5988 – Added TallyAgent

mandeep.dhir — Wed, 12 Sep 2012 12:47:28 +0530

mandeep.dhir – 2 file(s) modified
Added TallyAgent

x /ClientAgent/src/main/java/in/shop2020/agent/utils/SNCAAgent.java
+ /ClientAgent/src/main/java/in/shop2020/agent/utils/TallyAgent.java (copied from /ClientAgent/src/main/java/in/shop2020/agent/utils/SNCAAgent.java@5202)

Rev 5987 – Added import function.

rajveer — Wed, 12 Sep 2012 12:47:13 +0530

rajveer – 1 file(s) modified
Added import function.

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

Rev 5986 – Separating catalog and inventory services

mandeep.dhir — Wed, 12 Sep 2012 12:32:28 +0530

mandeep.dhir – 1 file(s) modified
Separating catalog and inventory services

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

Rev 5985 – Corrected the clear itemavailability cache

rajveer — Wed, 12 Sep 2012 12:32:26 +0530

rajveer – 1 file(s) modified
Corrected the clear itemavailability cache

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

Rev 5984 – Separating catalog and inventory services

mandeep.dhir — Wed, 12 Sep 2012 12:22:46 +0530

mandeep.dhir – 1 file(s) modified
Separating catalog and inventory services

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

Rev 5983 – changed souceid variable to self.sourceid.

rajveer — Wed, 12 Sep 2012 12:16:35 +0530

rajveer – 1 file(s) modified
changed souceid variable to self.sourceid.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 5982 – Added definition check for api and pane.

amit.gupta — Wed, 12 Sep 2012 11:49:46 +0530

amit.gupta – 1 file(s) modified
Added definition check for api and pane.

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

Rev 5981 – Remove static content older than 3 days.

rajveer — Wed, 12 Sep 2012 11:39:15 +0530

rajveer – 1 file(s) modified
Remove static content older than 3 days.

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

Rev 5980 – If billing timestamp is not set than print AWB date ...

rajveer — Tue, 11 Sep 2012 16:29:46 +0530

rajveer – 1 file(s) modified
If billing timestamp is not set than print AWB date as current date.

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

Rev 5979 – Removed unused methods.

rajveer — Tue, 11 Sep 2012 16:17:55 +0530

rajveer – 1 file(s) modified
Removed unused methods.

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

Rev 5978 – Added support to cache item availability based on source

rajveer — Tue, 11 Sep 2012 16:17:27 +0530

rajveer – 9 file(s) modified
Added support to cache item availability based on source

~ /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/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 5977 – Removed limit of top 50.

rajveer — Tue, 11 Sep 2012 15:24:47 +0530

rajveer – 1 file(s) modified
Removed limit of top 50.

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

Rev 5976 – order.delivery_timestamp is already of datetime type. No need to format ...

anupam.singh — Tue, 11 Sep 2012 15:08:52 +0530

anupam.singh – 1 file(s) modified
order.delivery_timestamp is already of datetime type. No need to format it.

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

Rev 5975 –

amit.gupta — Tue, 11 Sep 2012 15:00:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 5974 –

amit.gupta — Tue, 11 Sep 2012 14:42:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 5973 – New contest page for oh-my-god.

amit.gupta — Tue, 11 Sep 2012 14:40:58 +0530

amit.gupta – 1 file(s) modified
New contest page for oh-my-god.

+ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god.vm

Rev 5972 – Added new rule for junglee promotions.

amit.gupta — Tue, 11 Sep 2012 14:28:55 +0530

amit.gupta – 1 file(s) modified
Added new rule for junglee promotions.

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

Rev 5971 – Separating catalog and inventory services

mandeep.dhir — Tue, 11 Sep 2012 14:20:41 +0530

mandeep.dhir – 1 file(s) modified
Separating catalog and inventory services

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py

Rev 5970 – Added new rule for junglee

amit.gupta — Tue, 11 Sep 2012 14:15:52 +0530

amit.gupta – 1 file(s) modified
Added new rule for junglee

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_junglee_coupons.py

Rev 5969 – Including those orders as well which are in verification pending ...

anupam.singh — Tue, 11 Sep 2012 14:10:56 +0530

anupam.singh – 2 file(s) modified
Including those orders as well which are in verification pending state.

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 5968 – Added source id as parameter.

rajveer — Tue, 11 Sep 2012 12:50:42 +0530

rajveer – 1 file(s) modified
Added source id as parameter.

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

Rev 5967 – Added support of reservation according to multiple sources.

rajveer — Tue, 11 Sep 2012 12:48:54 +0530

rajveer – 1 file(s) modified
Added support of reservation according to multiple sources.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java

Rev 5966 – Added support of reservation according to multiple sources.

rajveer — Tue, 11 Sep 2012 12:48:38 +0530

rajveer – 7 file(s) modified
Added support of reservation according to multiple sources.

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 5965 – Bug fix. Needed to subtract order's quantity

mandeep.dhir — Tue, 11 Sep 2012 12:14:49 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Needed to subtract order's quantity

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

Rev 5964 – Adding amar.kumar@shop2020.in in mailing list for inventory-mismatch, stock-report, negative-reserved, build-scripts ...

amar.kumar — Tue, 11 Sep 2012 11:49:22 +0530

amar.kumar – 7 file(s) modified
Adding amar.kumar@shop2020.in in mailing list for inventory-mismatch, stock-report, negative-reserved, build-scripts
Also change is done for bringing only pincodes in cache with either cod or exp field set. This will allow us to only mark cod/exp field to zero for disabling a pincode rather than deleting the record, hence preventing any issue while taking invoice for an order with a disabled pincode

Reviewed By : Mandeep Dhir

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py
~ /trunk/runutils/build-for-production.sh
~ /trunk/runutils/build-for-shop2020.sh
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Rev 5963 – Separating inventory and catalog services

mandeep.dhir — Mon, 10 Sep 2012 13:17:39 +0530