SmartDukaan – /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 6983 – Updated code for 18 months emi for hdfc PG

rajveer — Wed, 13 Mar 2013 11:05:36 +0530

rajveer – 2 file(s) modified
Updated code for 18 months emi for hdfc PG

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 6955 – Adding RedExpress Barcode FontSize

amar.kumar — Wed, 06 Mar 2013 11:59:49 +0530

amar.kumar – 1 file(s) modified
Adding RedExpress Barcode FontSize

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

Rev 6848 – Sliding Banner and its user interface implementation.

kshitij.sood — Tue, 19 Feb 2013 12:59:14 +0530

kshitij.sood – 27 file(s) modified
Sliding Banner and its user interface implementation.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/ScpService.java
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/css/imgareaselect-default.css
+ /trunk/Website/src/main/webapp/css/jquery.slidy.css
+ /trunk/Website/src/main/webapp/images/add.png
+ /trunk/Website/src/main/webapp/images/background.gif
+ /trunk/Website/src/main/webapp/images/greendot.gif
+ /trunk/Website/src/main/webapp/images/reddot.gif
+ /trunk/Website/src/main/webapp/images/red_dot.gif
+ /trunk/Website/src/main/webapp/js/jquery.imgareaselect.pack.js
+ /trunk/Website/src/main/webapp/js/jquery.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.min.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm

Rev 6807 – Added production parameters for innoviti.

rajveer — Mon, 11 Feb 2013 19:11:13 +0530

rajveer – 1 file(s) modified
Added production parameters for innoviti.

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

Rev 6633 – added helper_service_server_host_prod field for for test machine

amit.gupta — Wed, 09 Jan 2013 18:59:06 +0530

amit.gupta – 1 file(s) modified
added helper_service_server_host_prod field for for test machine

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

Rev 6513 – Added payment configuration for the refund.

rajveer — Wed, 19 Dec 2012 12:32:05 +0530

rajveer – 1 file(s) modified
Added payment configuration for the refund.

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

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 6432 – Basic integration of the innoviti PG.

rajveer — Tue, 04 Dec 2012 19:09:06 +0530

rajveer – 5 file(s) modified
Basic integration of the innoviti PG.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/webapp/WEB-INF/content/innoviti-pay-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/innoviti-pay-show.vm

Rev 6417 – Updated configuration.

rajveer — Mon, 03 Dec 2012 23:14:40 +0530

rajveer – 1 file(s) modified
Updated configuration.

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

Rev 6416 – Added ids for all the emi options.

rajveer — Mon, 03 Dec 2012 22:18:42 +0530

rajveer – 1 file(s) modified
Added ids for all the emi options.

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

Rev 6405 – Added emi options for test pg.

rajveer — Mon, 03 Dec 2012 16:23:32 +0530

rajveer – 1 file(s) modified
Added emi options for test pg.

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

Rev 6403 – Added configuration for 3,6,9 and 12 month emi for hdfc ...

rajveer — Mon, 03 Dec 2012 16:05:15 +0530

rajveer – 1 file(s) modified
Added configuration for 3,6,9 and 12 month emi for hdfc gateway.

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

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 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 6322 – Changes for Following: 1) Option to download Order Confirmation Mail ...

amar.kumar — Sun, 11 Nov 2012 12:06:06 +0530

amar.kumar – 29 file(s) modified
Changes for Following:
1) Option to download Order Confirmation Mail from CRM
2) Option to add new pincode or update/disable serviceability for a provider from Support Reports (Cod-Reconciliation)
3) Option to get Scan Details for a given ItemId/Serial-Number from Inventory Webapp

Reviewed by Anupam Singh

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
~ /trunk/InventoryManager/src/main/webapp/css/common.css
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
+ /trunk/Support/src/main/webapp/css/pincode.css
+ /trunk/Support/src/main/webapp/js/pincode.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.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/ScanMapper.xml

Rev 6122 – Added responceurl for hdfc in test.

rajveer — Tue, 09 Oct 2012 16:40:26 +0530

rajveer – 1 file(s) modified
Added responceurl for hdfc in test.

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

Rev 6097 – promotion service now pointing to local db.

amit.gupta — Sat, 06 Oct 2012 17:56:02 +0530

amit.gupta – 1 file(s) modified
promotion service now pointing to local db.

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

Rev 6070 – Recharge related changes

anupam.singh — Fri, 28 Sep 2012 14:58:36 +0530

anupam.singh – 5 file(s) modified
Recharge related changes

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/WalletOnlyPaymentController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/wallet-only-payment-index.vm

Rev 6063 – Added configuration for payu PG.

rajveer — Fri, 28 Sep 2012 12:33:51 +0530

rajveer – 1 file(s) modified
Added configuration for payu PG.

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

Rev 6050 – Create Recharge.

anupam.singh — Wed, 26 Sep 2012 15:33:51 +0530

anupam.singh – 53 file(s) modified
Create Recharge.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcRechargeResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.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/IPaymentService.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
+ /trunk/Website/src/main/webapp/css/recharge.css
+ /trunk/Website/src/main/webapp/images/+91.png
+ /trunk/Website/src/main/webapp/images/91.jpg
+ /trunk/Website/src/main/webapp/images/back1.png
+ /trunk/Website/src/main/webapp/images/back2.jpg
+ /trunk/Website/src/main/webapp/images/blue.png
+ /trunk/Website/src/main/webapp/images/confirm.png
+ /trunk/Website/src/main/webapp/images/confirm_pressed.png
+ /trunk/Website/src/main/webapp/images/dth.png
+ /trunk/Website/src/main/webapp/images/dth_pressed.png
+ /trunk/Website/src/main/webapp/images/grey.jpg
+ /trunk/Website/src/main/webapp/images/input_back.jpg
+ /trunk/Website/src/main/webapp/images/phone.png
+ /trunk/Website/src/main/webapp/images/phone_pressed.png
+ /trunk/Website/src/main/webapp/images/Rupee.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/hdfc-recharge-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-payment-success.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6000 – Spicedeck backend interfaces and model objects

mandeep.dhir — Wed, 12 Sep 2012 18:19:01 +0530

mandeep.dhir – 21 file(s) modified
Spicedeck backend interfaces and model objects

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DownloadableOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DTHRechargeOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ImmediateConsumedOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/MobileRechargeOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.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/RechargeCoupon.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeCouponStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeResponse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5968 – Added source id as parameter.

rajveer — Tue, 11 Sep 2012 12:50:42 +0530

rajveer – 1 file(s) modified
Added source id as parameter.

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

Rev 5951 – Separating inventory and catalog services

mandeep.dhir — Mon, 10 Sep 2012 07:02:14 +0530

mandeep.dhir – 1 file(s) modified
Separating inventory and catalog services

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

Rev 5949 – Separating inventory and catalog services

mandeep.dhir — Sun, 09 Sep 2012 14:27:36 +0530

mandeep.dhir – 1 file(s) modified
Separating inventory and catalog services

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

Rev 5947 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 18:00:01 +0530

mandeep.dhir – 2 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/runutils/generate-content-from-catalog.sh

Rev 5944 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:34:33 +0530

mandeep.dhir – 58 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/PyProj/src
~ /trunk/PyProj/src/dist
~ /trunk/PyProj/src/shop2020/clients/CatalogClient.py
+ /trunk/PyProj/src/shop2020/clients/InventoryClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py (copied from /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py@5879)
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/InventoryHistoryServer.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/ClearItemAvailabilityCache.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.sh
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/InitialInventoryLoader.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/ProcurementReportProcessor.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory
+ /trunk/PyProj/src/shop2020/model/v1/inventory/impl
+ /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/inventory/impl/InventoryServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/__init__.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/InventoryHistoryServer.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/InventoryServer.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ClearItemAvailabilityCache.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/CompareInventory.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/CompareInventory.sh
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/InitialInventoryLoader.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryStockReportGenerator.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ProcurementReportProcessor.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/__init__.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/test
+ /trunk/PyProj/src/shop2020/model/v1/inventory/test/__init__.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/__init__.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/model/v1/order/test/TestGetValidOrdersCount.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Tablet_campaign.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/test/domain/Test1.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
x /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
x /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/__init__.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/constants.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/__init__.py

Rev 5910 – Adding config parameters for Alert Service connection from Crm machines

amar.kumar — Wed, 29 Aug 2012 19:18:47 +0530

amar.kumar – 1 file(s) modified
Adding config parameters for Alert Service connection from Crm machines

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

Rev 5890 – Showing store shipping address on user-order-info page Showing in-store orders ...

anupam.singh — Fri, 24 Aug 2012 17:29:17 +0530

anupam.singh – 3 file(s) modified
Showing store shipping address on user-order-info page
Showing in-store orders in red
Running logistics service on crm and crm_backup

~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5686 – Added config for hotspot same as shop2020 gateways

mandeep.dhir — Thu, 26 Jul 2012 17:54:55 +0530

mandeep.dhir – 1 file(s) modified
Added config for hotspot same as shop2020 gateways

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

Rev 5685 – Added config for hotspot same as shop2020 gateways

mandeep.dhir — Thu, 26 Jul 2012 17:37:39 +0530

mandeep.dhir – 1 file(s) modified
Added config for hotspot same as shop2020 gateways

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

Rev 5664 – Made folders for html entities configurable on domain basis. It ...

amit.gupta — Tue, 24 Jul 2012 12:34:07 +0530

amit.gupta – 3 file(s) modified
Made folders for html entities configurable on domain basis. It is now used from shop2020.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5660 – Adding configuration for HOTSPOT m/c

mandeep.dhir — Mon, 23 Jul 2012 17:24:50 +0530

mandeep.dhir – 1 file(s) modified
Adding configuration for HOTSPOT m/c

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

Rev 5643 – Adding fontsize for selfpickup

mandeep.dhir — Fri, 20 Jul 2012 17:33:30 +0530

mandeep.dhir – 1 file(s) modified
Adding fontsize for selfpickup

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

Rev 5623 – Trac # 1426, 1263, 1425 Reviewer : Mandeep

anupam.singh — Wed, 18 Jul 2012 13:40:45 +0530

anupam.singh – 11 file(s) modified
Trac # 1426, 1263, 1425
Reviewer : Mandeep

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5611 – Changes in shop2020.cfg for AlertService

amar.kumar — Tue, 17 Jul 2012 03:10:04 +0530

amar.kumar – 1 file(s) modified
Changes in shop2020.cfg for AlertService

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

Rev 5591 – Trac#1191 UI for CRUD operations on vendor/warehouse. Creation takes place ...

mandeep.dhir — Fri, 13 Jul 2012 12:13:41 +0530

mandeep.dhir – 16 file(s) modified
Trac#1191 UI for CRUD operations on vendor/warehouse.
Creation takes place now on staging and then goes live on production on next day.

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/supplier.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 5586 – changes in catalog dashboard to support hotspot reviewer: Mandeep Dhir

phani.kumar — Fri, 13 Jul 2012 00:33:28 +0530

phani.kumar – 15 file(s) modified
changes in catalog dashboard to support hotspot
reviewer: Mandeep Dhir

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/PyProj/src/shop2020/clients/CatalogClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5549 – Checking in 1) thrift generated Code for AlertService in ...

amar.kumar — Thu, 05 Jul 2012 18:41:16 +0530

amar.kumar – 7 file(s) modified
Checking in
1) thrift generated Code for AlertService in python
2) shop2020.cfg parameters for AlertService

+ /trunk/PyProj/src/shop2020/clients/AlertClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
+ /trunk/PyProj/src/shop2020/thriftpy/alert
+ /trunk/PyProj/src/shop2020/thriftpy/alert/AlertService.py
+ /trunk/PyProj/src/shop2020/thriftpy/alert/constants.py
+ /trunk/PyProj/src/shop2020/thriftpy/alert/ttypes.py
+ /trunk/PyProj/src/shop2020/thriftpy/alert/__init__.py

Rev 5462 – Trac#1212 Added purchase report for Hotspot as well. Also, updating ...

mandeep.dhir — Thu, 21 Jun 2012 10:38:05 +0530

mandeep.dhir – 3 file(s) modified
Trac#1212 Added purchase report for Hotspot as well.
Also, updating staging as well when mappings are uploaded

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5262 – Delhivery

phani.kumar — Thu, 24 May 2012 14:58:27 +0530

phani.kumar – 5 file(s) modified
Delhivery

+ /trunk/Common/src/main/java/in/shop2020/serving/services/DelhiveryTrackingService.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
+ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/DelhiveryUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/delhivery-updates-show.vm