SmartDukaan – /

Rev 6019 – Added support to unaccept, mark rto in transit and change ...

rajveer — Mon, 17 Sep 2012 12:27:15 +0530

rajveer – 30 file(s) modified
Added support to unaccept, mark rto in transit and change jacket number to admin.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeJacketNumberEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkRtoInTransitEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkRtoInTransitEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/UnacceptOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/UnacceptOrderEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChangeJacketBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChooseColorBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/MarkDeliveredBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChangeJacketNumberHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/MarkRtoInTransitHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/UnacceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeJacketNumberRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeJacketNumberResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkRtoInTransitRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkRtoInTransitResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UnacceptOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UnacceptOrderResponse.java
~ /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/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

Rev 6018 – Made Rs.500 discount in Junglee for SIII 16GB

amit.gupta — Mon, 17 Sep 2012 11:01:38 +0530

amit.gupta – 1 file(s) modified
Made Rs.500 discount in Junglee for SIII 16GB

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

Rev 6017 – Change to get destination codes for disabled pincodes for printing ...

amar.kumar — Fri, 14 Sep 2012 18:24:46 +0530

amar.kumar – 2 file(s) modified
Change to get destination codes for disabled pincodes for printing invoices of old orders whose pincode is now disabled.

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

Rev 6016 – Changed from tuser to euser.

rajveer — Fri, 14 Sep 2012 16:56:20 +0530

rajveer – 1 file(s) modified
Changed from tuser to euser.

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

Rev 6015 – Fixed error in updating vendor item pricing.

amit.gupta — Fri, 14 Sep 2012 16:08:58 +0530

amit.gupta – 1 file(s) modified
Fixed error in updating vendor item pricing.

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

Rev 6014 – Fixed error in updating vendor item pricing.

amit.gupta — Fri, 14 Sep 2012 16:05:05 +0530

amit.gupta – 1 file(s) modified
Fixed error in updating vendor item pricing.

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

Rev 6013 – Change to use cumulative availability for warehouses sharing common billing ...

amar.kumar — Fri, 14 Sep 2012 14:52:28 +0530

amar.kumar – 1 file(s) modified
Change to use cumulative availability for warehouses sharing common billing warehouse for calculating transfer delay
Reviewed By : Rajveer Singh

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

Rev 6012 – Escaped html in values

amit.gupta — Fri, 14 Sep 2012 14:24:35 +0530

amit.gupta – 1 file(s) modified
Escaped html in values

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6011 – Added check of start date and end date while applying ...

rajveer — Fri, 14 Sep 2012 12:39:00 +0530

rajveer – 1 file(s) modified
Added check of start date and end date while applying coupon.

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

Rev 6010 – Added last status timestamp field.

rajveer — Fri, 14 Sep 2012 11:23:55 +0530

rajveer – 2 file(s) modified
Added last status timestamp field.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreStatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-statistics-authsuccess.vm

Rev 6009 – Corrected the calculation of logic for specific user coupons.

amit.gupta — Thu, 13 Sep 2012 17:14:38 +0530

amit.gupta – 1 file(s) modified
Corrected the calculation of logic for specific user coupons.

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

Rev 6008 – Viewfinder for compact cameras is restored

amit.gupta — Thu, 13 Sep 2012 14:07:45 +0530

amit.gupta – 1 file(s) modified
Viewfinder for compact cameras is restored

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

Rev 6007 – Corrected method call.

rajveer — Thu, 13 Sep 2012 12:59:19 +0530

rajveer – 1 file(s) modified
Corrected method call.

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

Rev 6006 –

amit.gupta — Thu, 13 Sep 2012 12:45:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 6005 – Viewfinder for compact cameras is restored

amit.gupta — Thu, 13 Sep 2012 12:24:35 +0530

amit.gupta – 3 file(s) modified
Viewfinder for compact cameras is restored

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

Rev 6004 – Removed Asghar and added Khushal in the report.

rajveer — Thu, 13 Sep 2012 11:39:59 +0530

rajveer – 1 file(s) modified
Removed Asghar and added Khushal in the report.

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

Rev 6003 – Removed fourth line of t & c

amit.gupta — Thu, 13 Sep 2012 11:39:18 +0530

amit.gupta – 1 file(s) modified
Removed fourth line of t & c

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

Rev 6002 – Bug fix in user specific coupon.

amit.gupta — Wed, 12 Sep 2012 21:43:41 +0530

amit.gupta – 1 file(s) modified
Bug fix in user specific coupon.

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

Rev 6001 – Bug fix in user specific coupon.

amit.gupta — Wed, 12 Sep 2012 19:17:59 +0530

amit.gupta – 1 file(s) modified
Bug fix in user specific coupon.

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

Rev 6000 – Spicedeck backend interfaces and model objects

mandeep.dhir — Wed, 12 Sep 2012 18:19:01 +0530

mandeep.dhir – 21 file(s) modified
Spicedeck backend interfaces and model objects

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DownloadableOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DTHRechargeOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ImmediateConsumedOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/MobileRechargeOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.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/RechargeCoupon.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeCouponStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeResponse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5999 – #1595

amit.gupta — Wed, 12 Sep 2012 16:28:07 +0530

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

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

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