SmartDukaan – /

Rev 6319 – GV amount added in order.

rajveer — Fri, 09 Nov 2012 11:18:20 +0530

rajveer – 2 file(s) modified
GV amount added in order.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 6318 – Added support for gift vouchers.

rajveer — Fri, 09 Nov 2012 11:17:53 +0530

rajveer – 15 file(s) modified
Added support for gift vouchers.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /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/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreCollectionController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 6317 – added try catch in case of refunds.

rajveer — Thu, 08 Nov 2012 12:59:58 +0530

rajveer – 1 file(s) modified
added try catch in case of refunds.

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

Rev 6316 – Skipped a colon

anupam.singh — Thu, 08 Nov 2012 12:21:50 +0530

anupam.singh – 1 file(s) modified
Skipped a colon

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

Rev 6315 – Changing address to Kalkaji Warehouse

amar.kumar — Thu, 08 Nov 2012 12:20:37 +0530

amar.kumar – 1 file(s) modified
Changing address to Kalkaji Warehouse

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java

Rev 6314 – Made error message more specific for J&K.

anupam.singh — Thu, 08 Nov 2012 12:16:19 +0530

anupam.singh – 1 file(s) modified
Made error message more specific for J&K.

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

Rev 6313 – Fixed bug where empty circle code caused exception.

anupam.singh — Thu, 08 Nov 2012 12:02:41 +0530

anupam.singh – 1 file(s) modified
Fixed bug where empty circle code caused exception.

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

Rev 6312 – Added new recharge offers for nokia

amit.gupta — Thu, 08 Nov 2012 00:24:35 +0530

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

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

Rev 6311 – When user selects operator from recharge submenu we should not ...

anupam.singh — Wed, 07 Nov 2012 18:50:14 +0530

anupam.singh – 1 file(s) modified
When user selects operator from recharge submenu we should not show him option to view plans until we get the circle.

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

Rev 6310 – Improved sub menu for recharge. Added service availability message. Fixed ...

anupam.singh — Wed, 07 Nov 2012 15:21:15 +0530

anupam.singh – 6 file(s) modified
Improved sub menu for recharge. Added service availability message. Fixed bugs related to operator specific recharge pages.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/DeviceNumberInfo.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6309 – Added check to skip marking giftVoucher true if no coupon ...

amit.gupta — Wed, 07 Nov 2012 14:59:43 +0530

amit.gupta – 1 file(s) modified
Added check to skip marking giftVoucher true if no coupon code is applied.

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

Rev 6308 – Delhivery is restricted to deliver in Delhi only.

amit.gupta — Wed, 07 Nov 2012 12:06:55 +0530

amit.gupta – 1 file(s) modified
Delhivery is restricted to deliver in Delhi only.

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

Rev 6307 – Added support for service availability. Login now message is visible ...

anupam.singh — Tue, 06 Nov 2012 21:42:36 +0530

anupam.singh – 12 file(s) modified
Added support for service availability. Login now message is visible only when customer has some money in his wallet. Disclaimer link abandoned in favour of inline disclaimer.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ServiceAvailability.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/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/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6306 – Removing orders in same transaction from repeat sale cube

anupam.singh — Tue, 06 Nov 2012 16:12:18 +0530

anupam.singh – 1 file(s) modified
Removing orders in same transaction from repeat sale cube

~ /trunk/pentaho/data-integration/transformations/repeatLoader.ktr

Rev 6305 – Added some more statistics.

rajveer — Tue, 06 Nov 2012 12:53:11 +0530

rajveer – 1 file(s) modified
Added some more statistics.

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

Rev 6304 – Changing Assignee in case of Failed Payment, COD-Verification and COD ...

amar.kumar — Tue, 06 Nov 2012 12:51:58 +0530

amar.kumar – 3 file(s) modified
Changing Assignee in case of Failed Payment, COD-Verification and COD Verification escalation tickets (Gaurabh to Shrawan)

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java

Rev 6303 – Revised events on click of Cart Safety Image.

amit.gupta — Tue, 06 Nov 2012 12:45:28 +0530

amit.gupta – 1 file(s) modified
Revised events on click of Cart Safety Image.

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

Rev 6302 – Added logic to generate gift voucher to hide COD and ...

amit.gupta — Tue, 06 Nov 2012 11:52:38 +0530

amit.gupta – 1 file(s) modified
Added logic to generate gift voucher to hide COD and PAY in store options.

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

Rev 6301 – Added logic to generate gift voucher.

amit.gupta — Tue, 06 Nov 2012 11:49:45 +0530

amit.gupta – 6 file(s) modified
Added logic to generate gift voucher.

~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6300 – Added sub menu for Mobile Recharges.

anupam.singh — Mon, 05 Nov 2012 20:13:26 +0530

anupam.singh – 1 file(s) modified
Added sub menu for Mobile Recharges.

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

Rev 6299 – Add user id in the recharge dashboard.

rajveer — Mon, 05 Nov 2012 16:26:20 +0530

rajveer – 1 file(s) modified
Add user id in the recharge dashboard.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-orders-authsuccess.vm

Rev 6298 – Handle empty description.

rajveer — Mon, 05 Nov 2012 16:25:58 +0530

rajveer – 1 file(s) modified
Handle empty description.

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

Rev 6297 – Reduced padding to 17 px.

amit.gupta — Sun, 04 Nov 2012 18:54:08 +0530

amit.gupta – 1 file(s) modified
Reduced padding to 17 px.

~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 6296 – Checking in header for recharge.

amit.gupta — Sun, 04 Nov 2012 14:40:02 +0530

amit.gupta – 1 file(s) modified
Checking in header for recharge.

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

Rev 6295 – Added total payment amount and mismatch column.

rajveer — Fri, 02 Nov 2012 14:05:33 +0530

rajveer – 1 file(s) modified
Added total payment amount and mismatch column.

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

Rev 6294 – Remove the errormessage in case of success.

rajveer — Thu, 01 Nov 2012 18:21:43 +0530

rajveer – 1 file(s) modified
Remove the errormessage in case of success.

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

Rev 6293 – Added validity field in popular recharge div.

anupam.singh — Thu, 01 Nov 2012 15:39:19 +0530

anupam.singh – 1 file(s) modified
Added validity field in popular recharge div.

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

Rev 6292 – Added T&C link on popular plans popup

anupam.singh — Thu, 01 Nov 2012 15:03:33 +0530

anupam.singh – 3 file(s) modified
Added T&C link on popular plans popup

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

Rev 6291 – Corrected Spelling of Refresh

amar.kumar — Thu, 01 Nov 2012 12:19:50 +0530

amar.kumar – 1 file(s) modified
Corrected Spelling of Refresh

~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-processing-index.vm

Rev 6290 – Reverted order status

anupam.singh — Thu, 01 Nov 2012 11:22:58 +0530

anupam.singh – 1 file(s) modified
Reverted order status

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 6289 – Added support for popular recharge denominations.

anupam.singh — Wed, 31 Oct 2012 20:42:41 +0530

anupam.singh – 19 file(s) modified
Added support for popular recharge denominations.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeDenomination.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/TelecomCircle.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/DenominationType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/DeviceNumberInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/MobileNumberInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeDenomination.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/RechargeController.java
+ /trunk/Website/src/main/webapp/images/closePlans.png
~ /trunk/Website/src/main/webapp/js/recharge.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-denomination.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6288 – Added failure reason for recharge failed order emails.

rajveer — Wed, 31 Oct 2012 19:15:03 +0530

rajveer – 1 file(s) modified
Added failure reason for recharge failed order emails.

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

Rev 6287 – Alwats return true for any gv.

rajveer — Wed, 31 Oct 2012 15:56:09 +0530

rajveer – 1 file(s) modified
Alwats return true for any gv.

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

Rev 6286 – Process Transaction Under Process Transactions based on aggregator response.

rajveer — Wed, 31 Oct 2012 15:54:32 +0530

rajveer – 1 file(s) modified
Process Transaction Under Process Transactions based on aggregator response.

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

Rev 6285 – Gift voucher to be allocated after recharge successful.

rajveer — Wed, 31 Oct 2012 15:40:55 +0530

rajveer – 1 file(s) modified
Gift voucher to be allocated after recharge successful.

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

Rev 6284 – JP requested to incroporate item id and color as well.

amit.gupta — Wed, 31 Oct 2012 14:08:05 +0530

amit.gupta – 1 file(s) modified
JP requested to incroporate item id and color as well.

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

Rev 6283 – Saholic Trac] #1649: Headset/ Headphones - sensitivity unit to be ...

amit.gupta — Wed, 31 Oct 2012 12:39:47 +0530

amit.gupta – 1 file(s) modified
Saholic Trac] #1649: Headset/ Headphones - sensitivity unit to be changed

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

Rev 6282 – Changed the rules for voucher as per the request by ...

amit.gupta — Tue, 30 Oct 2012 21:48:57 +0530

amit.gupta – 1 file(s) modified
Changed the rules for voucher as per the request by Abhishek

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

Rev 6281 – Added support to give gift voucher to user and send ...

rajveer — Tue, 30 Oct 2012 18:55:58 +0530

rajveer – 1 file(s) modified
Added support to give gift voucher to user and send mail to him.

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

Rev 6280 – Removed abhishek and others from recharge and pickup from store ...

rajveer — Tue, 30 Oct 2012 17:51:01 +0530

rajveer – 1 file(s) modified
Removed abhishek and others from recharge and pickup from store mails.

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