SmartDukaan – /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 7900 – Changed logic to not to assign to delhivery for time ...

rajveer — Fri, 02 Aug 2013 17:36:07 +0530

rajveer – 1 file(s) modified
Changed logic to not to assign to delhivery for time being.

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

Rev 7870 – Fixed issue in service.

rajveer — Tue, 30 Jul 2013 18:22:04 +0530

rajveer – 1 file(s) modified
Fixed issue in service.

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

Rev 7857 – Logistics estimate according to location.

rajveer — Tue, 30 Jul 2013 13:08:31 +0530

rajveer – 1 file(s) modified
Logistics estimate according to location.

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

Rev 7841 – Committed by Manish Sharma for Multiple Pincode Updation on 29-Jul-2013

manish.sharma — Mon, 29 Jul 2013 12:57:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Multiple Pincode Updation on 29-Jul-2013

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

Rev 7786 – Committed by Manish Sharma for Multiple Pincode Updation on 22-Jul-2013

manish.sharma — Mon, 22 Jul 2013 13:17:11 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Multiple Pincode Updation on 22-Jul-2013

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

Rev 7733 – Committed by Manish Sharma for Multiple Pincode Updation on 11-Jul-2013

manish.sharma — Thu, 11 Jul 2013 11:49:31 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Multiple Pincode Updation on 11-Jul-2013

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

Rev 7627 – Add prepaid provider limit for bluedart and other couriers.

rajveer — Wed, 26 Jun 2013 10:56:11 +0530

rajveer – 2 file(s) modified
Add prepaid provider limit for bluedart and other couriers.

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

Rev 7608 – Logistics Estimation should be based on warehouse also.

rajveer — Mon, 24 Jun 2013 10:46:51 +0530

rajveer – 2 file(s) modified
Logistics Estimation should be based on warehouse also.

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

Rev 7589 – Updated logic for item availability cache to include weight.

rajveer — Thu, 20 Jun 2013 16:05:51 +0530

rajveer – 4 file(s) modified
Updated logic for item availability cache to include weight.

Rev 7567 – Support to add new awb numbers for courier provider.

rajveer — Tue, 18 Jun 2013 18:19:05 +0530

rajveer – 8 file(s) modified
Support to add new awb numbers for courier provider.

Rev 7489 – Change logic for cod limit based on pincode.

rajveer — Thu, 13 Jun 2013 17:20:19 +0530

rajveer – 1 file(s) modified
Change logic for cod limit based on pincode.

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

Rev 7442 – Amazon Acknowledgement Feed Changes

vikram.raghav — Mon, 10 Jun 2013 22:56:09 +0530

vikram.raghav – 8 file(s) modified
Amazon Acknowledgement Feed Changes

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonOrdersToAcknowledge.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7425 – Changed the recommended price in case of pp.

rajveer — Fri, 07 Jun 2013 19:59:01 +0530

rajveer – 1 file(s) modified
Changed the recommended price in case of pp.

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

Rev 7293 – - Changes related to StoreWebsite - Added source to ...

anupam.singh — Fri, 17 May 2013 13:30:57 +0530

anupam.singh – 23 file(s) modified
- Changes related to StoreWebsite
- Added source to "change_transaction_status" method

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
x /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm@7272)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /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
~ /trunk/PyProj/src/shop2020/model/v1/order/script/CreateRTGSBulkOrders.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.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/services/CommonPaymentService.java

Rev 7275 – Amended method to calculate min advance amount.

rajveer — Tue, 14 May 2013 12:42:23 +0530

rajveer – 2 file(s) modified
Amended method to calculate min advance amount.

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

Rev 7272 – storewebsite entity page. added brandInfo table for product brands in ...

amit.gupta — Mon, 13 May 2013 15:24:49 +0530

amit.gupta – 72 file(s) modified
storewebsite entity page.
added brandInfo table for product brands in catalog.

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
+ /StoreWebsite/src/main/resources/ehcache.xml
+ /StoreWebsite/src/main/webapp/css/common.css
+ /StoreWebsite/src/main/webapp/css/entity.css
+ /StoreWebsite/src/main/webapp/css/header-footer.css
+ /StoreWebsite/src/main/webapp/css/product.css
+ /StoreWebsite/src/main/webapp/js/all.js
+ /StoreWebsite/src/main/webapp/js/cart-details.js
+ /StoreWebsite/src/main/webapp/js/cartVariation_AB.js
+ /StoreWebsite/src/main/webapp/js/cart_ABTesting.js
+ /StoreWebsite/src/main/webapp/js/charLimit.js
+ /StoreWebsite/src/main/webapp/js/common.js
+ /StoreWebsite/src/main/webapp/js/comparison.js
+ /StoreWebsite/src/main/webapp/js/contact-us.js
+ /StoreWebsite/src/main/webapp/js/conversionPage.js
+ /StoreWebsite/src/main/webapp/js/custom-jquery.js
+ /StoreWebsite/src/main/webapp/js/entity.js
+ /StoreWebsite/src/main/webapp/js/facebook.js
+ /StoreWebsite/src/main/webapp/js/ga-invoker.js
+ /StoreWebsite/src/main/webapp/js/gallery.js
+ /StoreWebsite/src/main/webapp/js/jquery-ui-1.8.6.custom.min.js
+ /StoreWebsite/src/main/webapp/js/jquery-ui.js
+ /StoreWebsite/src/main/webapp/js/jquery-ui.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.cookie.js
+ /StoreWebsite/src/main/webapp/js/jquery.easing.1.3.js
+ /StoreWebsite/src/main/webapp/js/jquery.imgareaselect.pack.js
+ /StoreWebsite/src/main/webapp/js/jquery.js
+ /StoreWebsite/src/main/webapp/js/jquery.jscrollpane.js
+ /StoreWebsite/src/main/webapp/js/jquery.number_format.js
+ /StoreWebsite/src/main/webapp/js/jquery.qtip-1.0.0-rc3.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.slider.js
+ /StoreWebsite/src/main/webapp/js/jquery.slidy.js
+ /StoreWebsite/src/main/webapp/js/jquery.slidy.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.Storage.js
+ /StoreWebsite/src/main/webapp/js/jquery.tipsy.js
+ /StoreWebsite/src/main/webapp/js/jquery.truncate.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.ui.autocomplete.js
+ /StoreWebsite/src/main/webapp/js/jQueryRotate.js
+ /StoreWebsite/src/main/webapp/js/jsapi.js
+ /StoreWebsite/src/main/webapp/js/loginpop.js
+ /StoreWebsite/src/main/webapp/js/loginregister.js
+ /StoreWebsite/src/main/webapp/js/loopedslider.js
+ /StoreWebsite/src/main/webapp/js/myaccount.js
+ /StoreWebsite/src/main/webapp/js/notification.js
+ /StoreWebsite/src/main/webapp/js/paymode-selection.js
+ /StoreWebsite/src/main/webapp/js/priceSlider.js
+ /StoreWebsite/src/main/webapp/js/proceed-to-pay.js
+ /StoreWebsite/src/main/webapp/js/productCategory.js
+ /StoreWebsite/src/main/webapp/js/recharge.js
+ /StoreWebsite/src/main/webapp/js/remarketing.js
+ /StoreWebsite/src/main/webapp/js/saholicmobilephones.js
+ /StoreWebsite/src/main/webapp/js/scrolltab.js
+ /StoreWebsite/src/main/webapp/js/shippingAddress.js
+ /StoreWebsite/src/main/webapp/js/widgets.js
+ /StoreWebsite/src/main/webapp/js/widget_accordion.js
+ /StoreWebsite/src/main/webapp/js/widget_slidetab.js
+ /StoreWebsite/src/main/webapp/js/youtubeplayer.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /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/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BrandInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7256 – Added infra for store delivery estimate.

rajveer — Thu, 09 May 2013 17:53:22 +0530

rajveer – 17 file(s) modified
Added infra for store delivery estimate.

~ /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/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/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StorePricing.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7022 – Added logic of 5K and 10K for red express.

rajveer — Thu, 21 Mar 2013 18:28:05 +0530

rajveer – 1 file(s) modified
Added logic of 5K and 10K for red express.

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

Rev 7021 – Added the Red express as courier partner.

rajveer — Thu, 21 Mar 2013 18:06:53 +0530

rajveer – 1 file(s) modified
Added the Red express as courier partner.

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

Rev 6965 – Remove the Red Express from list of billers.

rajveer — Wed, 06 Mar 2013 17:37:22 +0530

rajveer – 1 file(s) modified
Remove the Red Express from list of billers.

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

Rev 6939 – Assign orders for selected pincodes to red express.

rajveer — Tue, 05 Mar 2013 12:54:31 +0530

rajveer – 1 file(s) modified
Assign orders for selected pincodes to red express.

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

Rev 6643 – Added support to store awb updates in our system.

rajveer — Thu, 10 Jan 2013 16:24:05 +0530

rajveer – 17 file(s) modified
Added support to store awb updates in our system.

Rev 6615 – Changes in updatePincode method

amar.kumar — Mon, 07 Jan 2013 15:16:23 +0530

amar.kumar – 1 file(s) modified
Changes in updatePincode method

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

Rev 6611 – Fixing bug for specific pincodes.

amit.gupta — Mon, 07 Jan 2013 11:46:27 +0530

amit.gupta – 1 file(s) modified
Fixing bug for specific pincodes.

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

Rev 6537 – Added option to add delivery delay for selected pincodes.

rajveer — Mon, 24 Dec 2012 16:31:22 +0530

rajveer – 4 file(s) modified
Added option to add delivery delay for selected pincodes.

Rev 6527 – Updated COD limit to 25K for all delhiberry pincodes.

rajveer — Fri, 21 Dec 2012 15:27:00 +0530

rajveer – 1 file(s) modified
Updated COD limit to 25K for all delhiberry pincodes.

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

Rev 6524 – Added code for on time guarantee.

rajveer — Thu, 20 Dec 2012 19:19:16 +0530

rajveer – 14 file(s) modified
Added code for on time guarantee.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

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 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 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 6237 – Changed COD lower limit to 9600.

rajveer — Fri, 19 Oct 2012 19:14:30 +0530

rajveer – 1 file(s) modified
Changed COD lower limit to 9600.

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

Rev 6017 – Change to get destination codes for disabled pincodes for printing ...

amar.kumar — Fri, 14 Sep 2012 18:24:46 +0530

amar.kumar – 2 file(s) modified
Change to get destination codes for disabled pincodes for printing invoices of old orders whose pincode is now disabled.

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

Rev 5964 – Adding amar.kumar@shop2020.in in mailing list for inventory-mismatch, stock-report, negative-reserved, build-scripts ...

amar.kumar — Tue, 11 Sep 2012 11:49:22 +0530

amar.kumar – 7 file(s) modified
Adding amar.kumar@shop2020.in in mailing list for inventory-mismatch, stock-report, negative-reserved, build-scripts
Also change is done for bringing only pincodes in cache with either cod or exp field set. This will allow us to only mark cod/exp field to zero for disabling a pincode rather than deleting the record, hence preventing any issue while taking invoice for an order with a disabled pincode

Reviewed By : Mandeep Dhir

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py
~ /trunk/runutils/build-for-production.sh
~ /trunk/runutils/build-for-shop2020.sh
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Rev 5719 – Added support of hotspot store id in our system.

rajveer — Fri, 03 Aug 2012 13:57:16 +0530

rajveer – 12 file(s) modified
Added support of hotspot store id in our system.

Rev 5692 – Updated logic for assignment of courier to delhivery and bluedart. ...

rajveer — Fri, 27 Jul 2012 16:49:33 +0530

rajveer – 2 file(s) modified
Updated logic for assignment of courier to delhivery and bluedart. Also removed logic of warehouse location.

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

Rev 5624 – Chennai pincodes prepaid limit added for 5000.

rajveer — Wed, 18 Jul 2012 14:57:48 +0530

rajveer – 1 file(s) modified
Chennai pincodes prepaid limit added for 5000.

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

Rev 5605 – Added logic for assignment to Delhivery for Hyderabad pincodes.

rajveer — Mon, 16 Jul 2012 11:53:06 +0530

rajveer – 1 file(s) modified
Added logic for assignment to Delhivery for Hyderabad pincodes.

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

Rev 5572 – Trac # 1472 InStore pickUp UI.

anupam.singh — Tue, 10 Jul 2012 19:21:41 +0530

anupam.singh – 55 file(s) modified
Trac # 1472
InStore pickUp UI.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.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/user/impl/CartDataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm

Rev 5555 – Implementation of Instore pickup interfaces.

rajveer — Mon, 09 Jul 2012 15:35:02 +0530

rajveer – 12 file(s) modified
Implementation of Instore pickup interfaces.

Rev 5527 – Trac # 1453 B2B support Phase-1

anupam.singh — Mon, 02 Jul 2012 14:58:59 +0530

anupam.singh – 33 file(s) modified
Trac # 1453
B2B support Phase-1

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-common.js
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickUpType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Attribute.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java