SmartDukaan – /

Rev 6371 – Added method for service availability.

rajveer — Mon, 26 Nov 2012 14:59:25 +0530

rajveer – 10 file(s) modified
Added method for service availability.

Rev 6370 – Moved back some orders to delhivery.

rajveer — Mon, 26 Nov 2012 10:44:12 +0530

rajveer – 1 file(s) modified
Moved back some orders to delhivery.

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

Rev 6369 – Changed date to Nov 30 as requested by abhishek.

amit.gupta — Thu, 22 Nov 2012 16:03:15 +0530

amit.gupta – 1 file(s) modified
Changed date to Nov 30 as requested by abhishek.

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

Rev 6368 – Changed date to Nov 30 as requested by abhishek.

amit.gupta — Thu, 22 Nov 2012 11:48:38 +0530

amit.gupta – 1 file(s) modified
Changed date to Nov 30 as requested by abhishek.

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

Rev 6367 – added promotiontype to promotion table

amit.gupta — Wed, 21 Nov 2012 18:39:03 +0530

amit.gupta – 10 file(s) modified
added promotiontype to promotion table

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.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_discount_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6366 – Correcting url for getting order confirmation mail

amar.kumar — Wed, 21 Nov 2012 11:26:32 +0530

amar.kumar – 1 file(s) modified
Correcting url for getting order confirmation mail

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 6365 – Changed vat rate in sales report. Its now being picked ...

amit.gupta — Tue, 20 Nov 2012 16:19:42 +0530

amit.gupta – 1 file(s) modified
Changed vat rate in sales report.
Its now being picked up from line item of the order.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java

Rev 6364 – In purchase report do not include DOA_REPLACED.

rajveer — Tue, 20 Nov 2012 15:53:29 +0530

rajveer – 1 file(s) modified
In purchase report do not include DOA_REPLACED.

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6363 – Added Super LCD2 to screen.

amit.gupta — Tue, 20 Nov 2012 15:00:02 +0530

amit.gupta – 1 file(s) modified
Added Super LCD2 to screen.

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

Rev 6362 – Group By purchase id.

rajveer — Mon, 19 Nov 2012 17:29:28 +0530

rajveer – 1 file(s) modified
Group By purchase id.

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6361 – Added purchase Id against each order.

rajveer — Mon, 19 Nov 2012 17:28:00 +0530

rajveer – 7 file(s) modified
Added purchase Id against each order.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6360 –

amit.gupta — Fri, 16 Nov 2012 13:51:47 +0530

amit.gupta – 2 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/promotions-index.vm

Rev 6359 – to remove unwanted inconsistent entity.

amit.gupta — Fri, 16 Nov 2012 13:47:54 +0530

amit.gupta – 1 file(s) modified
to remove unwanted inconsistent entity.

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

Rev 6358 – Updated enum for ios 6

amit.gupta — Thu, 15 Nov 2012 17:33:57 +0530

amit.gupta – 1 file(s) modified
Updated enum for ios 6

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

Rev 6357 – Corrected recharge refund script.

rajveer — Thu, 15 Nov 2012 15:51:45 +0530

rajveer – 1 file(s) modified
Corrected recharge refund script.

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

Rev 6356 – Added method isCodApplicable to Promotion

amit.gupta — Thu, 15 Nov 2012 14:59:16 +0530

amit.gupta – 5 file(s) modified
Added method isCodApplicable to Promotion

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /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/ProceedToPayController.java

Rev 6355 – Added cod to promotion

amit.gupta — Thu, 15 Nov 2012 14:56:37 +0530

amit.gupta – 4 file(s) modified
Added cod to promotion

~ /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

Rev 6354 – Ammended careers page.

rajveer — Thu, 15 Nov 2012 11:46:23 +0530

rajveer – 1 file(s) modified
Ammended careers page.

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

Rev 6353 – Remove pickup store option for the amount above 20000 for ...

rajveer — Thu, 15 Nov 2012 11:42:08 +0530

rajveer – 2 file(s) modified
Remove pickup store option for the amount above 20000 for delhi/ncr.

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

Rev 6352 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 20:03:54 +0530

anupam.singh – 1 file(s) modified
corrected zone id

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

Rev 6351 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 20:00:28 +0530

anupam.singh – 1 file(s) modified
corrected zone id

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

Rev 6350 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 19:23:47 +0530

anupam.singh – 1 file(s) modified
corrected zone id

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

Rev 6349 – Added a new banner image

anupam.singh — Wed, 14 Nov 2012 19:13:44 +0530

anupam.singh – 1 file(s) modified
Added a new banner image

+ /trunk/Website/src/main/webapp/images/Banner_Recharge_New.jpg

Rev 6348 – Reduced one line break.

rajveer — Wed, 14 Nov 2012 19:10:45 +0530

rajveer – 1 file(s) modified
Reduced one line break.

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

Rev 6347 – Added another openx zone on recharge home page.

anupam.singh — Wed, 14 Nov 2012 19:09:27 +0530

anupam.singh – 2 file(s) modified
Added another openx zone on recharge home page.

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

Rev 6346 – Return type should be decimal.

rajveer — Wed, 14 Nov 2012 18:27:00 +0530

rajveer – 1 file(s) modified
Return type should be decimal.

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

Rev 6345 – Return type should be decimal.

rajveer — Wed, 14 Nov 2012 18:26:39 +0530

rajveer – 1 file(s) modified
Return type should be decimal.

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

Rev 6344 – Removing unused images

anupam.singh — Wed, 14 Nov 2012 18:10:52 +0530

anupam.singh – 2 file(s) modified
Removing unused images

x /trunk/Website/src/main/webapp/images/Post-On-Facebook.jpg
x /trunk/Website/src/main/webapp/images/tweet-about-us.png

Rev 6343 – Corrected allignment of the banner.

rajveer — Wed, 14 Nov 2012 17:33:30 +0530

rajveer – 1 file(s) modified
Corrected allignment of the banner.

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

Rev 6342 – Exclude unversioned resource folder from struts actions.

rajveer — Wed, 14 Nov 2012 17:26:21 +0530

rajveer – 1 file(s) modified
Exclude unversioned resource folder from struts actions.

~ /trunk/Website/src/main/resources/struts.xml

Rev 6341 – added a folder to keep unversioned images.

anupam.singh — Wed, 14 Nov 2012 17:05:24 +0530

anupam.singh – 5 file(s) modified
added a folder to keep unversioned images.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
+ /trunk/Website/src/main/webapp/unversioned
+ /trunk/Website/src/main/webapp/unversioned/images
+ /trunk/Website/src/main/webapp/unversioned/images/Post-On-Facebook.jpg
+ /trunk/Website/src/main/webapp/unversioned/images/tweet-about-us.png

Rev 6340 – Corrected URL of image.

rajveer — Wed, 14 Nov 2012 16:57:02 +0530

rajveer – 1 file(s) modified
Corrected URL of image.

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

Rev 6339 – Added events on tweet and share buttons on recharge-result page.

anupam.singh — Wed, 14 Nov 2012 16:50:44 +0530

anupam.singh – 2 file(s) modified
Added events on tweet and share buttons on recharge-result page.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6338 – Do not allow recharge from test machine.

rajveer — Wed, 14 Nov 2012 16:30:46 +0530

rajveer – 2 file(s) modified
Do not allow recharge from test machine.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py

Rev 6337 – Commented mails portion.

rajveer — Wed, 14 Nov 2012 16:13:03 +0530

rajveer – 1 file(s) modified
Commented mails portion.

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

Rev 6336 – Added tweet and post on facebook button on success page. ...

anupam.singh — Wed, 14 Nov 2012 15:49:52 +0530

anupam.singh – 16 file(s) modified
Added tweet and post on facebook button on success page. Changed text depending upon denomination Type.

~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/DeviceNumberInfo.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/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
+ /trunk/Website/src/main/webapp/images/tweet-about-us.png
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-denomination.vm

Rev 6335 – Pay in store should be enabled for all amounts.

rajveer — Wed, 14 Nov 2012 15:32:33 +0530

rajveer – 1 file(s) modified
Pay in store should be enabled for all amounts.

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

Rev 6334 – Added link to recharge page on T&C page

rajveer — Wed, 14 Nov 2012 14:11:41 +0530

rajveer – 1 file(s) modified
Added link to recharge page on T&C page

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

Rev 6333 – Added tnc Maximum 2 Coupon Codes will be issued per ...

amit.gupta — Mon, 12 Nov 2012 17:46:42 +0530

amit.gupta – 1 file(s) modified
Added tnc
Maximum 2 Coupon Codes will be issued per user.

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

Rev 6332 – Added resouces for printing bar code

rajveer — Mon, 12 Nov 2012 17:44:14 +0530

rajveer – 1 file(s) modified
Added resouces for printing bar code

+ /trunk/HotspotDashboard/src/main/resources/saholic-wn.TTF