SmartDukaan – /

Rev 6480 – Additional info (Emi widget)

kshitij.sood — Tue, 11 Dec 2012 13:02:13 +0530

kshitij.sood – 1 file(s) modified
Additional info (Emi widget)

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

Rev 6479 –

anupam.singh — Tue, 11 Dec 2012 11:55:02 +0530

anupam.singh – 1 file(s) modified

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

Rev 6478 – Post to GA if we have received orders in last ...

rajveer — Tue, 11 Dec 2012 10:32:07 +0530

rajveer – 1 file(s) modified
Post to GA if we have received orders in last 10 minutes.

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

Rev 6477 – Added windows 8 pro as new os for laptops.

amit.gupta — Tue, 11 Dec 2012 10:29:05 +0530

amit.gupta – 2 file(s) modified
Added windows 8 pro as new os for laptops.

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

Rev 6476 – Added cameras to gosf page.

rajveer — Mon, 10 Dec 2012 22:38:25 +0530

rajveer – 1 file(s) modified
Added cameras to gosf page.

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

Rev 6475 – Google analytics enable only if order received in last 10 ...

rajveer — Mon, 10 Dec 2012 19:38:55 +0530

rajveer – 2 file(s) modified
Google analytics enable only if order received in last 10 minutes and order status is successful.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6474 – Improved ETL for orderLoader so that it takes less time.

anupam.singh — Mon, 10 Dec 2012 16:40:49 +0530

anupam.singh – 1 file(s) modified
Improved ETL for orderLoader so that it takes less time.

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

Rev 6473 – Updated models for gosf.

rajveer — Mon, 10 Dec 2012 14:54:55 +0530

rajveer – 1 file(s) modified
Updated models for gosf.

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

Rev 6472 – Added Intel Core 3rd Gen i3, for laptops

amit.gupta — Mon, 10 Dec 2012 14:35:28 +0530

amit.gupta – 1 file(s) modified
Added Intel Core 3rd Gen i3, for laptops

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

Rev 6471 – updated the date format

amit.gupta — Sat, 08 Dec 2012 10:05:33 +0530

amit.gupta – 1 file(s) modified
updated the date format

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

Rev 6470 – added logic for end on for coupon. Now 1 promotion ...

amit.gupta — Sat, 08 Dec 2012 09:34:49 +0530

amit.gupta – 1 file(s) modified
added logic for end on for coupon. Now 1 promotion id will suffice all different sort of gift vouchers and coupons in case of specific items.

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

Rev 6469 – added rule for new gosf.

amit.gupta — Fri, 07 Dec 2012 17:17:42 +0530

amit.gupta – 1 file(s) modified
added rule for new gosf.

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

Rev 6468 – Corrected varible to render correct page.

rajveer — Fri, 07 Dec 2012 16:50:10 +0530

rajveer – 1 file(s) modified
Corrected varible to render correct page.

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

Rev 6467 – Changes for Purchase Return Reviewed by Amit Gupta

amar.kumar — Fri, 07 Dec 2012 16:40:35 +0530

amar.kumar – 44 file(s) modified
Changes for Purchase Return
Reviewed by Amit Gupta

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/images
+ /trunk/InventoryManager/src/main/webapp/images/add.png
+ /trunk/InventoryManager/src/main/webapp/images/copy.png
+ /trunk/InventoryManager/src/main/webapp/images/copy_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/csv.png
+ /trunk/InventoryManager/src/main/webapp/images/csv_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/pdf.png
+ /trunk/InventoryManager/src/main/webapp/images/pdf_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/print.png
+ /trunk/InventoryManager/src/main/webapp/images/print_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/xls.png
+ /trunk/InventoryManager/src/main/webapp/images/xls_hover.png
+ /trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
+ /trunk/InventoryManager/src/main/webapp/js/purchase-return.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6466 – fixed the rechrage voucher specific bug.

amit.gupta — Fri, 07 Dec 2012 13:02:11 +0530

amit.gupta – 1 file(s) modified
fixed the rechrage voucher specific bug.

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

Rev 6465 – Coupon was being tracked even for empty coupons. Fixed now.

anupam.singh — Fri, 07 Dec 2012 12:40:23 +0530

anupam.singh – 1 file(s) modified
Coupon was being tracked even for empty coupons. Fixed now.

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

Rev 6464 – Google Shopping T&C page.

kshitij.sood — Fri, 07 Dec 2012 12:36:36 +0530

kshitij.sood – 1 file(s) modified
Google Shopping T&C page.

+ /trunk/Website/src/main/webapp/WEB-INF/content/gosf-terms-conditions.vm

Rev 6463 – Added page for google shopping festival.

rajveer — Fri, 07 Dec 2012 12:31:59 +0530

rajveer – 2 file(s) modified
Added page for google shopping festival.

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

Rev 6462 – Recharge order details.

rajveer — Thu, 06 Dec 2012 19:09:43 +0530

rajveer – 2 file(s) modified
Recharge order details.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrdersController.java

Rev 6461 – Added support to display wallet amount in case of recharge ...

rajveer — Thu, 06 Dec 2012 19:01:13 +0530

rajveer – 2 file(s) modified
Added support to display wallet amount in case of recharge orders.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrdersController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm

Rev 6460 – RAM feature made recommended. As it is not possible to ...

amit.gupta — Thu, 06 Dec 2012 18:11:24 +0530

amit.gupta – 1 file(s) modified
RAM feature made recommended.
As it is not possible to mark it not available.

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

Rev 6459 – Added some emi options.

rajveer — Thu, 06 Dec 2012 17:58:53 +0530

rajveer – 1 file(s) modified
Added some emi options.

~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 6458 – Added new payment options.

rajveer — Thu, 06 Dec 2012 17:42:58 +0530

rajveer – 1 file(s) modified
Added new payment options.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java

Rev 6457 – Set totalAmount while setting amount.

rajveer — Thu, 06 Dec 2012 16:24:00 +0530

rajveer – 1 file(s) modified
Set totalAmount while setting amount.

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

Rev 6456 –

amit.gupta — Thu, 06 Dec 2012 15:41:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 6455 –

amit.gupta — Thu, 06 Dec 2012 15:32:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 6454 – rounded off the discount amount rather than the, discounted price.

amit.gupta — Thu, 06 Dec 2012 15:27:06 +0530

amit.gupta – 1 file(s) modified
rounded off the discount amount rather than the, discounted price.

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

Rev 6453 – EMI Widget.

kshitij.sood — Thu, 06 Dec 2012 13:57:01 +0530

kshitij.sood – 3 file(s) modified
EMI Widget.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/css/widgets.css
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6452 – Updated the variable.

rajveer — Thu, 06 Dec 2012 13:19:42 +0530

rajveer – 1 file(s) modified
Updated the variable.

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

Rev 6451 – Process payment authorized transactions.

rajveer — Thu, 06 Dec 2012 13:12:44 +0530

rajveer – 1 file(s) modified
Process payment authorized transactions.

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

Rev 6450 – Promotion now also supports percentage.

amit.gupta — Thu, 06 Dec 2012 13:03:34 +0530

amit.gupta – 1 file(s) modified
Promotion now also supports percentage.

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

Rev 6449 – Corrected method to check hdfc PG.

rajveer — Thu, 06 Dec 2012 11:58:42 +0530

rajveer – 1 file(s) modified
Corrected method to check hdfc PG.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 6448 – Capture EMI payment gateways.

rajveer — Thu, 06 Dec 2012 11:37:14 +0530

rajveer – 1 file(s) modified
Capture EMI payment gateways.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 6447 – Changed image path.

rajveer — Wed, 05 Dec 2012 14:33:30 +0530

rajveer – 1 file(s) modified
Changed image path.

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

Rev 6446 – Corrected return url.

rajveer — Wed, 05 Dec 2012 14:19:30 +0530

rajveer – 1 file(s) modified
Corrected return url.

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

Rev 6445 – Changed color from red to blue for successful coupon application

anupam.singh — Wed, 05 Dec 2012 13:57:28 +0530

anupam.singh – 1 file(s) modified
Changed color from red to blue for successful coupon application

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

Rev 6444 – Send coupon details in mail.

rajveer — Wed, 05 Dec 2012 13:06:17 +0530

rajveer – 1 file(s) modified
Send coupon details in mail.

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

Rev 6443 – Bug Fixes. 1) Even After applying Coupon full amount is ...

anupam.singh — Wed, 05 Dec 2012 12:52:24 +0530

anupam.singh – 5 file(s) modified
Bug Fixes.
1) Even After applying Coupon full amount is being charged at the gateway
2) In case of applying incorrect coupon there is no way to retry appying a coupon.
3) Limit of 2 coupon applications per user is not there, can apply more than 2 times.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm

Rev 6442 – Integration of EMI scheme for the innoviti payment gateway.

rajveer — Wed, 05 Dec 2012 12:44:04 +0530

rajveer – 3 file(s) modified
Integration of EMI scheme for the innoviti payment gateway.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6441 – Process refund in case of coupon in recharge orders.

rajveer — Wed, 05 Dec 2012 12:29:58 +0530

rajveer – 1 file(s) modified
Process refund in case of coupon in recharge orders.

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