SmartDukaan – /

Rev 6759 – Changes to add NLC field

amar.kumar — Tue, 29 Jan 2013 19:54:23 +0530

amar.kumar – 6 file(s) modified
Changes to add NLC field

~ /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/client/VendorPricesDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorPricings.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/VendorPricesDialog.ui.xml

Rev 6758 – Changed error message

anupam.singh — Tue, 29 Jan 2013 17:32:05 +0530

anupam.singh – 1 file(s) modified
Changed error message

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

Rev 6757 – Updated case temporarily.

rajveer — Tue, 29 Jan 2013 17:04:21 +0530

rajveer – 1 file(s) modified
Updated case temporarily.

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

Rev 6756 – Auto generated for NLC.

amar.kumar — Tue, 29 Jan 2013 16:36:46 +0530

amar.kumar – 2 file(s) modified
Auto generated for NLC.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 6755 – Auto generated for NLC.

amar.kumar — Tue, 29 Jan 2013 16:36:16 +0530

amar.kumar – 1 file(s) modified
Auto generated for NLC.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py

Rev 6754 – while validating coupon we had not taken care of string ...

anupam.singh — Tue, 29 Jan 2013 16:34:04 +0530

anupam.singh – 1 file(s) modified
while validating coupon we had not taken care of string "login".

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

Rev 6753 – Corrected comment.

rajveer — Tue, 29 Jan 2013 15:41:13 +0530

rajveer – 1 file(s) modified
Corrected comment.

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

Rev 6752 – Checking in generated code for nlc field in VendorItemPricing

amar.kumar — Tue, 29 Jan 2013 15:08:23 +0530

amar.kumar – 1 file(s) modified
Checking in generated code for nlc field in VendorItemPricing

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

Rev 6751 – Changes for billing of OURS EXTERNAL and changes for nlc ...

amar.kumar — Tue, 29 Jan 2013 14:58:50 +0530

amar.kumar – 6 file(s) modified
Changes for billing of OURS EXTERNAL and changes for nlc in InventoryService

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.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/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 6750 – Changed the invoice printing format in case of ours external ...

rajveer — Tue, 29 Jan 2013 14:39:46 +0530

rajveer – 1 file(s) modified
Changed the invoice printing format in case of ours external billing.

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

Rev 6749 – Repositioned tiles (cart widget)

kshitij.sood — Tue, 29 Jan 2013 14:13:33 +0530

kshitij.sood – 1 file(s) modified
Repositioned tiles (cart widget)

~ /trunk/Website/src/main/resources/templates/cartwidget.vm

Rev 6748 – Changes for Getting ItemNumber and SerialNumber from Hotspot etp database ...

amar.kumar — Tue, 29 Jan 2013 13:00:31 +0530

amar.kumar – 1 file(s) modified
Changes for Getting ItemNumber and SerialNumber from Hotspot etp database and putting it in our order database

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

Rev 6747 – Changes for Getting ItemNumber and SerialNumber from Hotspot etp database ...

amar.kumar — Tue, 29 Jan 2013 13:00:25 +0530

amar.kumar – 6 file(s) modified
Changes for Getting ItemNumber and SerialNumber from Hotspot etp database and putting it in our order database

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/BillingUpdate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6746 – Added support of ours external billing in hotspot dashboard.

rajveer — Tue, 29 Jan 2013 12:38:31 +0530

rajveer – 7 file(s) modified
Added support of ours external billing in hotspot dashboard.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BillingType.java

Rev 6745 – While marking orders as delivered, we now commit the session ...

anupam.singh — Tue, 29 Jan 2013 12:02:30 +0530

anupam.singh – 1 file(s) modified
While marking orders as delivered, we now commit the session for each order individually instead of doing a bulk commit.

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

Rev 6744 – Scan out in case of after billing olny.

rajveer — Mon, 28 Jan 2013 17:00:08 +0530

rajveer – 1 file(s) modified
Scan out in case of after billing olny.

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

Rev 6743 – Added 'Accidental Damage Protection' to warranty enum

amit.gupta — Mon, 28 Jan 2013 15:35:49 +0530

amit.gupta – 1 file(s) modified
Added 'Accidental Damage Protection' to warranty enum

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

Rev 6742 – Coupon code should have been passed after arguments in createCoupon

anupam.singh — Sun, 27 Jan 2013 10:23:37 +0530

anupam.singh – 1 file(s) modified
Coupon code should have been passed after arguments in createCoupon

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

Rev 6741 – Passing empty coupon code while marking deliverd

anupam.singh — Sat, 26 Jan 2013 20:17:15 +0530

anupam.singh – 1 file(s) modified
Passing empty coupon code while marking deliverd

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

Rev 6740 –

amit.gupta — Sat, 26 Jan 2013 12:27:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 6739 – minor changes

amit.gupta — Sat, 26 Jan 2013 12:02:52 +0530

amit.gupta – 1 file(s) modified
minor changes

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

Rev 6738 – simple null check

amit.gupta — Sat, 26 Jan 2013 10:56:39 +0530

amit.gupta – 1 file(s) modified
simple null check

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

Rev 6737 – Added width to success message of width 500

amit.gupta — Fri, 25 Jan 2013 21:29:06 +0530

amit.gupta – 1 file(s) modified
Added width to success message of width 500

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css

Rev 6736 – Added emi discount logic.

amit.gupta — Fri, 25 Jan 2013 15:42:43 +0530

amit.gupta – 22 file(s) modified
Added emi discount logic.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6735 – Adding Sale Scan for Reshipped Orders when same product is ...

amar.kumar — Fri, 25 Jan 2013 14:36:10 +0530

amar.kumar – 1 file(s) modified
Adding Sale Scan for Reshipped Orders when same product is sent for reshipped order when billed from our warehouse

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

Rev 6734 – Adding permanent and temporary serviceAvailability flags

anupam.singh — Fri, 25 Jan 2013 01:24:01 +0530

anupam.singh – 2 file(s) modified
Adding permanent and temporary serviceAvailability flags

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

Rev 6733 – Added enums to transactionRequiringExtraProcessing class which were added to the ...

anupam.singh — Thu, 24 Jan 2013 15:12:54 +0530

anupam.singh – 1 file(s) modified
Added enums to transactionRequiringExtraProcessing class which were added to the table but not to the class

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

Rev 6732 – added Tiegra

amit.gupta — Thu, 24 Jan 2013 14:41:51 +0530

amit.gupta – 2 file(s) modified
added Tiegra

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6731 – Changed cod limit from 10K to 25K as per new ...

amit.gupta — Thu, 24 Jan 2013 13:58:33 +0530

amit.gupta – 1 file(s) modified
Changed cod limit from 10K to 25K as per new rules.

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

Rev 6730 – User specific coupons only apply after login. Gave option in ...

anupam.singh — Thu, 24 Jan 2013 13:35:45 +0530

anupam.singh – 9 file(s) modified
User specific coupons only apply after login. Gave option in coupon dashboard to specify a name of the coupon.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java

Rev 6729 – corrected case sensitive attributes.

amit.gupta — Wed, 23 Jan 2013 15:10:37 +0530

amit.gupta – 1 file(s) modified
corrected case sensitive attributes.

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

Rev 6728 – Update courier delivery estimate at the time of order shipping.

rajveer — Wed, 23 Jan 2013 13:03:43 +0530

rajveer – 1 file(s) modified
Update courier delivery estimate at the time of order shipping.

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

Rev 6727 – Displaying emails as a simple string and not an array

anupam.singh — Tue, 22 Jan 2013 15:27:06 +0530

anupam.singh – 1 file(s) modified
Displaying emails as a simple string and not an array

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

Rev 6726 – Added new field of courier delivery time in order.

rajveer — Tue, 22 Jan 2013 15:12:28 +0530

rajveer – 8 file(s) modified
Added new field of courier delivery time in order.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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/thriftpy/model/v1/order/ttypes.py
~ /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 6725 – Added billing type and delivery delay in inventory and logistics ...

rajveer — Tue, 22 Jan 2013 14:55:23 +0530

rajveer – 6 file(s) modified
Added billing type and delivery delay in inventory and logistics service.

~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 6724 – Added script to send mail for extra inventory

rajveer — Tue, 22 Jan 2013 13:27:36 +0530

rajveer – 1 file(s) modified
Added script to send mail for extra inventory

+ /trunk/runutils/negativeInventoryReport.sh

Rev 6723 – Trimming device number before storing it

anupam.singh — Tue, 22 Jan 2013 13:22:37 +0530

anupam.singh – 1 file(s) modified
Trimming device number before storing it

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

Rev 6722 – removed unnecessary domains in products.

amit.gupta — Tue, 22 Jan 2013 13:05:41 +0530

amit.gupta – 1 file(s) modified
removed unnecessary domains in products.

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

Rev 6721 – Added new recharge offers

amit.gupta — Tue, 22 Jan 2013 12:42:43 +0530

amit.gupta – 1 file(s) modified
Added new recharge offers

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

Rev 6720 – Updated logic to show product if only selling price is ...

amit.gupta — Tue, 22 Jan 2013 12:36:08 +0530

amit.gupta – 1 file(s) modified
Updated logic to show product if only selling price is to be shown.

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