SmartDukaan – /

Rev 6402 – Corrected the path for multiple emi resources.

rajveer — Mon, 03 Dec 2012 15:10:27 +0530

rajveer – 1 file(s) modified
Corrected the path for multiple emi resources.

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

Rev 6401 – Changed logic to use same code for all emi transactions ...

rajveer — Mon, 03 Dec 2012 14:59:37 +0530

rajveer – 2 file(s) modified
Changed logic to use same code for all emi transactions for hdfc emi.

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

Rev 6400 – Clicking the "recharge now" button, hides it to avoid double ...

anupam.singh — Mon, 03 Dec 2012 14:54:18 +0530

anupam.singh – 2 file(s) modified
Clicking the "recharge now" button, hides it to avoid double clicks

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

Rev 6399 – Made message more generic

rajveer — Mon, 03 Dec 2012 14:47:47 +0530

rajveer – 1 file(s) modified
Made message more generic

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

Rev 6398 – Changed text to make it more generic

rajveer — Mon, 03 Dec 2012 14:22:43 +0530

rajveer – 1 file(s) modified
Changed text to make it more generic

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

Rev 6397 – When changing operators plan dropdown was not getting removed. Also ...

anupam.singh — Sun, 02 Dec 2012 20:07:03 +0530

anupam.singh – 2 file(s) modified
When changing operators plan dropdown was not getting removed. Also handled the operator plan mismatch in backend

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

Rev 6396 – minor fixes to run order service.

amit.gupta — Fri, 30 Nov 2012 18:15:42 +0530

amit.gupta – 4 file(s) modified
minor fixes to run order service.

~ /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/order/impl/OrderServiceHandler.py

Rev 6395 – Scrapers for Airtel and Vodafone Plans.

kshitij.sood — Fri, 30 Nov 2012 17:42:54 +0530

kshitij.sood – 2 file(s) modified
Scrapers for Airtel and Vodafone Plans.

+ /trunk/PyProj/src/shop2020/model/v1/order/script/Airtel.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/VodafonePlans.py

Rev 6394 – Removed usernote as it is not being used.

amit.gupta — Fri, 30 Nov 2012 17:28:21 +0530

amit.gupta – 3 file(s) modified
Removed usernote as it is not being used.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py

Rev 6393 – Sending plan in optional1 argument instead of optional2

anupam.singh — Fri, 30 Nov 2012 16:15:09 +0530

anupam.singh – 1 file(s) modified
Sending plan in optional1 argument instead of optional2

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

Rev 6392 – changed emiSchemType to i64

amit.gupta — Thu, 29 Nov 2012 21:03:42 +0530

amit.gupta – 4 file(s) modified
changed emiSchemType to i64

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6391 – Changing default rows and added thead and tbody in table ...

amar.kumar — Thu, 29 Nov 2012 19:48:22 +0530

amar.kumar – 1 file(s) modified
Changing default rows and added thead and tbody in table for datatable to work correctly

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm

Rev 6390 – Added basic infrastructure for EMI services.

rajveer — Thu, 29 Nov 2012 19:25:31 +0530

rajveer – 12 file(s) modified
Added basic infrastructure for EMI services.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayResponseController.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/services/CodPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/InnovitiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PayuPaymentService.java

Rev 6389 – Adding infrastructure for EMI charging.

rajveer — Thu, 29 Nov 2012 19:02:41 +0530

rajveer – 20 file(s) modified
Adding infrastructure for EMI charging.

~ /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
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.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/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/order/EmiChargeType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6388 – Changes to correct date format, Added Go to Home page ...

amar.kumar — Thu, 29 Nov 2012 18:45:20 +0530

amar.kumar – 4 file(s) modified
Changes to correct date format, Added Go to Home page button and added css and js for datatable

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
+ /trunk/InventoryManager/src/main/webapp/css/TableTools.css
+ /trunk/InventoryManager/src/main/webapp/js/TableTools.min.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm

Rev 6387 – Adding vendor name in all vendor reconcilliation sheets

amar.kumar — Thu, 29 Nov 2012 17:45:54 +0530

amar.kumar – 1 file(s) modified
Adding vendor name in all vendor reconcilliation sheets

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

Rev 6386 –

amar.kumar — Thu, 29 Nov 2012 13:08:16 +0530

amar.kumar – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py

Rev 6385 – Showing All purchases in Purchase Order show page irrespective of ...

amar.kumar — Thu, 29 Nov 2012 12:58:07 +0530

amar.kumar – 4 file(s) modified
Showing All purchases in Purchase Order show page irrespective of State of purchase

Reviewed by Amit Gupta

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 6384 – make the title dynamic.

rajveer — Wed, 28 Nov 2012 08:57:42 +0530

rajveer – 1 file(s) modified
make the title dynamic.

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

Rev 6383 – make the title dynamic.

rajveer — Wed, 28 Nov 2012 08:57:29 +0530

rajveer – 1 file(s) modified
make the title dynamic.

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

Rev 6382 – Changed order.

rajveer — Tue, 27 Nov 2012 22:53:19 +0530

rajveer – 1 file(s) modified
Changed order.

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

Rev 6381 – Created new page for sony products.

rajveer — Tue, 27 Nov 2012 22:52:52 +0530

rajveer – 1 file(s) modified
Created new page for sony products.

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

Rev 6380 – Changes for 1) Adding recieved timestamp of purchase 2) ...

amar.kumar — Tue, 27 Nov 2012 16:35:27 +0530

amar.kumar – 3 file(s) modified
Changes for
1) Adding recieved timestamp of purchase
2) We have to remove the option of continuing a purchase
3) Stop changing inventory for real warehouses

Reviewed by Amar

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/PyProj/src/shop2020/purchase/main/model/Purchase.py

Rev 6379 – Removed Nokia models from recharge offer page.

rajveer — Tue, 27 Nov 2012 12:22:31 +0530

rajveer – 1 file(s) modified
Removed Nokia models from recharge offer page.

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

Rev 6378 – Reverting the helper service hostname and portname to default values

amar.kumar — Mon, 26 Nov 2012 18:52:57 +0530

amar.kumar – 1 file(s) modified
Reverting the helper service hostname and portname to default values

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

Rev 6377 – Added session username.

rajveer — Mon, 26 Nov 2012 17:00:40 +0530

rajveer – 1 file(s) modified
Added session username.

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

Rev 6376 – Changed the password.

rajveer — Mon, 26 Nov 2012 15:52:38 +0530

rajveer – 1 file(s) modified
Changed the password.

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

Rev 6375 – Updated title.

rajveer — Mon, 26 Nov 2012 15:49:06 +0530

rajveer – 1 file(s) modified
Updated title.

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

Rev 6374 – Added break in the file.

rajveer — Mon, 26 Nov 2012 15:34:12 +0530

rajveer – 1 file(s) modified
Added break in the file.

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

Rev 6373 – Corrected circle id issues.

rajveer — Mon, 26 Nov 2012 15:28:12 +0530

rajveer – 1 file(s) modified
Corrected circle id issues.

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

Rev 6372 – MAde changes for all circles.

rajveer — Mon, 26 Nov 2012 15:03:07 +0530

rajveer – 1 file(s) modified
MAde changes for all circles.

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

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.

~ /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/Support/src/main/java/in/shop2020/support/controllers/RechargeAvailabilityController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeOrdersController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-availability-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-availability-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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