diff --git a/.travis.yml b/.travis.yml index 9a94626445095f107d4447316fb995b4f00fbbb6..ea1c267b481704e9bf04048ce7b8f98c73c0f936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,10 @@ before_script: # Change memmory_limit for travis server - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv rehash; + - composer install --no-interaction --prefer-source --dev + - cd setup + - composer install --no-interaction --prefer-source --dev + - cd .. script: # Unit tests - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi" diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ba3ae52992c28d9d3d00e9747f63f02e1faf17a..43781a27f9eb3d68045e3b33069ab2e33f970899 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,103 @@ +0.1.0-alpha99 +============= + * Released Performance Toolkit + * GitHub requests: + * [#665](https://github.com/magento/magento2/issues/665) -- Main menu event in wrong area + * [#666](https://github.com/magento/magento2/pull/666) -- Update di.xml + * [#602](https://github.com/magento/magento2/issues/602) -- Magento\Sales\Model\Order::getFullTaxInfo() incorrectly combines percentages + * [#673](https://github.com/magento/magento2/issues/673) -- Fixed fatal error during installation + * Functional tests: + * Updated API-functional test for Customer and Address metadata service + * Add cross sell + * Add a product to wishlist + * Add up sell + * Checkout with gift messages + * Create an order from a customer + * Create a shipment for offline payment methods + * Delete a product from mini shopping cart + * Reorder + * Sales order report + * Updating URL rewrites from a category page + * Layout updates: + * Moved layout files to the page_layout directory + * Moved layout validation files to framework + * Theme updates: + * Blank Theme layouts & templates were unified + * Search Library: + * Added ability to aggregate queries for MySQL adapter + * Implemented automatic range aggregation for MySQL adapter + * Search module: + * Introduced the Search module + * Moved autocomplete to the Search module + * Added base UI to the Search module + * Documentation: + * Added basic description of modules in the README.md files + * Modularity: + * Created API and script to get module and dependency information + * Framework Improvements: + * Decomposed heavy objects basing on profiling results + * Refactored the getCustomAttributesCodes method in ProductService + * Refactored Customer Model to use Group Model instead of Group Service + * Updated Travis configuration to run "composer install" + * Performance improvements: + * Removed unnecessary "save order" call during order submission step + * Fixed missing installation features of the new setup: + * Added missing installation parameters: admin_no_form_key, order_increment_prefix, cleanup_database + * Fixed the link to the license agreement in web installer + * Fixed the web installation wizard which was stuck at 96% + * Fixed bugs: + * Fixed an issue where newly created attribute was always added to the Product Details tab + * Fixed an issue where it was impossible to change the Stock Availability status of a product from the Advanced Inventory tab + * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified + * Fixed an issue where performance toolkit failed in case of unknown argument + * Fixed an issue where 404 error page was displayed instead of the URL Rewrite Information page + * Fixed an issue where the Click for price link was not working if a product name contained quote mark + * Fixed an issue where the Compare products link disappeared after switching to other page + * Fixed an issue where the custom logo was not displayed on the category page + * Fixed an XSS vulnerability in category name + * Fixed an issue where a success save message was not displayed after saving a Search term + * Fixed an issue with Google Analytics where it was impossible to add the code to the pages + * Fixed an issue where import custom options grid was not displayed on the product creation page + * Fixed an issue where it was impossible to retrieve a product collection from category in the "adminhtml" area + * Fixed an issue where product attributes were absent on product creation form after switching to another product template + * Fixed an issue where the 'URL key for specified store already exists.' error message was displayed when saving a configurable product with variations which have the same name + * Fixed an issue where search in the Search Terms Report grid did not work + * Fixed an issue where the unnecessary tab "General" was displayed on the Category page in the Admin panel + * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified for a configurable product when saving to a new template + * Fixed an issue where product Stock Status was always set to 'In Stock' if product quantity was specified + * Fixed an IE specific issue where for bundle products the Manage Stock option was reset to Yes + * Fixed an issue where backorder messages were not displayed + * Fixed an issue where the Price field was always required during Bundle product update using ProductService + * Fixed an issue where product name was missing in the error message + * Fixed an issue where configurable product did not contain a message to select options while adding product from wishlist to shopping cart + * Fixed an issue where the Validate VAT Number button did not work during order creation in the Admin panel + * Fixed an issue where Item qty in Wishlist got reset after update without changes + * Fixed an issue where invoice amount was incorrect when items with discount were partially invoiced + * Fixed product thumbnails alignment in the storefront + * Fixed an issue where inactive Categories were not greyed out in the tree in the Admin panel + * Fixed an issue where it was impossible to disable debug mode + * Fixed the code sample in the index.php file + * Removed language selector in the setup UI + * Fixed an issue where setup was broken if db_prefix was used + * Implemented usage of Symfony's PHPExecutableFinder for executing CLI tools + * Fixed an issue with the Import/Export functionality + * Fixed an issue with catalog product/category and category/product indexers invalidation after import + * Fixed an issue with entering invalid date in the Product Views Report + * Fixed an issue where it was impossible to view orders for customers from a deleted customer group + * Fixed an issue where a duplicate customer record was created after adding an order from the Admin panel + * Fixed an issue where it was impossible to log in to the Admin panel from the first attempt + 0.1.0-alpha98 ============= -* GitHub requests: + * GitHub requests: * [#678] (https://github.com/magento/magento2/issues/678) -- Fixed Travis CI builds -* Functional tests: + * Functional tests: * Create Sales Order Backend * Delete Products from Wishlist * Download Products Report * Mass Orders Update * Sales Tax Report -* Fixed bugs: + * Fixed bugs: * Fixed an issue where success message was not displayed after product review submit * Fixed an issue where it was impossible to start checkout process using PayPal from the JavaScript pop-up window when the Display Actual Price option was set to On Gesture * Fixed an issue where a fatal error was thrown after shipping method selection in PayPal Express Checkout diff --git a/LICENSE.html b/LICENSE.html deleted file mode 100644 index e2315f6a4167e0cfabc52f6e55ae75954c56ba33..0000000000000000000000000000000000000000 --- a/LICENSE.html +++ /dev/null @@ -1,42 +0,0 @@ -<h4>Open Software License ("OSL") v. 3.0</h4> - -<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p> -<h5>Licensed under the Open Software License version 3.0</h5> -<p>Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p> -<ul class="disc"> - <li>to reproduce the Original Work in copies, either alone or as part of a collective work</li> - <li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work</li> - <li>to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License</li> - <li>to perform the Original Work publicly</li> - <li>to display the Original Work publicly</li> -</ul> - -<p><strong>Grant of Patent License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.</p> - -<p><strong>Grant of Source Code License.</strong> The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.</p> - -<p><strong>Exclusions From License Grant.</strong> Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.</p> - -<p><strong>External Deployment.</strong> The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).</p> - -<p><strong>Attribution Rights.</strong> You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.</p> - -<p><strong>Warranty of Provenance and Disclaimer of Warranty.</strong> Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.</p> - -<p><strong>Limitation of Liability.</strong> Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.</p> - -<p><strong>Acceptance and Termination.</strong> If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).</p> - -<p><strong>Termination for Patent Action.</strong> This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.</p> - -<p><strong>Jurisdiction, Venue and Governing Law.</strong> Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.</p> - -<p><strong>Attorneys Fees.</strong> In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.</p> - -<p><strong>Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p> - -<p><strong>Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p> - -<p><strong>Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p> - -<p><strong>Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under Open Software License ("OSL") v. 3.0" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p> diff --git a/LICENSE.txt b/LICENSE.txt index 63f5337c5f9cdcc88741ceb5632734d4de55dd7f..49525fd99da9c51e6d85420266d41cb3d6b7a648 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -45,4 +45,4 @@ Licensed under the Open Software License version 3.0 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index d6b9a1858302433349e76cdc9af00e3888244128..c1fe011392d6a88b35052e86976342f0a7b02c79 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml index b0a94fd8014bf590bc2f860fb56e3ab7ed369e8f..1d70a00559fdd0b1d48fc77d0170d4e09b705c0c 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.notification.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid"> <arguments> diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml index ed74b6e8b1667524ca11f3398f62a6d193ba49fd..c92a48d379ad4676b54256fa043d78f4031e4ffc 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_notification_block"/> <referenceContainer name="content"> <block class="Magento\AdminNotification\Block\Inbox" name="adminhtml.notification.container"/> diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml index be68c170e83a391bf2aed85c989bb209ac8a06a7..b75b9c4d5eaef4ef0dea44f742d5e348c8651709 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="notifications"> <block class="Magento\AdminNotification\Block\System\Messages" name="system_messages" as="system_messages" before="-" template="Magento_AdminNotification::system/messages.phtml"/> <block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/> diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 19783cd57f058c2c07d2b81c8f7c7ba808ab2f16..cf442daffa9d4b69d2b2ccb5f2afdc2cc38f5d5b 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -3,12 +3,12 @@ "description": "Authorization module provides access to Magento ACL functionality.", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json index 452828c3d788fdf6d0fae5a92fd364298e75bfde..ea5ae667e682f69bb8fc2de8403e6579b96d843e 100644 --- a/app/code/Magento/Authorizenet/composer.json +++ b/app/code/Magento/Authorizenet/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-centinel": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-centinel": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml b/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml index 6e724bee492f558ebe4b508fa092f30adfd3545f..e08ef284215a750607d5540cb1bec4a6f5dddc6c 100644 --- a/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml +++ b/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/> </container> diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml index 63714b8f56d08106a4ccdb6090c8f635837d52b3..97a22f99fd6e68ae6447bf58a4947b4489f35df0 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/> </container> diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml index 63714b8f56d08106a4ccdb6090c8f635837d52b3..97a22f99fd6e68ae6447bf58a4947b4489f35df0 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/> </container> diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml index 63714b8f56d08106a4ccdb6090c8f635837d52b3..97a22f99fd6e68ae6447bf58a4947b4489f35df0 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/> </container> diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml index 1a98d72b324b42af80e6eba7460492a6bc1ce33c..05f4ef76f5fb5411c2c154698594284b87bbc7ab 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="authorizenet_page_head_components" template="Magento_Authorizenet::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml index fc8c82c892292baa676dab43115b882a45d6bc6b..a2b2572580553ee25e0e452df51edce020bb55ad 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="checkout.onepage.review.info.items.after"> <block class="Magento\Authorizenet\Block\Directpost\Form" name="payment.form.directpost" template="directpost/form.phtml"> <action method="setMethodInfo"/> diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php index 2dffdaf8c2dc50878612860e45927e4d1761a2ed..75c64f13e3d76406259d55db49f1078161f8d63c 100644 --- a/app/code/Magento/Backend/Block/Dashboard.php +++ b/app/code/Magento/Backend/Block/Dashboard.php @@ -46,10 +46,6 @@ class Dashboard extends \Magento\Backend\Block\Template $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales'); - $this->addChild('lastSearches', 'Magento\Backend\Block\Dashboard\Searches\Last'); - - $this->addChild('topSearches', 'Magento\Backend\Block\Dashboard\Searches\Top'); - if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) { $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams'); } else { diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php index 11acaf7e26ca4115c37484e82fe58d22b894e8b7..aa59ef3ab1224bbe3c4dcf2a347aba6bf9b04467 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php @@ -29,6 +29,7 @@ namespace Magento\Backend\Block\Widget\Grid\Column\Filter; class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter { + const ALL_STORE_VIEWS = '0'; /** * @var \Magento\Store\Model\System\Store */ @@ -71,9 +72,9 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil ) . '>'; $value = $this->getColumn()->getValue(); if ($allShow) { - $html .= '<option value="0"' . ($value == 0 ? ' selected="selected"' : '') . '>' . __( - 'All Store Views' - ) . '</option>'; + $html .= '<option value="' . self::ALL_STORE_VIEWS . '"' + . ($value == self::ALL_STORE_VIEWS ? ' selected="selected"' : '') . '>' + . __('All Store Views') . '</option>'; } else { $html .= '<option value=""' . (!$value ? ' selected="selected"' : '') . '></option>'; } @@ -129,13 +130,14 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil */ public function getCondition() { - if (is_null($this->getValue())) { + $value = $this->getValue(); + if (is_null($value) || $value == self::ALL_STORE_VIEWS) { return null; } - if ($this->getValue() == '_deleted_') { + if ($value == '_deleted_') { return array('null' => true); } else { - return array('eq' => $this->getValue()); + return array('eq' => $value); } } } diff --git a/app/code/Magento/Backend/Model/Session/AdminConfig.php b/app/code/Magento/Backend/Model/Session/AdminConfig.php index 919d3100b5ec4e3df32003f0963996c171b52b56..614fb677d30a56787f40f9dcf34725aa14853c44 100644 --- a/app/code/Magento/Backend/Model/Session/AdminConfig.php +++ b/app/code/Magento/Backend/Model/Session/AdminConfig.php @@ -27,6 +27,7 @@ namespace Magento\Backend\Model\Session; use Magento\Backend\App\Area\FrontNameResolver; use Magento\Framework\Session\Config; +use Magento\Framework\UrlInterface; /** * Magento Backend session configuration @@ -41,9 +42,14 @@ class AdminConfig extends Config const SESSION_NAME_ADMIN = 'admin'; /** - * @var FrontNameResolver $frontNameResolver + * @var FrontNameResolver */ - protected $frontNameResolver; + protected $_frontNameResolver; + + /** + * @var \Magento\Framework\StoreManagerInterface + */ + protected $_storeManager; /** * @param \Magento\Framework\ValidatorFactory $validatorFactory @@ -53,6 +59,7 @@ class AdminConfig extends Config * @param \Magento\Framework\App\Filesystem $filesystem * @param string $scopeType * @param FrontNameResolver $frontNameResolver + * @param \Magento\Framework\StoreManagerInterface $storeManager * @param string $saveMethod * @param null|string $savePath * @param null|string $cacheLimiter @@ -68,6 +75,7 @@ class AdminConfig extends Config \Magento\Framework\App\Filesystem $filesystem, $scopeType, FrontNameResolver $frontNameResolver, + \Magento\Framework\StoreManagerInterface $storeManager, $saveMethod = \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER, $savePath = null, $cacheLimiter = null, @@ -87,7 +95,8 @@ class AdminConfig extends Config $lifetimePath ); - $this->frontNameResolver = $frontNameResolver; + $this->_frontNameResolver = $frontNameResolver; + $this->_storeManager = $storeManager; $adminPath = $this->extractAdminPath(); $this->setCookiePath($adminPath); $this->setName($sessionName); @@ -100,12 +109,9 @@ class AdminConfig extends Config */ private function extractAdminPath() { - $baseUrl = $this->_httpRequest->getBaseUrl(); - $adminPath = $this->frontNameResolver->getFrontName(); - - if (!substr($baseUrl, -1) || ('/' != substr($baseUrl, -1))) { - $baseUrl = $baseUrl . '/'; - } + $parsedUrl = parse_url($this->_storeManager->getStore()->getBaseUrl()); + $baseUrl = $parsedUrl['path']; + $adminPath = $this->_frontNameResolver->getFrontName(); return $baseUrl . $adminPath; } diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php index f6c246b1eec640a25e54bc0868ab0da34f065c43..6f0072df3029fe1595f3880deaaa9bec8c56e0f9 100644 --- a/app/code/Magento/Backend/Model/Session/Quote.php +++ b/app/code/Magento/Backend/Model/Session/Quote.php @@ -40,8 +40,6 @@ namespace Magento\Backend\Model\Session; */ class Quote extends \Magento\Framework\Session\SessionManager { - const XML_PATH_DEFAULT_CREATEACCOUNT_GROUP = 'customer/create_account/default_group'; - /** * Quote model object * @@ -152,7 +150,7 @@ class Quote extends \Magento\Framework\Session\SessionManager $this->_quote->setStoreId($this->getStoreId())->load($this->getQuoteId()); } elseif ($this->getStoreId() && $this->hasCustomerId()) { $customerGroupId = $this->_scopeConfig->getValue( - self::XML_PATH_DEFAULT_CREATEACCOUNT_GROUP, + \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID, \Magento\Store\Model\ScopeInterface::SCOPE_STORE ); $this->_quote diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php index 88d13211ba8cb6e07db18074907153578992716c..03459131288f7d15071ac3a912834e9c469c6490 100644 --- a/app/code/Magento/Backend/Model/Url.php +++ b/app/code/Magento/Backend/Model/Url.php @@ -33,6 +33,13 @@ use Magento\Backend\Model\Menu; */ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlInterface { + /** + * Whether to use a security key in the backend + * + * @bug Currently, this constant is slightly misleading: it says "form key", but in fact it is used by URLs, too + */ + const XML_PATH_USE_SECURE_KEY = 'admin/security/use_form_key'; + /** * Authentication session * @@ -268,7 +275,7 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn */ public function useSecretKey() { - return $this->_scopeConfig->isSetFlag('admin/security/use_form_key') && !$this->getNoSecret(); + return $this->_scopeConfig->isSetFlag(self::XML_PATH_USE_SECURE_KEY) && !$this->getNoSecret(); } /** diff --git a/app/code/Magento/Backend/Service/V1/ModuleService.php b/app/code/Magento/Backend/Service/V1/ModuleService.php new file mode 100644 index 0000000000000000000000000000000000000000..ad8195afa9ba3d6903b9cd992a57b4c0143ae2f5 --- /dev/null +++ b/app/code/Magento/Backend/Service/V1/ModuleService.php @@ -0,0 +1,59 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Backend\Service\V1; + +/** + * Module service. + */ +class ModuleService implements ModuleServiceInterface +{ + /** + * @var \Magento\Framework\Module\ModuleListInterface + */ + protected $moduleList; + /** + * @param \Magento\Framework\Module\ModuleListInterface $moduleList + */ + public function __construct( + \Magento\Framework\Module\ModuleListInterface $moduleList + ) { + $this->moduleList = $moduleList; + } + + /** + * Returns an array of enabled modules + * + * @return string[] + */ + public function getModules() + { + $result = []; + $modules = $this->moduleList->getModules(); + foreach ($modules as $module) { + $result[] = $module['name']; + } + return $result; + } +} diff --git a/setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php b/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php similarity index 78% rename from setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php rename to app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php index 209006c6cd490b2ae6cb3ad8f73deadb5d8cb7c1..b01b0930a3199522fb99e85273b85b2ec4c7e94f 100644 --- a/setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php +++ b/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php @@ -21,15 +21,15 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Setup\Module\Setup\Connection; -interface AdapterInterface +namespace Magento\Backend\Service\V1; + +interface ModuleServiceInterface { /** - * Get connection + * Returns an array of enabled modules * - * @param array $config - * @return \Magento\Setup\Framework\DB\Adapter\AdapterInterface|null + * @return string[] */ - public function getConnection(array $config = array()); + public function getModules(); } diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index ed736bd65da7f5acc4683a40bf2f4074dd0373bb..f26196a7f51d3bc797aa287b5485ee926ed1cd10 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -3,27 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-reports": "0.1.0-alpha98", - "magento/module-catalog-search": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/module-backup": "0.1.0-alpha98", - "magento/module-email": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-translation": "0.1.0-alpha98", - "magento/module-require-js": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-reports": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/module-backup": "0.1.0-alpha99", + "magento/module-email": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-translation": "0.1.0-alpha99", + "magento/module-require-js": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml index 343b3075c39bb12daa614b5cd55e0c470a184f23..14b29b543523d51033e5cc45d8460f187675d64b 100644 --- a/app/code/Magento/Backend/etc/di.xml +++ b/app/code/Magento/Backend/etc/di.xml @@ -34,6 +34,7 @@ <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" /> <preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" /> <preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" /> + <preference for="Magento\Backend\Service\V1\ModuleServiceInterface" type="Magento\Backend\Service\V1\ModuleService" /> <type name="Magento\Backend\Block\Widget\Button\ButtonList" shared="false" /> <type name="Magento\Framework\App\AreaList"> <arguments> @@ -141,10 +142,6 @@ <type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch"> <arguments> <argument name="searchModules" xsi:type="array"> - <item name="products" xsi:type="array"> - <item name="class" xsi:type="string">Magento\Backend\Model\Search\Catalog</item> - <item name="acl" xsi:type="string">Magento_Catalog::catalog</item> - </item> <item name="customers" xsi:type="array"> <item name="class" xsi:type="string">Magento\Backend\Model\Search\Customer</item> <item name="acl" xsi:type="string">Magento_Customer::customer</item> diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml index 11c99dcde030477ba4db78e41473485bf8de96df..181be8d2cb604515244495f6883b01d47cd7904b 100644 --- a/app/code/Magento/Backend/etc/module.xml +++ b/app/code/Magento/Backend/etc/module.xml @@ -36,7 +36,6 @@ <module name="Magento_Cron"/> <module name="Magento_Theme"/> <module name="Magento_Reports"/> - <module name="Magento_CatalogSearch"/> <module name="Magento_Sales"/> <module name="Magento_Catalog"/> <module name="Magento_User"/> diff --git a/app/code/Magento/Backend/etc/webapi.xml b/app/code/Magento/Backend/etc/webapi.xml new file mode 100644 index 0000000000000000000000000000000000000000..3d273d2add77f5fba8dcad22917e95889ff4f0fe --- /dev/null +++ b/app/code/Magento/Backend/etc/webapi.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../app/code/Magento/Webapi/etc/webapi.xsd"> + <route url="/V1/modules" method="GET"> + <service class="Magento\Backend\Service\V1\ModuleServiceInterface" method="getModules"/> + <resources> + <resource ref="Magento_Adminhtml::admin"/> + </resources> + </route> +</routes> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml index 8defcd2f56840ad2d2e66e16381aebf7ec52c5ca..3f9472326c031664edcbf004146f2916c435e335 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="main.content"> <block class="Magento\Backend\Block\Template" name="content" template="admin/login.phtml"> <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml index 537c143f438363ae40346290fa372f437213f5da..9eaa8698a7bb36a2c8b1065a161847eed96de5ae 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.cache.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.cache.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml index 02b8c03fb467c96dc29324975d2a81b3096985ed..721dfac9347c7439ac5d35ead2ed56a198fb1da3 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="adminhtml_cache_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml index de25530d94763f4ed1ddd1acdfa8d990a62c8de0..87c72c8c1c5387cdd37275fcc2109d9cecade3a1 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Backend\Block\Dashboard\Tab\Customers\Most" name="adminhtml.dashboard.tab.customers.most"/> </container> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml index 114f524e116c5cb74aeffe6279a190af3b24b513..6467f1b703524df754c97b6aedd64659a2758ee7 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Backend\Block\Dashboard\Tab\Customers\Newest" name="adminhtml.dashboard.tab.customers.newest"/> </container> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml index 2640fc5e3aaf83d92814101c0d55d8c2cddf0a16..b5d1a8f6c232c365d52c941ada57c9fd997eb933 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml index 04574b1b938bd85f6c472a790fcc61cc0bdeb3b2..cc41faa4a5635dca1cf3579d719bcae477ac5d79 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Backend\Block\Dashboard\Tab\Products\Viewed" name="adminhtml.dashboard.tab.products.viewed"/> </container> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml index 6d4251833ecc6546ec9c0b404f69da93859b2979..6553279dd24a0e81812ac2c11613015e85a32273 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Backend\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml index 9bcf654cc5c633f5f23d722392119521843d6228..d100395eaaadad5366496ee1e355b8d2952ac87b 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Framework\View\Element\Text" name="content.noRoute"> <action method="setText"> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml index e4b281c77b6f189c9852ba9c7985eb1501cf51de..647f7d49d75d02b0a855a700b008bd460ae5c3dc 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Backend\Block\System\Account\Edit" name="adminhtml.system.account.edit"/> </referenceContainer> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml index a6e2c069477016f18574c0692e05ef361cf9673f..f1ef18c0001393b89d49c916724023fc2077d662 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\Backend\Block\Template" template="Magento_Backend::system/config/js.phtml"/> <block class="Magento\Backend\Block\Template" template="Magento_Backend::system/shipping/applicable_country.phtml"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml index 0e1a15998cdaf25c70c17e3b0086792caa42f919..5178a0ed969322d2514d09e7e5bc185d2d2ba027 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" /> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" /> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml index 4b55f869b6301d0a47981096cd96476dce9273f0..b1c3e0f902eacce3b3c97ba153dcd8b8edd0255d 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_system_design_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml index bc15183536e38e17f7410b7cced17b08f0c62297..83a1c645e761c1a41d496b6ae2ac852bbcfaaa31 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.system.design.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.design.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml index 830dc8b83d2277c013f92390b6df5ed1b69970b9..d488a6b9b6fa8eebb31077aa789c089c5bc0401a 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="adminhtml_system_design_grid_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml index 5a0018c2b24ed0d2d12c2e09e1dda200eca5bebf..25677d50a2a15e8b191adc1c928ef3b5ef605044 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.system.store.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.store.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml index 555925518a819b20533d8dfaf6f6fe740349e357..e742f386a7913e88f3840fcc67468570cf6008f9 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="adminhtml_system_store_grid_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml index 6428e638f37d07b6890e110a78814943b60f6e49..ec5df7a0bef5d3b99089283f9877bbf90e72f807 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" /> </referenceContainer> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml index 00e1418066e76e7fc9f1c3ea8ab5f9152bd94ed9..1c6f65c7583c835061847612fbc70b93b4e78a44 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.system.variable.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.variable.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml index 7aea6145d8243989932a82f5e66f4f40c2cd6194..c0974bb0d58113b24fe0399c47668c87228aae96 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_system_variable_grid_block"/> <referenceContainer name="content"> <block class="Magento\Backend\Block\System\Variable" name="adminhtml.system.variable.grid.container"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml index e7d7e18610eae0183d2d62e83f153415e8ef5859..384a98560b8718d28c9761a67e0698737e4f9e1b 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Magento Admin</title> <link src="prototype/prototype.js"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml index 0e1ab8be92df591c5eebdd8562ac2ad2876015a4..88db1184bae2dc46c7c1b596548cb32f2dc0a6e0 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_Backend::js/bootstrap/editor.js"/> <css src="prototype/windows/themes/default.css"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/empty.xml b/app/code/Magento/Backend/view/adminhtml/layout/empty.xml index 7ab3943632ae3d0eec25f80145c657cd4f979e9d..26a37c355cf5104b43512b95828981d82d17808f 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/empty.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/empty.xml @@ -24,4 +24,4 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml index d0d766de79ab4b682339d16f290834d24beace34..66ffc279f9b789ccdf1991cab6f3ddb181b2cd3a 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/> </page> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml index 77126c89c45226af2dd997ea5239455a91a0880b..75dfecb85aae1615bacb9ce9a28984fc7c9470d5 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="popup"/> <referenceBlock name="backend.page"> <action method="setTemplate"> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/popup.xml index d3766960c3e32eb914bc3e1e0e0cf63b1ca38167..9247f50f0d58c0dc6ca4b1f8392353bc6f162db3 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/popup.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="header"/> <remove name="menu"/> </page> diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 2503def2156196b7273526174fa37a0c768bb878..90de70719b94125631e8018df8ed16ff6197b80d 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml index b46a22cd5f056256177711e8ba821ce2b53c4417..75ce88120e747bde996b8da4c881aa0990988fcc 100644 --- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml +++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.system.backup.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml index 25c7fc8be28235affbd0b8b8f4c8f513754c4cd8..bee72cc12477953ad261e8e77bc4d84ff8cb78dc 100644 --- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml +++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="backup_index_block"/> <container name="root"> diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml index 7da938812362d54fc0305598bf4bfdb1340e68fd..3e66d54fab02e83d74d912032a8b6d5c5d7a7288 100644 --- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml +++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="backup_index_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index b5576e91c0cff9f532c0d8b38a33a8ce8ca751dc..b4b2bd56ed543bed2216a72e142888b6f1bd5e82 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -3,24 +3,24 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-gift-message": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-webapi": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-gift-message": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-webapi": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Bundle/etc/adminhtml/di.xml b/app/code/Magento/Bundle/etc/adminhtml/di.xml index aa8319a0538b0e5bb11dffa951b74a1c9d244d24..59d4ad89ff9ec4a90179ce58bd5e51a5f3ae19ea 100644 --- a/app/code/Magento/Bundle/etc/adminhtml/di.xml +++ b/app/code/Magento/Bundle/etc/adminhtml/di.xml @@ -37,7 +37,4 @@ </argument> </arguments> </type> - <type name="Magento\Catalog\Model\Product\Attribute\Backend\Price"> - <plugin name="bundle" type="Magento\Bundle\Model\Plugin\PriceBackend" sortOrder="100" /> - </type> </config> diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml index 15c5089db1cd7ba7a9f4da4c52f473479ed33af0..96958d6b98c60d1a8da7d9461f111cfc5f087181 100644 --- a/app/code/Magento/Bundle/etc/di.xml +++ b/app/code/Magento/Bundle/etc/di.xml @@ -116,4 +116,7 @@ </argument> </arguments> </type> + <type name="Magento\Catalog\Model\Product\Attribute\Backend\Price"> + <plugin name="bundle" type="Magento\Bundle\Model\Plugin\PriceBackend" sortOrder="100" /> + </type> </config> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml index b37651e7132f0ae4e0571d0b52250efd3e7e486a..e13942eeac5e07fcd50e0e204dc966956f95c32f 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/shipment/create/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml index 639a2d5e733f48f1e2b5b1ac71a727b3a489d451..368eaa906126863ac3ad6e966b98d07b5962235c 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="shipment_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/shipment/view/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml index 97536c08297599592ead2c477b74e409e2881e0c..5a0e35e659420e418713c681d23fbcba09adafd5 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="Magento_Bundle::css/bundle-product.css"/> </head> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml index a05ec046b49dc1ba7c2138370dbea8d5e3ec7fc7..20d9502c432a1ac3fd6a9927378ea134970da76a 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\Framework\View\Element\Template" template="Magento_Bundle::product/stock/disabler.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml index ae413bc432b61d2291d63959b3e7d5a276ca94ec..9d52b379852d97141a7fdb4a67821eb6a1a1ffa7 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.composite.fieldset"> <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle" before="product.composite.fieldset.options" name="product.composite.fieldset.bundle" template="product/composite/fieldset/options/bundle.phtml"> <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select" name="product.info.bundle.options.select" as="select"/> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml index 701ce80dfce889346738945c64981efa8215dad1..b7feb584e76b1b7a26185578a7013e9e72b0ed05 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer.wishlist.edit.tab"> <arguments> <argument name="product_configuration_helpers" xsi:type="array"> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml index f8512ca004c82d8fc86692adad5cff83b4272302..744574b9303c8efdcd8092f36683dce8ea463ea7 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/creditmemo/create/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index f8512ca004c82d8fc86692adad5cff83b4272302..744574b9303c8efdcd8092f36683dce8ea463ea7 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/creditmemo/create/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml index 47df9ee96c4e0a17c74626254056545b57db8185..ea161eb768a2ab7548a61876333cf268f9684c80 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/creditmemo/view/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml index 1b5d422202255f4056e04668a72cba61cf3051cc..707953eda0d6ed4d8c3a891e2096725c5f6da441 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/invoice/create/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml index 1b5d422202255f4056e04668a72cba61cf3051cc..707953eda0d6ed4d8c3a891e2096725c5f6da441 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/invoice/create/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml index 26f4a9374247facc4ac1871e40506fcbe3f2244d..00acf1b136a1fb09cb760286d82d21dcf5d77e76 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/invoice/view/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml index b2debfb918a2c64dcaa559fb59a62623efdc7129..df0273413e313a0fbbc1a6a506de655287e8aabc 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer" as="bundle" template="sales/order/view/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml index 9815251d8d09c68ff26e7196d69d503238d476f6..7cd8f1cde4395bffa7c6f5734998a6d7054ad1be 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml @@ -26,6 +26,7 @@ require(['jquery'], function($){ $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) { if (e.productType === 'bundle') { + e.stopPropagation(); return false; } }); diff --git a/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml index eda52ea31e819164873f9dd06a9b154039ed22d4..17e6d8e1c1df56a9fa5719de8274c7b4257bec6b 100644 --- a/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="render.product.prices"> <arguments> <argument name="bundle" xsi:type="array"> diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml index 31c442f0030274d064d2e0d93948050ad0db5e95..2ea0c9e26c582e420c9affa6ea04b93726d46a8b 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> - <attribute name="class" value="type-bundle"/> + <attribute name="class" value="page-product-bundle"/> </body> <referenceBlock name="product.info"> <block class="Magento\Catalog\Block\Product\View" name="bundle.summary" as="form_top" template="Magento_Bundle::catalog/product/view/summary.phtml"> @@ -45,7 +45,9 @@ <referenceBlock name="product.info.options.wrapper"> <block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-"> - <container name="product.info.bundle.options.top" as="product_info_bundle_options_top" /> + <container name="product.info.bundle.options.top" as="product_info_bundle_options_top"> + <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/> + </container> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/> @@ -55,7 +57,6 @@ <move element="product.price.tier" destination="product.info.options.wrapper.bottom" before="-" /> <referenceBlock name="product.info.options.wrapper.bottom"> <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/> - <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" after="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/> <action method="unsetChild"> <argument name="block" xsi:type="string">product.info.addtocart</argument> </action> @@ -67,12 +68,14 @@ </action> </referenceBlock> <referenceContainer name="content"> - <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/> + <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.main"/> <move element="product.info" destination="bundle.options.container" before="-"/> </referenceContainer> <referenceContainer name="product.info.type"> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml"/> <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/> - <block class="Magento\Catalog\Block\Product\View" name="customize.button" as="customize_button" template="Magento_Bundle::catalog/product/view/customize.phtml"/> + </referenceContainer> + <referenceContainer name="product.info.main"> + <block class="Magento\Catalog\Block\Product\View" name="customize.button" as="customize_button" template="Magento_Bundle::catalog/product/view/customize.phtml" after="product.info.price" /> </referenceContainer> </page> diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml index 0c8007031f3c3701ceb9b1c3d90f238af7053350..c45d3a1bfe66d97f2fb2fc154a154b69ea3c157f 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.info.upsell"> <action method="setItemLimit"> <argument name="type" xsi:type="string">bundle</argument> diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml index 14109148d3dc739b27fec48e22c866369877f481..c14c78e1631ffdde1d86ca02306d048995813b7e 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view_type_bundle"/> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="bundle_cart_configure_head_components" template="Magento_Checkout::js/components.phtml"/> diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml index f2f506daaa88fa3d4fea099e2e4459614083289a..852baa81048482d11083d160e9c9ee8fb41e9496 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.item.renderers"> <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index 097874f0ab2c60684f60305bd195c24345d4f5a7..e5fd17e9a08536b0ceef3428d827a04435a5d461 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.sidebar.item.renderers"> <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml index 06ff0971f806cbd433cdf7f80c835cff0b4ed309..e1f9c6408d04382b66ec15728d9a252709ecc63e 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.onepage.review.item.renderers"> <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml"/> </referenceBlock> </page> diff --git a/app/code/Magento/Bundle/view/frontend/layout/default.xml b/app/code/Magento/Bundle/view/frontend/layout/default.xml index 063e968f615058000728cf203ae41dcc5410647a..bbf146b0a16636b4fe5d23245cf4151fff97ca13 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/default.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="bundle_checkout_page_head_components" template="Magento_Bundle::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml index a40be037f3e26c0e942cce4fb11c27a3ef1171fe..c9ca45b4870bb8a0c40873ebea00149a06c88ef3 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.creditmemo.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/creditmemo/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml index 2e7c8d4a8c19c8bd955b8ff8623e2585197715db..562d098a428448b3b5330bc7dca26f785c17e070 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.invoice.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/invoice/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml index cd716a4c640e90e9c93b8e0d785088a3d14e7682..9b24e58d13359e8bbafc91437892fd69a1391d84 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/order/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml index 96423a7afbedb8990c93caa4ee40932377ea950e..a74b7956a15925f8691638061d7ffd0e079a7410 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.shipment.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/shipment/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml index 02f9b8e7022fd479f3481c2b55c8cf14fe4b3286..9e77fa0f6cd61430efe56ae5c039ab28d8ef798d 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.creditmemo.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/creditmemo/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml index 90ce68bc66b90e749a1417f311d7b5aacc322173..9a62079c5d07e34d746e09c8427faf27f978111b 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.invoice.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/invoice/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml index 702b8594e61a2d182cd9086bf7b94f2d0cc5d900..d40576349c4213a244aa2691a267aaffe97ba3ca 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.items.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml index 708f56526c1ff4a47043a28472c8669e221e45b2..323809695701c4ee3614c75165cbd703155fc462 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.creditmemo.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/creditmemo/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml index a22768f62c6301c1772e520a548911745cb13307..70aa2dd64a50ab88a25e5a0810da520e80bf030f 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.invoice.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/invoice/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml index 8b7adc46df977f9245916ec30695546919d1fbb9..cd50ebb403de88ba68f8c65bf0366132309ca92b 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml index a76f22c396ecf6f343ed0e35297d74ee41706afc..6176e3417d4bb197db27abe74bb580c46ad557c2 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.shipment.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/shipment/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml index 96f810354adefd705825b94201bda00c7f334fbb..fcf55a14d640e443538fa71ad8a83e28ce9ed430 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.shipment.renderers"> <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/shipment/items/renderer.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index 7d3f0eff666befd1b1662f104cd9c13ab1990949..aeded47eb4b72571ebdc273e6a85d26c65594980 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml index b27b0583c47bde32df9ef24eb9a30d1a54b5dd6c..995142f9691f8cfc33a2267bd26d9c78ac897058 100644 --- a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml +++ b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha"> <action method="setFormId"> diff --git a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml index 7a03772a5095e4684d5abbd09edbd176ce8444dd..fccbd63f7ad176dc7c1065324aaa24f0e4891e07 100644 --- a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml +++ b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha"> <action method="setFormId"> diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml index 75321b025c78c15342d1815faba8c28534ad2ff8..cfd9481f01616168301249716888c5f6c36726d3 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.login.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-"> <action method="setFormId"> diff --git a/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml b/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml index 1d4de8a5c2998f814a9f75a59651479c086a5988..619402350c2133b63bc6174369fb7bb7f29bd65a 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-"> <action method="setFormId"> diff --git a/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml index 3ad54c8ae345ff5cc82d1ff20d1184024b73401c..9fa9242cc43d4d33f8241e665c59db953ea20a27 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-"> <action method="setFormId"> diff --git a/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml b/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml index 25c56b77d4c112c68d44a48cfbe133c99aedfa46..2b86c38f869d0b26cc00908c2ba8e7f4fbd0f798 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-"> <action method="setFormId"> diff --git a/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml index 094ed7f082a9d491e73768adec5707d628a9a7eb..f1a823a1ea837c5312aaf144db3b8da7620bba58 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-"> <action method="setFormId"> diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php index 959051034c1057fa4b0517b430e3f59196532de0..1e64386efe5d6e60cc8398e5f0d019dc61314db5 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php @@ -89,7 +89,7 @@ class Search extends \Magento\Backend\Block\Widget 'source' => $this->getUrl('catalog/product/suggestAttributes'), 'minLength' => 0, 'ajaxOptions' => array('data' => array('template_id' => $templateId)), - 'template' => '[data-template-for="product-attribute-search"]', + 'template' => '[data-template-for="product-attribute-search-' . $this->getGroupId() . '"]', 'data' => $this->getSuggestedAttributes('', $templateId) ); } diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php index 46036ff28e2673fa253dd86207a369823e88c279..6448c91820c4133ab18ae207aa0aa55b4990c57c 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php @@ -56,7 +56,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid $this->removeColumn('action'); $this->removeColumn('status'); $this->removeColumn('visibility'); - $this->clearRss(); } /** diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php index dc97a9da9ce95421bcd2d29959210d95a7fbe2db..3c1d34b33a1712c9e0434615723931be5ec3afea 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php @@ -76,6 +76,7 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product if ($this->getRequest()->getParam('popup')) { $this->_view->loadLayout(array( + 'default', 'popup', strtolower($this->_request->getFullActionName()), 'catalog_product_' . $product->getTypeId() diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php index 9e7da52f40eb8ae8b3411834f006859400dc3761..b83a9e076b9c6236d3baabb1cfbe70fc99be6d58 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php @@ -78,10 +78,10 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product $data = $this->getRequest()->getPost(); if ($data) { - $product = $this->initializationHelper->initialize($this->productBuilder->build($this->getRequest())); - $this->productTypeManager->processProduct($product); - try { + $product = $this->initializationHelper->initialize($this->productBuilder->build($this->getRequest())); + $this->productTypeManager->processProduct($product); + if (isset($data['product'][$product->getIdFieldName()])) { throw new \Magento\Framework\Model\Exception(__('Unable to save product')); } diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php new file mode 100644 index 0000000000000000000000000000000000000000..3eaa67a86e10921b7575f06018b5905cf793d986 --- /dev/null +++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php @@ -0,0 +1,32 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Catalog\Model\Indexer\Category\Product; + +class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor +{ + /** + * Indexer ID + */ + const INDEXER_ID = \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID; +} diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php new file mode 100644 index 0000000000000000000000000000000000000000..541bfbb8c70c1a4fdf75acea950e6bf4fd1596e3 --- /dev/null +++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php @@ -0,0 +1,32 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Catalog\Model\Indexer\Product\Category; + +class Processor extends \Magento\Indexer\Model\Indexer\AbstractProcessor +{ + /** + * Indexer ID + */ + const INDEXER_ID = \Magento\Catalog\Model\Indexer\Product\Category::INDEXER_ID; +} diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php index cd4dd4894ec25f574dd627cce8ba748a0a3d5d26..48c850836f0672e4ad505aa3ae5ebcbec7e20a05 100644 --- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php +++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php @@ -76,7 +76,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter /** * Catalog layer filter price algorithm * - * @var \Magento\Catalog\Model\Layer\Filter\Price\Algorithm + * @var \Magento\Framework\Search\Dynamic\Algorithm */ protected $_priceAlgorithm; @@ -101,9 +101,9 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter * @param ItemFactory $filterItemFactory * @param \Magento\Framework\StoreManagerInterface $storeManager * @param \Magento\Catalog\Model\Layer $layer - * @param \Magento\Catalog\Model\Resource\Layer\Filter\PriceFactory $filterPriceFactory + * @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource * @param \Magento\Customer\Model\Session $customerSession - * @param Price\Algorithm $priceAlgorithm + * @param \Magento\Framework\Search\Dynamic\Algorithm $priceAlgorithm * @param \Magento\Framework\Registry $coreRegistry * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency @@ -113,16 +113,16 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory, \Magento\Framework\StoreManagerInterface $storeManager, \Magento\Catalog\Model\Layer $layer, - \Magento\Catalog\Model\Resource\Layer\Filter\PriceFactory $filterPriceFactory, + \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource, \Magento\Customer\Model\Session $customerSession, - \Magento\Catalog\Model\Layer\Filter\Price\Algorithm $priceAlgorithm, + \Magento\Framework\Search\Dynamic\Algorithm $priceAlgorithm, \Magento\Framework\Registry $coreRegistry, \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency, array $data = array() ) { $this->priceCurrency = $priceCurrency; - $this->_resource = $filterPriceFactory->create(); + $this->_resource = $resource; $this->_customerSession = $customerSession; $this->_priceAlgorithm = $priceAlgorithm; $this->_coreRegistry = $coreRegistry; @@ -212,7 +212,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter $rangeKey = 'range_item_counts_' . $range; $items = $this->getData($rangeKey); if (is_null($items)) { - $items = $this->_getResource()->getCount($this, $range); + $items = $this->_getResource()->getCount($range); // checking max number of intervals $i = 0; $lastIndex = null; @@ -310,9 +310,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter if ($appliedInterval && $collection->getPricesCount() <= $this->getIntervalDivisionLimit()) { return array(); } - $this->_priceAlgorithm->setPricesModel( - $this - )->setStatistics( + $this->_priceAlgorithm->setStatistics( $collection->getMinPrice(), $collection->getMaxPrice(), $collection->getPriceStandardDeviation(), @@ -461,20 +459,6 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter return $this; } - /** - * Apply filter value to product collection based on filter range and selected value - * - * @param int $range - * @param int $index - * @return \Magento\Catalog\Model\Layer\Filter\Price - * @deprecated since 1.7.0.0 - */ - protected function _applyToCollection($range, $index) - { - $this->_getResource()->applyFilterToCollection($this, $range, $index); - return $this; - } - /** * Retrieve active customer group id * @@ -589,59 +573,4 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter return parent::getClearLinkText(); } - - /** - * Load range of product prices - * - * @param int $limit - * @param null|int $offset - * @param null|int $lowerPrice - * @param null|int $upperPrice - * @return array - */ - public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPrice = null) - { - $prices = $this->_getResource()->loadPrices($this, $limit, $offset, $lowerPrice, $upperPrice); - if ($prices) { - $prices = array_map('floatval', $prices); - } - - return $prices; - } - - /** - * Load range of product prices, preceding the price - * - * @param float $price - * @param int $index - * @param null|int $lowerPrice - * @return array|false - */ - public function loadPreviousPrices($price, $index, $lowerPrice = null) - { - $prices = $this->_getResource()->loadPreviousPrices($this, $price, $index, $lowerPrice); - if ($prices) { - $prices = array_map('floatval', $prices); - } - - return $prices; - } - - /** - * Load range of product prices, next to the price - * - * @param float $price - * @param int $rightIndex - * @param null|int $upperPrice - * @return array|false - */ - public function loadNextPrices($price, $rightIndex, $upperPrice = null) - { - $prices = $this->_getResource()->loadNextPrices($this, $price, $rightIndex, $upperPrice); - if ($prices) { - $prices = array_map('floatval', $prices); - } - - return $prices; - } } diff --git a/app/code/Magento/Catalog/Model/Layer/Search/Context.php b/app/code/Magento/Catalog/Model/Layer/Search/Context.php index 396961a930adbab5e95b7cbe05cfb46f7b78bdf1..b1d5e1fbd21806e4ff3658d9ec40006f1114befa 100644 --- a/app/code/Magento/Catalog/Model/Layer/Search/Context.php +++ b/app/code/Magento/Catalog/Model/Layer/Search/Context.php @@ -24,6 +24,9 @@ */ namespace Magento\Catalog\Model\Layer\Search; +use Magento\CatalogSearch\Model\Layer\Search\CollectionFilter; +use Magento\CatalogSearch\Model\Layer\Search\StateKey; + class Context extends \Magento\Catalog\Model\Layer\Context { /** @@ -33,8 +36,8 @@ class Context extends \Magento\Catalog\Model\Layer\Context */ public function __construct( \Magento\Catalog\Model\Layer\Search\ItemCollectionProvider $collectionProvider, - \Magento\Catalog\Model\Layer\Search\StateKey $stateKey, - \Magento\Catalog\Model\Layer\Search\CollectionFilter $collectionFilter + \Magento\CatalogSearch\Model\Layer\Search\StateKey $stateKey, + \Magento\CatalogSearch\Model\Layer\Search\CollectionFilter $collectionFilter ) { parent::__construct($collectionProvider, $stateKey, $collectionFilter); } diff --git a/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php new file mode 100644 index 0000000000000000000000000000000000000000..0b842315769033d64ac796e1f235f9d46ac4614a --- /dev/null +++ b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php @@ -0,0 +1,91 @@ +<?php +/** + * Depersonalize catalog session data + * + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Catalog\Model\Layout; + +/** + * Class DepersonalizePlugin + */ +class DepersonalizePlugin +{ + /** + * @var \Magento\Framework\App\RequestInterface + */ + protected $request; + + /** + * @var \Magento\Framework\Module\Manager + */ + protected $moduleManager; + + /** + * @var \Magento\PageCache\Model\Config + */ + protected $cacheConfig; + + /** + * Catalog session + * + * @var \Magento\Catalog\Model\Session + */ + protected $catalogSession; + + /** + * @param \Magento\Catalog\Model\Session $catalogSession + * @param \Magento\Framework\App\RequestInterface $request + * @param \Magento\Framework\Module\Manager $moduleManager + * @param \Magento\PageCache\Model\Config $cacheConfig + */ + public function __construct( + \Magento\Catalog\Model\Session $catalogSession, + \Magento\Framework\Module\Manager $moduleManager, + \Magento\Framework\App\RequestInterface $request, + \Magento\PageCache\Model\Config $cacheConfig + ) { + $this->catalogSession = $catalogSession; + $this->request = $request; + $this->moduleManager = $moduleManager; + $this->cacheConfig = $cacheConfig; + } + + /** + * After generate Xml + * + * @param \Magento\Framework\View\LayoutInterface $subject + * @param \Magento\Framework\View\LayoutInterface $result + * @return \Magento\Framework\View\LayoutInterface + */ + public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result) + { + if ($this->moduleManager->isEnabled('Magento_PageCache') + && $this->cacheConfig->isEnabled() + && !$this->request->isAjax() + && $subject->isCacheable() + ) { + $this->catalogSession->clearStorage(); + } + return $result; + } +} diff --git a/app/code/Magento/Catalog/Model/Product/Image/View.php b/app/code/Magento/Catalog/Model/Product/Image/View.php index ae09fce051177d16552bc11b4e0e71cb2a9d7cca..05d42bf3334e3706ccd0f588c7f4fc859e8f4bcb 100644 --- a/app/code/Magento/Catalog/Model/Product/Image/View.php +++ b/app/code/Magento/Catalog/Model/Product/Image/View.php @@ -134,6 +134,8 @@ class View extends \Magento\Framework\Object $this->getType() )->keepFrame( $this->isWhiteBorders() + )->constrainOnly( + true )->resize( $this->getWidth(), $this->getHeight() diff --git a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php index 0979f063231e945a68f9766cf42fde8649a96c7d..98361f06b2f9042c9214e0d8cc69bb389cae4327 100644 --- a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php +++ b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php @@ -42,69 +42,93 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb */ protected $_eventManager = null; + /** + * @var \Magento\Catalog\Model\Layer + */ + private $layer; + + /** + * @var \Magento\Customer\Model\Session + */ + private $session; + + /** + * @var \Magento\Framework\StoreManagerInterface + */ + private $storeManager; + /** * @param \Magento\Framework\App\Resource $resource * @param \Magento\Framework\Event\ManagerInterface $eventManager + * @param \Magento\Catalog\Model\Layer\Category $layer + * @param \Magento\Customer\Model\Session $session + * @param \Magento\Framework\StoreManagerInterface $storeManager */ - public function __construct(\Magento\Framework\App\Resource $resource, \Magento\Framework\Event\ManagerInterface $eventManager) - { + public function __construct( + \Magento\Framework\App\Resource $resource, + \Magento\Framework\Event\ManagerInterface $eventManager, + \Magento\Catalog\Model\Layer\Category $layer, + \Magento\Customer\Model\Session $session, + \Magento\Framework\StoreManagerInterface $storeManager + ) { + $this->layer = $layer; + $this->session = $session; + $this->storeManager = $storeManager; $this->_eventManager = $eventManager; parent::__construct($resource); } /** - * Initialize connection and define main table name + * Retrieve maximal price for attribute * - * @return void + * @param \Magento\Catalog\Model\Layer\Filter\Price $filter + * @return float + * @deprecated since 1.7.0.0 */ - protected function _construct() + public function getMaxPrice($filter) { - $this->_init('catalog_product_index_price', 'entity_id'); + return $filter->getLayer()->getProductCollection()->getMaxPrice(); } /** - * Retrieve joined price index table alias + * Retrieve array with products counts per price range * - * @return string + * @param int $range + * @return array */ - protected function _getIndexTableAlias() + public function getCount($range) { - return 'price_index'; - } + $select = $this->_getSelect(); + $priceExpression = $this->_getFullPriceExpression($select); - /** - * Replace table alias in condition string - * - * @param string|null $conditionString - * @return string|null - */ - protected function _replaceTableAlias($conditionString) - { - if (is_null($conditionString)) { - return null; + /** + * Check and set correct variable values to prevent SQL-injections + */ + $range = floatval($range); + if ($range == 0) { + $range = 1; } - $adapter = $this->_getReadAdapter(); - $oldAlias = array( - \Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS . '.', - $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS) . '.' - ); - $newAlias = array( - \Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS . '.', - $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS) . '.' - ); - return str_replace($oldAlias, $newAlias, $conditionString); + $countExpr = new \Zend_Db_Expr('COUNT(*)'); + $rangeExpr = new \Zend_Db_Expr("FLOOR(({$priceExpression}) / {$range}) + 1"); + + $select->columns(array('range' => $rangeExpr, 'count' => $countExpr)); + $select->group($rangeExpr)->order("{$rangeExpr} ASC"); + + return $this->_getReadAdapter()->fetchPairs($select); } /** * Retrieve clean select with joined price index table * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @return \Magento\Framework\DB\Select */ - protected function _getSelect($filter) + protected function _getSelect() { - $collection = $filter->getLayer()->getProductCollection(); - $collection->addPriceData($filter->getCustomerGroupId(), $filter->getWebsiteId()); + $collection = $this->layer->getProductCollection(); + $collection->addPriceData( + $this->session->getCustomerGroupId(), + $this->storeManager->getStore()->getWebsiteId() + ); if (!is_null($collection->getCatalogPreparedSelect())) { $select = clone $collection->getCatalogPreparedSelect(); @@ -121,10 +145,10 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb // remove join with main table $fromPart = $select->getPart(\Zend_Db_Select::FROM); if (!isset( - $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS] - ) || !isset( - $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS] - ) + $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS] + ) || !isset( + $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS] + ) ) { return $select; } @@ -155,58 +179,50 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb } $select->where($this->_replaceTableAlias($condition)); } - $select->where($this->_getPriceExpression($filter, $select) . ' IS NOT NULL'); + $select->where($this->_getPriceExpression($select) . ' IS NOT NULL'); return $select; } /** - * Prepare response object and dispatch prepare price event - * Return response object - * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param \Magento\Framework\DB\Select $select - * @return \Magento\Framework\Object - * - * @deprecated since 1.7.0.0 - */ - protected function _dispatchPreparePriceEvent($filter, $select) - { - // prepare response object for event - $response = new \Magento\Framework\Object(); - $response->setAdditionalCalculations(array()); - - return $response; - } - - /** - * Retrieve maximal price for attribute - * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @return float + * Replace table alias in condition string * - * @deprecated since 1.7.0.0 + * @param string|null $conditionString + * @return string|null */ - public function getMaxPrice($filter) + protected function _replaceTableAlias($conditionString) { - return $filter->getLayer()->getProductCollection()->getMaxPrice(); + if (is_null($conditionString)) { + return null; + } + $adapter = $this->_getReadAdapter(); + $oldAlias = array( + \Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS . '.', + $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS) . '.' + ); + $newAlias = array( + \Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS . '.', + $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS) . '.' + ); + return str_replace($oldAlias, $newAlias, $conditionString); } /** * Price expression generated by products collection * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param \Magento\Framework\DB\Select $select * @param bool $replaceAlias * @return string */ - protected function _getPriceExpression($filter, $select, $replaceAlias = true) + protected function _getPriceExpression($select, $replaceAlias = true) { - $priceExpression = $filter->getLayer()->getProductCollection()->getPriceExpression($select); - $additionalPriceExpression = $filter->getLayer()->getProductCollection()->getAdditionalPriceExpression( + $priceExpression = $this->layer->getProductCollection()->getPriceExpression($select); + $additionalPriceExpression = $this->layer->getProductCollection()->getAdditionalPriceExpression( $select ); - $result = empty($additionalPriceExpression) ? $priceExpression : "({$priceExpression} {$additionalPriceExpression})"; + $result = empty($additionalPriceExpression) + ? $priceExpression + : "({$priceExpression} {$additionalPriceExpression})"; if ($replaceAlias) { $result = $this->_replaceTableAlias($result); } @@ -214,68 +230,20 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb return $result; } - /** - * Get comparing value sql part - * - * @param float $price - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param bool $decrease - * @return float - */ - protected function _getComparingValue($price, $filter, $decrease = true) - { - $currencyRate = $filter->getLayer()->getProductCollection()->getCurrencyRate(); - if ($decrease) { - return ($price - self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; - } - return ($price + self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; - } - /** * Get full price expression generated by products collection * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param \Magento\Framework\DB\Select $select * @return \Zend_Db_Expr */ - protected function _getFullPriceExpression($filter, $select) + protected function _getFullPriceExpression($select) { return new \Zend_Db_Expr( - 'ROUND((' . $this->_getPriceExpression( - $filter, - $select - ) . ') * ' . $filter->getLayer()->getProductCollection()->getCurrencyRate() . ', 2)' + 'ROUND((' . $this->_getPriceExpression($select) + . ') * ' . $this->layer->getProductCollection()->getCurrencyRate() . ', 2)' ); } - /** - * Retrieve array with products counts per price range - * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param int $range - * @return array - */ - public function getCount($filter, $range) - { - $select = $this->_getSelect($filter); - $priceExpression = $this->_getFullPriceExpression($filter, $select); - - /** - * Check and set correct variable values to prevent SQL-injections - */ - $range = floatval($range); - if ($range == 0) { - $range = 1; - } - $countExpr = new \Zend_Db_Expr('COUNT(*)'); - $rangeExpr = new \Zend_Db_Expr("FLOOR(({$priceExpression}) / {$range}) + 1"); - - $select->columns(array('range' => $rangeExpr, 'count' => $countExpr)); - $select->group($rangeExpr)->order("{$rangeExpr} ASC"); - - return $this->_getReadAdapter()->fetchPairs($select); - } - /** * Apply attribute filter to product collection * @@ -283,96 +251,108 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb * @param int $range * @param int $index the range factor * @return $this - * * @deprecated since 1.7.0.0 */ public function applyFilterToCollection($filter, $range, $index) { $select = $filter->getLayer()->getProductCollection()->getSelect(); - $priceExpr = $this->_getPriceExpression($filter, $select); + $priceExpr = $this->_getPriceExpression($select); $filter->getLayer()->getProductCollection()->getSelect()->where( - $priceExpr . ' >= ' . $this->_getComparingValue($range * ($index - 1), $filter) + $priceExpr . ' >= ' . $this->_getComparingValue($range * ($index - 1)) )->where( - $priceExpr . ' < ' . $this->_getComparingValue($range * $index, $filter) + $priceExpr . ' < ' . $this->_getComparingValue($range * $index) ); return $this; } /** - * Load range of product prices + * Get comparing value sql part * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param int $limit - * @param null|int $offset - * @param null|int $lowerPrice - * @param null|int $upperPrice - * @return array + * @param float $price + * @param bool $decrease + * @return float */ - public function loadPrices($filter, $limit, $offset = null, $lowerPrice = null, $upperPrice = null) + protected function _getComparingValue($price, $decrease = true) { - $select = $this->_getSelect($filter); - $priceExpression = $this->_getPriceExpression($filter, $select); - $select->columns(array('min_price_expr' => $this->_getFullPriceExpression($filter, $select))); - if (!is_null($lowerPrice)) { - $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice, $filter)); - } - if (!is_null($upperPrice)) { - $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice, $filter)); + $currencyRate = $this->layer->getProductCollection()->getCurrencyRate(); + if ($decrease) { + return ($price - self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; } - $select->order("{$priceExpression} ASC")->limit($limit, $offset); - - return $this->_getReadAdapter()->fetchCol($select); + return ($price + self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; } /** * Load range of product prices, preceding the price * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param float $price * @param int $index * @param null|int $lowerPrice * @return array|false */ - public function loadPreviousPrices($filter, $price, $index, $lowerPrice = null) + public function loadPreviousPrices($price, $index, $lowerPrice = null) { - $select = $this->_getSelect($filter); - $priceExpression = $this->_getPriceExpression($filter, $select); - $select->columns('COUNT(*)')->where("{$priceExpression} < " . $this->_getComparingValue($price, $filter)); + $select = $this->_getSelect(); + $priceExpression = $this->_getPriceExpression($select); + $select->columns('COUNT(*)')->where("{$priceExpression} < " . $this->_getComparingValue($price)); if (!is_null($lowerPrice)) { - $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice, $filter)); + $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice)); } $offset = $this->_getReadAdapter()->fetchOne($select); if (!$offset) { return false; } - return $this->loadPrices($filter, $index - $offset + 1, $offset - 1, $lowerPrice); + return $this->loadPrices($index - $offset + 1, $offset - 1, $lowerPrice); + } + + /** + * Load range of product prices + * + * @param int $limit + * @param null|int $offset + * @param null|int $lowerPrice + * @param null|int $upperPrice + * @return array + */ + public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPrice = null) + { + $select = $this->_getSelect(); + $priceExpression = $this->_getPriceExpression($select); + $select->columns(array('min_price_expr' => $this->_getFullPriceExpression($select))); + if (!is_null($lowerPrice)) { + $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice)); + } + if (!is_null($upperPrice)) { + $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice)); + } + $select->order("{$priceExpression} ASC")->limit($limit, $offset); + + return $this->_getReadAdapter()->fetchCol($select); } /** * Load range of product prices, next to the price * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param float $price * @param int $rightIndex * @param null|int $upperPrice * @return array|false */ - public function loadNextPrices($filter, $price, $rightIndex, $upperPrice = null) + public function loadNextPrices($price, $rightIndex, $upperPrice = null) { - $select = $this->_getSelect($filter); + $select = $this->_getSelect(); $pricesSelect = clone $select; - $priceExpression = $this->_getPriceExpression($filter, $pricesSelect); + $priceExpression = $this->_getPriceExpression($pricesSelect); $select->columns( 'COUNT(*)' )->where( - "{$priceExpression} > " . $this->_getComparingValue($price, $filter, false) + "{$priceExpression} > " . $this->_getComparingValue($price, false) ); if (!is_null($upperPrice)) { - $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice, $filter)); + $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice)); } $offset = $this->_getReadAdapter()->fetchOne($select); if (!$offset) { @@ -380,12 +360,12 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb } $pricesSelect->columns( - array('min_price_expr' => $this->_getFullPriceExpression($filter, $pricesSelect)) + array('min_price_expr' => $this->_getFullPriceExpression($pricesSelect)) )->where( - "{$priceExpression} >= " . $this->_getComparingValue($price, $filter) + "{$priceExpression} >= " . $this->_getComparingValue($price) ); if (!is_null($upperPrice)) { - $pricesSelect->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice, $filter)); + $pricesSelect->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice)); } $pricesSelect->order("{$priceExpression} DESC")->limit($rightIndex - $offset + 1, $offset - 1); @@ -411,7 +391,7 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb } $select = $filter->getLayer()->getProductCollection()->getSelect(); - $priceExpr = $this->_getPriceExpression($filter, $select, false); + $priceExpr = $this->_getPriceExpression($select, false); if ($to !== '') { $to = (double)$to; @@ -421,12 +401,32 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb } if ($from !== '') { - $select->where($priceExpr . ' >= ' . $this->_getComparingValue($from, $filter)); + $select->where($priceExpr . ' >= ' . $this->_getComparingValue($from)); } if ($to !== '') { - $select->where($priceExpr . ' < ' . $this->_getComparingValue($to, $filter)); + $select->where($priceExpr . ' < ' . $this->_getComparingValue($to)); } return $this; } + + /** + * Initialize connection and define main table name + * + * @return void + */ + protected function _construct() + { + $this->_init('catalog_product_index_price', 'entity_id'); + } + + /** + * Retrieve joined price index table alias + * + * @return string + */ + protected function _getIndexTableAlias() + { + return 'price_index'; + } } diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php index a0c10b1f21110c392669367542fedeed210a7986..2085b806b01366ca799572f884662abbfe42cecc 100644 --- a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php +++ b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php @@ -42,6 +42,10 @@ class FinalPriceBox extends BasePriceBox */ protected function _toHtml() { + if (!$this->getSaleableItem() || $this->getSaleableItem()->getCanShowPrice() === false) { + return ''; + } + $result = parent::_toHtml(); try { diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 9816d6d7ad3984031e5cd5c94e56404b6c9a97e7..630753db730cfe17faab95eed87ca265c804bd3d 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -3,33 +3,34 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-log": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-msrp": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-catalog-search": "0.1.0-alpha98", - "magento/module-product-alert": "0.1.0-alpha98", - "magento/module-url-rewrite": "0.1.0-alpha98", - "magento/module-catalog-url-rewrite": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-log": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-msrp": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-catalog-search": "0.1.0-alpha99", + "magento/module-product-alert": "0.1.0-alpha99", + "magento/module-url-rewrite": "0.1.0-alpha99", + "magento/module-catalog-url-rewrite": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml index 9665dcee2ad3fb143ca63d73eef0f873778799c8..faadeaba5395ba3d9a78de72e09b8108e7831d3b 100644 --- a/app/code/Magento/Catalog/etc/frontend/di.xml +++ b/app/code/Magento/Catalog/etc/frontend/di.xml @@ -56,4 +56,8 @@ <type name="Magento\Framework\App\Action\Action"> <plugin name="catalog-app-action-dispatchController-context-plugin" type="Magento\Catalog\Model\App\Action\ContextPlugin" sortOrder="10"/> </type> + <type name="Magento\Framework\View\Layout"> + <plugin name="catalog-session-depersonalize" + type="Magento\Catalog\Model\Layout\DepersonalizePlugin" sortOrder="10"/> + </type> </config> diff --git a/app/code/Magento/Catalog/etc/frontend/events.xml b/app/code/Magento/Catalog/etc/frontend/events.xml index eee61b3ec64d561893cb0d03e32ecab93fb9eea1..4af06703fb82afdb251234bf1693e56d5cbb2174 100644 --- a/app/code/Magento/Catalog/etc/frontend/events.xml +++ b/app/code/Magento/Catalog/etc/frontend/events.xml @@ -30,4 +30,7 @@ <event name="customer_logout"> <observer name="catalog" instance="Magento\Catalog\Model\Product\Compare\Item" method="bindCustomerLogout" shared="false" /> </event> + <event name="page_block_html_topmenu_gethtml_before"> + <observer name="catalog_add_topmenu_items" instance="Magento\Catalog\Model\Observer" method="addCatalogToTopmenuItems" /> + </event> </config> diff --git a/app/code/Magento/Catalog/etc/module.xml b/app/code/Magento/Catalog/etc/module.xml index 362c7d346faae329c63187a58605f1aeb49c5a62..9b76a57f2864332c4a76898c71ce5b88246dc7fe 100644 --- a/app/code/Magento/Catalog/etc/module.xml +++ b/app/code/Magento/Catalog/etc/module.xml @@ -54,6 +54,7 @@ <module name="Magento_CatalogUrlRewrite"/> <module name="Magento_UrlRewrite"/> <module name="Magento_Msrp" /> + <module name="Magento_PageCache"/> </depends> </module> </config> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml index 336ecaa0846a819efe9a96f7049c97ee8678524c..5fe0e1be94294606c272ab93f94c29f8f1a872d4 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset" name="product.composite.fieldset"> <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options" template="catalog/product/composite/fieldset/options.phtml"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml index 993b36f4c610f3568b7e4ae0a857aca7397aa15d..931e3ed9e04d94ea8ec03e093c716b07519006d4 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Error" name="product.composite.error"/> <block class="Magento\Framework\Pricing\Render" name="product.price.render.default"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml index a9f03e3a291b1be75416b0cbfa121daa5d7a4611..f5e87c09dd6dd1e1fbc522ade16447b53a63a652 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Update\Result" name="product.composite.update.result"/> <block class="Magento\Framework\Pricing\Render" name="product.price.render.default"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml index 9a49726e05342ffacd7cd36acd65ec95874f4875..94e39a554347af6f95db3977b36de2b733da3469 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml index 3d5fa50cf4d3cd4e13e44cac40f935d2342a88f6..6cb1d4a83eec0cf4a2e9b2bd7956889c0c829cc0 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Backend::store/switcher.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml index bf2926e9aa3c2885ef9fa97418f120937155e003..a6b6a497faa7072259e16970e2190089d605800b 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Price" name="admin.product.edit.tab.alerts.price"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml index edcde3aafa8f4f1aa41ad74792117dd40c399512..38e4c36791352e0bb6443c8ff459c54a96ca9303 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Stock" name="admin.product.edit.tab.alerts.stock"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml index 0c8b7de3a8ef7e0339f4910e5c80162eb85d7a65..098fe9b68d893f79b74e942a8f5bd7fa0e42bbd2 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="left"> <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tabs" name="attribute_edit_tabs"> <container label="Main" name="main"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml index 996ceb26c22b1570677d5658fdc19ec07d54d2b9..a902d9089eb0f05972af927acf5adea09eeac83a 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="left"/> <referenceBlock name="attribute_edit_content"> <arguments> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml index 095815566e6af0a9c54fe7c58c11c7cc9fd1cd9b..a96ec6efad151885115fcca946ba02d978c75c19 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/> <block class="Magento\Backend\Block\Widget\Grid\Serializer" name="crosssell_grid_serializer"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml index 5037b7c6b8f882df6f4e6d10dfcdca4f33b2b4cd..7b53b1b87ed5dd36a023d0e3521d07e130374416 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml index 1ebbdeec6b5287a2109e69b92576e14d43e8f652..6b0124a30ebfa567adee103f2d3b11f1256856b5 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Options\Ajax" name="catalog.product.import.custom.options"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml index f1a3ea42d6c3eddf749c820feea706c1ce806457..91dfa3bbae37915829df1d8f7caf202ef2607e01 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_new"/> <referenceBlock name="page-title"> <action method="setTitleClass"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml index e354a47ec9a3186b16b588e650cb767103c52e6c..fe539697751077fafae497f6dab91df079ca06c5 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Grid" name="admin.product.grid"/> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml index 4ee8fbba74586a43a84bd1ebe5fcaea2fc76c6da..3a4f710a23b67e29d2894fadd71f550f9d7e92e6 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="menu"> <action method="setActive"> <argument name="itemId" xsi:type="string">Magento_Catalog::catalog_products</argument> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml index 40c23d672cdf7c3c285894fb87be2ae63802c766..316b3ea887bedbbbc7f731ae882d6f2d7c6f77ca 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml index 8869a742e03e0998d7664602f5e20fb5881e4fb1..c7f919b4b17d494137b0c32d766ab43c4bde2e82 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options" name="admin.product.options"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml index 6ef9015b6b0ed8f71520faa7f6e25e23b518be7b..b7de81d34be8e0de064f78af4f7fc1808f14e53f 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Popup\Grid" name="catalog.product.import.custom.options"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml index 5b5e3d97348444b90c1d84ce9eab7dc45385cfbb..f5cdc41a678e5db2873a5f31cf6d7985ea231884 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/> <block class="Magento\Backend\Block\Widget\Grid\Serializer" name="related_grid_serializer"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml index e07f2105d7daf8e63afda798a178ee84a7c96dd2..ad7fd8a7b88b2dd9326a390682babf680a75815c 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml index fc0c0092061b3efdfce84ec2c08e1475bdfc5f2b..aaaa6794acf7cd8d339380cff02359789f71fa9c 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.catalog.product.set.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.catalog.product.set.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml index fbef56fcd1530ab9ec4cc9341b79301eeced16a2..58783b06041f5882bcec71b08bb8be624fe8eee3 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml index 9c7a35b42eb06c569160a5c09113057e457cba30..8d2896f586a972098b2492a3b340bdfd7d570b51 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="catalog_product_set_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml index 691c4d952caf916b834f39e957f33d52869af839..586e851fc102e96dc34fa52603cf91785dce55ff 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/> <block class="Magento\Backend\Block\Widget\Grid\Serializer" name="upsell_grid_serializer"> diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml index 8909fa754867352bb1893d296f8b99c79b39fabb..73ce1cad814848b574d2122f7bbc90c5f57d7ebc 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/> </container> diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml index 93d2133913ee0a3e87f8854eca162fa0fad5a46c..8885d42a7ec561761860afa4bc6ac57fff0d2896 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml @@ -282,7 +282,7 @@ toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_c <div class="control"> <select id="inventory_stock_availability" name="<?php echo $this->getFieldSuffix() ?>[stock_data][is_in_stock]" <?php echo $_readonly;?>> <?php foreach ($this->getStockOption() as $option): ?> - <?php $_selected = ($option['value'] == $this->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?> + <?php $_selected = ($this->getFieldValue('is_in_stock') !== null && $option['value'] == $this->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?> <option value="<?php echo $option['value'] ?>" <?php echo $_selected ?>><?php echo $option['label'] ?></option> <?php endforeach; ?> </select> diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml index f2eee7e1660d3dd2743dea1b0c22ba15d471655f..950c83cb2b454a095ea2da9842d91237ba5fa64f 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml @@ -37,7 +37,7 @@ </div> </div> -<script data-template-for="product-attribute-search" type="text/x-jquery-tmpl"> +<script data-template-for="product-attribute-search-<?php echo $this->getGroupId(); ?>" type="text/x-jquery-tmpl"> <ul data-mage-init='{"menu":[]}'> {{if items.length}} {{each items}} diff --git a/app/code/Magento/Catalog/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Catalog/view/base/layout/catalog_product_prices.xml index 41e16a36ec46f1fdef5dc69a48fc98b1a77ff6ff..64c427798aed55b5aaf8616b5cc7a720dd90b3a9 100644 --- a/app/code/Magento/Catalog/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Catalog/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Framework\Pricing\Render\RendererPool" name="render.product.prices"> <arguments> <argument name="default" xsi:type="array"> diff --git a/app/code/Magento/Catalog/view/base/layout/default.xml b/app/code/Magento/Catalog/view/base/layout/default.xml index 93aab43d68b7deb95b1b06228c6560b1d2bb3d07..f58811f5c2f26e0cbf75a98c1ec87c1679585638 100644 --- a/app/code/Magento/Catalog/view/base/layout/default.xml +++ b/app/code/Magento/Catalog/view/base/layout/default.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Framework\Pricing\Render" name="product.price.render.default"> <arguments> <argument name="price_render_handle" xsi:type="string">catalog_product_prices</argument> diff --git a/app/code/Magento/Catalog/view/base/layout/empty.xml b/app/code/Magento/Catalog/view/base/layout/empty.xml index 93aab43d68b7deb95b1b06228c6560b1d2bb3d07..f58811f5c2f26e0cbf75a98c1ec87c1679585638 100644 --- a/app/code/Magento/Catalog/view/base/layout/empty.xml +++ b/app/code/Magento/Catalog/view/base/layout/empty.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Framework\Pricing\Render" name="product.price.render.default"> <arguments> <argument name="price_render_handle" xsi:type="string">catalog_product_prices</argument> diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml index d6617828223539abc5b0a6b8da0b1b3cdada6da2..798e8f8eb615647c9bdc6d68b1cf5ccd8028e481 100644 --- a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml +++ b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml @@ -36,6 +36,13 @@ $finalPriceModel = $this->getPriceType('final_price'); $idSuffix = $this->getIdSuffix() ? $this->getIdSuffix() : ''; ?> <?php if ($this->hasSpecialPrice()): ?> + <span class="special-price"> + <?php echo $this->renderAmount($finalPriceModel->getAmount(), [ + 'display_label' => __('Special Price'), + 'price_id' => $this->getPriceId('product-price-' . $idSuffix), + 'include_container' => true + ]); ?> + </span> <span class="old-price"> <?php echo $this->renderAmount($priceModel->getAmount(), [ 'display_label' => __('Regular Price'), @@ -44,13 +51,6 @@ $idSuffix = $this->getIdSuffix() ? $this->getIdSuffix() : ''; 'skip_adjustments' => true ]); ?> </span> - <span class="special-price"> - <?php echo $this->renderAmount($finalPriceModel->getAmount(), [ - 'display_label' => __('Special Price'), - 'price_id' => $this->getPriceId('product-price-' . $idSuffix), - 'include_container' => true - ]); ?> - </span> <?php else: ?> <?php echo $this->renderAmount($finalPriceModel->getAmount(), [ 'price_id' => $this->getPriceId('product-price-' . $idSuffix), diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml index bad8ca2a411e9d487f1124d35ced453e727eda6f..ca680bedef232db64b43e1708b6241df02336f33 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml @@ -23,11 +23,15 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <referenceContainer name="columns.top"> + <container name="category.view.container" htmlTag="div" htmlClass="category-view" after="-"> + <block class="Magento\Catalog\Block\Category\View" name="category.image" template="Magento_Catalog::category/image.phtml"/> + <block class="Magento\Catalog\Block\Category\View" name="category.description" template="Magento_Catalog::category/description.phtml"/> + <block class="Magento\Catalog\Block\Category\View" name="category.cms" template="Magento_Catalog::category/cms.phtml"/> + </container> + </referenceContainer> <referenceContainer name="content"> - <block class="Magento\Catalog\Block\Category\View" name="category.image" template="Magento_Catalog::category/image.phtml"/> - <block class="Magento\Catalog\Block\Category\View" name="category.description" template="Magento_Catalog::category/description.phtml"/> - <block class="Magento\Catalog\Block\Category\View" name="category.cms" template="Magento_Catalog::category/cms.phtml"/> <block class="Magento\Catalog\Block\Category\View" name="category.products" template="Magento_Catalog::category/products.phtml"> <block class="Magento\Catalog\Block\Product\ListProduct" name="category.products.list" as="product_list" template="Magento_Catalog::product/list.phtml"> <container name="category.product.list.additional" as="additional" /> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml index d92ed041572b7f54f1ad4323b851d1cab2be26d8..204273f1ef57ccf7ff0cbe40e7f61a4f0a58e3f1 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="sidebar.main"> <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml index 51fcb22949418de1cc7e904dabe29eada882ce77..719929e9864f497da6ca9730d68e6e0f19b51764 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="page.main.title"> <action method="setPageTitle"> <argument translate="true" name="page_title" xsi:type="string">Compare Products</argument> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml index f54cdea6631858578edadde8e48e4a7d9c86ce90..c4a40f40abcf73844ca3c7ccd3b2b6d272859d84 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="root"> <action method="setTemplate"> <argument name="template" xsi:type="string">popup.phtml</argument> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml index 29b925aff485eb2c7884dee91a2cc11ad74000c7..e3f2fc81e047d0e980fad7aa402f1a068920e47e 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="checkout_page_head_components" template="Magento_Catalog::js/components.phtml"/> </referenceBlock> @@ -43,26 +43,37 @@ </head> <update handle="page_calendar"/> <referenceContainer name="content"> - <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product-info-main" before="-"> - <container name="product.info.type" label="invisible" before="-"/> - <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml" after="product.info.type"> - <arguments> - <argument name="at_call" xsi:type="string">getSku</argument> - <argument name="at_code" xsi:type="string">sku</argument> - <argument name="css_class" xsi:type="string">sku</argument> - <argument name="at_label" xsi:type="string">default</argument> - <argument name="add_attribute" xsi:type="string">itemprop="sku"</argument> - </arguments> - </block> - <block class="Magento\Catalog\Block\Product\View" name="product.info.review" template="product/view/review.phtml" after="product.info.sku"/> - <block class="Magento\Catalog\Pricing\Render" name="product.price.final" after="product.info.sku"> - <arguments> - <argument name="price_render" xsi:type="string">product.price.render.default</argument> - <argument name="price_type_code" xsi:type="string">final_price</argument> - <argument name="zone" xsi:type="string">item_view</argument> - </arguments> + <container name="product.info.media" label="invisible" htmlTag="div" htmlClass="product media" before="-"> + <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/base-image.phtml"> + <block class="Magento\Catalog\Block\Product\Image" name="product.image.main"/> + <block class="Magento\Catalog\Block\Product\Image" name="product.image.thumbs"/> </block> - <block class="Magento\Catalog\Pricing\Render" name="product.price.tier" after="product.price.final"> + </container> + + <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product-info-main" after="product.info.media"> + <block class="Magento\Catalog\Block\Product\View" name="product.info.review" template="product/view/review.phtml" before="-" /> + <container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price" after="product.info.review"> + <block class="Magento\Catalog\Pricing\Render" name="product.price.final" after="product.info.sku"> + <arguments> + <argument name="price_render" xsi:type="string">product.price.render.default</argument> + <argument name="price_type_code" xsi:type="string">final_price</argument> + <argument name="zone" xsi:type="string">item_view</argument> + </arguments> + </block> + <container name="product.info.stock.sku" label="Product auxiliary info" htmlTag="div" htmlClass="product-info-stock-sku"> + <container name="product.info.type" label="invisible" before="-"/> + <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml" after="product.info.type"> + <arguments> + <argument name="at_call" xsi:type="string">getSku</argument> + <argument name="at_code" xsi:type="string">sku</argument> + <argument name="css_class" xsi:type="string">sku</argument> + <argument name="at_label" xsi:type="string">default</argument> + <argument name="add_attribute" xsi:type="string">itemprop="sku"</argument> + </arguments> + </block> + </container> + </container> + <block class="Magento\Catalog\Pricing\Render" name="product.price.tier" after="product.info.price"> <arguments> <argument name="price_render" xsi:type="string">product.price.render.default</argument> <argument name="price_type_code" xsi:type="string">tier_price</argument> @@ -70,7 +81,7 @@ </arguments> </block> <container name="alert.urls" as="alert_urls" label="Alert Urls" after="product.price.tier"/> - <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml"> + <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml" after="alert.urls"> <container name="product.info.form.content" label="invisible" as="product_info_form_content"> <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/> </container> @@ -90,9 +101,13 @@ </block> </block> </block> - <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/> - <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/> - <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml" group="detailed_info" after="addto"> + <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"> + <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links" after="product.info.overview"> + <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/> + <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/> + </container> + </container> + <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml" group="detailed_info" after="product.info.extrahint"> <arguments> <argument name="at_call" xsi:type="string">getShortDescription</argument> <argument name="at_code" xsi:type="string">short_description</argument> @@ -102,17 +117,9 @@ <argument name="add_attribute" xsi:type="string">itemprop="description"</argument> </arguments> </block> - <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links" after="product.info.overview"> - <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/> - </container> - </container> - <container name="product.info.media" label="invisible" htmlTag="div" htmlClass="product media" after="product.info.main"> - <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/base-image.phtml"> - <block class="Magento\Catalog\Block\Product\Image" name="product.image.main"/> - <block class="Magento\Catalog\Block\Product\Image" name="product.image.thumbs"/> - </block> </container> - <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="product/view/details.phtml"> + + <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="product/view/details.phtml" after="product.info.main"> <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="product/view/attribute.phtml" group="detailed_info"> <arguments> <argument name="at_call" xsi:type="string">getDescription</argument> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml index d7f40ea5387e4f71da1473d724dff7504e033347..786d9d62f161ec5db6b2577fa11c75ae311126b8 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="product.info.type"> <block class="Magento\Catalog\Block\Product\View\Type\Simple" name="product.info.simple" as="product_type_data" template="product/view/type/default.phtml"/> <container name="product.info.simple.extra" after="product.info.simple" as="product_type_data_extra" label="Product Extra Info"/> diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml index 36f3d627bde7b9c2f02516b853636882290a7b33..e53bfbc04bcbb1ab7060c12e19a6fb936eb72cd3 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="product.info.type"> <block class="Magento\Catalog\Block\Product\View\Type\Virtual" name="product.info.virtual" as="product_type_data" template="product/view/type/default.phtml"/> <container name="product.info.virtual.extra" after="product.info.virtual" as="product_type_data_extra" label="Product Extra Info"/> diff --git a/app/code/Magento/Catalog/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/Catalog/view/frontend/layout/checkout_cart_item_renderers.xml index 7dbba6d2774d67de98d1a59712d0184f193311f0..985741c67748e9622ff84fd7d409ae9a7bf24546 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.item.renderers"> <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="virtual" template="cart/item/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Catalog/view/frontend/layout/default.xml b/app/code/Magento/Catalog/view/frontend/layout/default.xml index 7a3714e07a629a7570cae321e560bc23514c2709..48619f2434f065337d916cb48f47b166951ac41a 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/default.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="top.links"> <block class="Magento\Catalog\Block\Product\Compare\Link" name="catalog.compare.link" before="-" template="Magento_Catalog::product/compare/link.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml index 6e1819c71339201d8de43ebededa4339b3fcb825..f4d5353de122984327020fc57d8c55b45a56ac15 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml @@ -25,7 +25,6 @@ ?> <?php $_helper = $this->helper('Magento\Catalog\Helper\Product\Compare'); -$_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null; $count = $_helper->getItemCount(); ?> <?php if($count > 0): ?> diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml index a1d9322ec2cec8f4f78a4aed89350d4dbde58bc5..317a2cc04f710c8fd0375ad7db93682f5e0b68cb 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml @@ -24,7 +24,7 @@ ?> <?php $_product = $this->getProduct() ?> <?php if ($this->canEmailToFriend()): ?> - <a title="<?php echo __('Email to a Friend') ?>" + <a title="<?php echo __('Email') ?>" href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>" - class="action mailto friend"><span><?php echo __('Email to a Friend') ?></span></a> + class="action mailto friend"><span><?php echo __('Email') ?></span></a> <?php endif; ?> diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php index 6c9bf078c50d4215895e0aac5184284945193289..706f1df87b6f5e71347779c792dc0f46130103b3 100644 --- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php +++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php @@ -925,7 +925,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity // remember default title for later comparisons $defaultTitles[$option['option_id']] = $option['title']; - } elseif ($option['title'] != $customOptions[0]['_custom_option_title']) { + } else { $row['_custom_option_title'] = $option['title']; } $values = $option->getValues(); @@ -940,7 +940,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity $row['_custom_option_row_sort'] = $firstValue['sort_order']; $defaultValueTitles[$firstValue['option_type_id']] = $firstValue['title']; - } elseif ($firstValue['title'] != $customOptions[0]['_custom_option_row_title']) { + } else { $row['_custom_option_row_title'] = $firstValue['title']; } } @@ -959,7 +959,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity $row['_custom_option_row_price'] = $value['price'] . $valuePriceType; $row['_custom_option_row_sku'] = $value['sku']; $row['_custom_option_row_sort'] = $value['sort_order']; - } elseif ($value['title'] != $customOptions[0]['_custom_option_row_title']) { + } else { $row['_custom_option_row_title'] = $value['title']; } if ($row) { diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php index 9c9a1c154a9e797b320b3ec12517913f4d5bf696..be6a502e05922bf01d0231e3cb743b619892fb69 100644 --- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php +++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php @@ -1052,6 +1052,8 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity $typeValues = array(); $typePrices = array(); $typeTitles = array(); + $parentCount = array(); + $childCount = array(); foreach ($bunch as $rowNumber => $rowData) { if (!$this->isRowAllowedToImport($rowData, $rowNumber)) { @@ -1076,7 +1078,9 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity $nextValueId, $typeValues, $typePrices, - $typeTitles + $typeTitles, + $parentCount, + $childCount ); $this->_collectOptionTitle($rowData, $prevOptionId, $titles); } @@ -1180,6 +1184,8 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity * @param array &$typeValues * @param array &$typePrices * @param array &$typeTitles + * @param array &$parentCount + * @param array &$childCount * @return void */ protected function _collectOptionTypeData( @@ -1188,10 +1194,13 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity &$nextValueId, array &$typeValues, array &$typePrices, - array &$typeTitles + array &$typeTitles, + array &$parentCount, + array &$childCount ) { if ($this->_isRowHasSpecificType($this->_rowType) && $prevOptionId) { $specificTypeData = $this->_getSpecificTypeData($rowData, $nextValueId); + //For default store if ($specificTypeData) { $typeValues[$prevOptionId][] = $specificTypeData['value']; @@ -1199,7 +1208,6 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity if (!isset($typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID])) { $typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] = $specificTypeData['title']; } - $typeTitles[$nextValueId][$this->_rowStoreId] = $specificTypeData['title']; if ($specificTypeData['price']) { if ($this->_isPriceGlobal) { @@ -1214,6 +1222,22 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity } $nextValueId++; + if (isset($parentCount[$prevOptionId])) { + $parentCount[$prevOptionId]++; + } else { + $parentCount[$prevOptionId] = 1; + } + } + + if (!isset($childCount[$this->_rowStoreId][$prevOptionId])) { + $childCount[$this->_rowStoreId][$prevOptionId] = 0; + } + $parentValueId = $nextValueId - $parentCount[$prevOptionId] + $childCount[$this->_rowStoreId][$prevOptionId]; + $specificTypeData = $this->_getSpecificTypeData($rowData, $parentValueId, false); + //For others stores + if ($specificTypeData) { + $typeTitles[$parentValueId][$this->_rowStoreId] = $specificTypeData['title']; + $childCount[$this->_rowStoreId][$prevOptionId]++; } } } @@ -1430,11 +1454,12 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity * * @param array $rowData * @param int $optionTypeId + * @param bool $defaultStore * @return array|false */ - protected function _getSpecificTypeData(array $rowData, $optionTypeId) + protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultStore = true) { - if (!empty($rowData[self::COLUMN_ROW_TITLE]) && empty($rowData[self::COLUMN_STORE])) { + if (!empty($rowData[self::COLUMN_ROW_TITLE]) && $defaultStore && empty($rowData[self::COLUMN_STORE])) { $valueData = array( 'option_type_id' => $optionTypeId, 'sort_order' => empty($rowData[self::COLUMN_ROW_SORT]) ? 0 : abs($rowData[self::COLUMN_ROW_SORT]), @@ -1451,10 +1476,10 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity $priceData['price_type'] = 'percent'; } } - return array('value' => $valueData, 'title' => $rowData[self::COLUMN_ROW_TITLE], 'price' => $priceData); + } elseif (!empty($rowData[self::COLUMN_ROW_TITLE]) && !$defaultStore && !empty($rowData[self::COLUMN_STORE])) { + return array('title' => $rowData[self::COLUMN_ROW_TITLE]); } - return false; } diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php new file mode 100644 index 0000000000000000000000000000000000000000..3da017a7eb0c59f85876f30c83ac248e27dc7828 --- /dev/null +++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php @@ -0,0 +1,55 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\CatalogImportExport\Model\Indexer\Category\Product\Plugin; + +class Import +{ + /** + * @var \Magento\Catalog\Model\Indexer\Category\Product\Processor + */ + protected $_indexerCategoryProductProcessor; + + /** + * @param \Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor + */ + public function __construct(\Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor) + { + $this->_indexerCategoryProductProcessor = $indexerCategoryProductProcessor; + } + + /** + * After import handler + * + * @param \Magento\ImportExport\Model\Import $subject + * @param boolean $import + * + * @return mixed + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import) + { + $this->_indexerCategoryProductProcessor->markIndexerAsInvalid(); + return $import; + } +} diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php new file mode 100644 index 0000000000000000000000000000000000000000..6edfce6ea98c1357730446f20efc50cb023aa4fa --- /dev/null +++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php @@ -0,0 +1,55 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\CatalogImportExport\Model\Indexer\Product\Category\Plugin; + +class Import +{ + /** + * @var \Magento\Catalog\Model\Indexer\Product\Category\Processor + */ + protected $_indexerProductCategoryProcessor; + + /** + * @param \Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor + */ + public function __construct(\Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor) + { + $this->_indexerProductCategoryProcessor = $indexerProductCategoryProcessor; + } + + /** + * After import handler + * + * @param \Magento\ImportExport\Model\Import $subject + * @param boolean $import + * + * @return mixed + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import) + { + $this->_indexerProductCategoryProcessor->markIndexerAsInvalid(); + return $import; + } +} diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index 5f6009a6b507cbd9e0445234fde1548f72a9158e..80ce8f8cc086a03bd02a3fb9a4b1d1ba82e3c335 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-core": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-core": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogImportExport/etc/di.xml b/app/code/Magento/CatalogImportExport/etc/di.xml index c4d6e35f5d2d30cb3cc441332f213ec69a4f67ac..8e18f344bd75687e7112964f258f7902ad1eee99 100644 --- a/app/code/Magento/CatalogImportExport/etc/di.xml +++ b/app/code/Magento/CatalogImportExport/etc/di.xml @@ -30,5 +30,7 @@ <plugin name="invalidatePriceIndexerOnImport" type="\Magento\CatalogImportExport\Model\Indexer\Product\Price\Plugin\Import" /> <plugin name="invalidateStockIndexerOnImport" type="\Magento\CatalogImportExport\Model\Indexer\Stock\Plugin\Import" /> <plugin name="invalidateEavIndexerOnImport" type="\Magento\CatalogImportExport\Model\Indexer\Product\Eav\Plugin\Import" /> + <plugin name="invalidateProductCategoryIndexerOnImport" type="\Magento\CatalogImportExport\Model\Indexer\Product\Category\Plugin\Import" /> + <plugin name="invalidateCategoryProductIndexerOnImport" type="\Magento\CatalogImportExport\Model\Indexer\Category\Product\Plugin\Import" /> </type> </config> diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php index 6be96c052ff78888964ff9e72c4905bed4b68349..7b76b585b66fb9678673d6d94d055fa06049eb07 100644 --- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php +++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php @@ -184,7 +184,7 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select { return " <script type='text/javascript'> - require(['jquery'], function(jQuery){ + require(['jquery'], function(jQuery) { jQuery(function($) { var qty = $('#{$quantityFieldId}'), productType = $('#product_type_id').val(), @@ -192,18 +192,28 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select manageStockField = $('#inventory_manage_stock'), useConfigManageStockField = $('#inventory_use_config_manage_stock'), fieldsAssociations = { - '{$quantityFieldId}' : 'inventory_qty', - '{$inStockFieldId}' : 'inventory_stock_availability' + '{$quantityFieldId}': 'inventory_qty', + '{$inStockFieldId}': 'inventory_stock_availability' }; var disabler = function(event) { + if (typeof(event) === 'undefined') { + return; + } var stockBeforeDisable = $.Event('stockbeforedisable', {productType: productType}); $('[data-tab-panel=product-details]').trigger(stockBeforeDisable); if (stockBeforeDisable.result !== false) { - var manageStockValue = (qty.val() === '') ? 0 : 1; + var manageStockValue = (qty.val() === '') ? 0 : 1, + stockAssociations = $('#' + fieldsAssociations['{$inStockFieldId}']); stockAvailabilityField.prop('disabled', !manageStockValue); - $('#' + fieldsAssociations['{$inStockFieldId}']).prop('disabled', !manageStockValue); - if (manageStockField.val() != manageStockValue && !(event && event.type == 'keyup')) { + stockAssociations.prop('disabled', !manageStockValue); + if ($(event.currentTarget).attr('id') === qty.attr('id') && event.type != 'change') { + stockAvailabilityField.val(manageStockValue); + stockAssociations.val(manageStockValue); + } + if (parseInt(manageStockField.val()) != manageStockValue && + !(event && event.type == 'keyup') + ) { if (useConfigManageStockField.val() == 1) { useConfigManageStockField.removeAttr('checked').val(0); } @@ -229,7 +239,7 @@ class Stock extends \Magento\Framework\Data\Form\Element\Select //Get key by value from object var getKeyByValue = function(object, value) { var returnVal = false; - $.each(object, function(objKey, objValue){ + $.each(object, function(objKey, objValue) { if (value === objValue) { returnVal = objKey; } diff --git a/app/code/Magento/CatalogInventory/Model/Observer.php b/app/code/Magento/CatalogInventory/Model/Observer.php index 9e37a00ca378c9e206ec1798941b2a2d5ed29240..d063a61a260f1aeab4ff59566a6fa609763432a5 100644 --- a/app/code/Magento/CatalogInventory/Model/Observer.php +++ b/app/code/Magento/CatalogInventory/Model/Observer.php @@ -283,7 +283,8 @@ class Observer $originalQty = $product->getData('stock_data/original_inventory_qty'); if (strlen($originalQty) > 0) { - $stockItemData['qty_correction'] = $stockItemData['qty'] - $originalQty; + $stockItemData['qty_correction'] = (isset($stockItemData['qty']) ? $stockItemData['qty'] : 0) + - $originalQty; } $stockItemDo = $this->stockItemService->getStockItem($product->getId()); diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php index cff5d949b98243df4c0183848f14738f7e24be46..bbf9c0448b36100d428d0d91fa94f36928b0f053 100644 --- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php +++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php @@ -89,11 +89,12 @@ class StockItem if (!is_null($productTypeCustomOption)) { // Check if product related to current item is a part of product that represents product set if ($this->typeConfig->isProductSet($productTypeCustomOption->getValue())) { - $stockItem->setProductName($quoteItem->getProduct()->getName()); $stockItem->setIsChildItem(true); } } + $stockItem->setProductName($quoteItem->getProduct()->getName()); + $result = $stockItem->checkQuoteItemQty($rowQty, $qtyForCheck, $qty); if ($stockItem->hasIsChildItem()) { diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php index 9653a6e97cb6c1ae8e8eeb4382b8b96eb5e939d0..ba4b16e14402a75ac590450951c7b1af06d96e67 100644 --- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php +++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php @@ -903,9 +903,6 @@ class Item extends \Magento\Framework\Model\AbstractModel $isQty = $this->stockItemService->isQty($typeId); if ($isQty) { - if (!$this->getId()) { - $this->processIsInStock(); - } if ($this->getManageStock() && !$this->verifyStock()) { $this->setIsInStock(false)->setStockStatusChangedAutomaticallyFlag(true); } diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index 9e56de86a5012b8d50b3bc470f24c6d764695788..16bc4f8cbb65fba6b8857528f05795c540751b4c 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view.xml index 3c07fd93ca5a7ce6e918844dbc1b5dd41cf7419d..7ebe66809de4820938ab68028a5dbcb62f5220d4 100644 --- a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="product.info.extrahint"> <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.extrahint.qtyincrements" template="qtyincrements.phtml"/> </referenceContainer> diff --git a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_simple.xml index 8ed999f0b5a725267e6052418cf429f4cf234ba8..40889d94057986842cc0802dc4c5f46bb052a17d 100644 --- a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_simple.xml +++ b/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_simple.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="product.info.simple.extra"> <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" template="stockqty/default.phtml"/> </referenceContainer> diff --git a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_virtual.xml b/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_virtual.xml index cdbc11ed5dec42f9da78104c426da9a9d460d073..79de5bd79b69a9904a3a36cc9e5abe938bfac334 100644 --- a/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_virtual.xml +++ b/app/code/Magento/CatalogInventory/view/frontend/layout/catalog_product_view_type_virtual.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="product.info.virtual.extra"> <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" template="stockqty/default.phtml"/> </referenceContainer> diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index d3f41c07eb7252e82819748b4a5087cde475803f..8969135936c3b4b789190fbf645d7beb98ce105d 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-rule": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-rule": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml index 5c0eeb324c301a7b08a69818e4f5fbd337caae82..a25434f27988e5086426a34cba8f895f2815ab10 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml +++ b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.promo.catalog.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="promo.catalog.grid" as="grid"> <arguments> diff --git a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml index 144f368dd74e7b5153ce775fcd500388e5cc089e..55dd53007def8fe93bfd44cc1db29932532767a3 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml +++ b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="left"> <block class="Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit\Tabs" name="promo_catalog_edit_tabs"> <block class="Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit\Tab\Main" name="promo_catalog_edit_tab_main"/> diff --git a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_index.xml b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_index.xml index afcedbe068cc5e5daed2ea356de0d583c495d162..97e6604237e5dbcef6e012ca88b143137ebe1a42 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_index.xml +++ b/app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_rule_promo_catalog_block"/> <referenceContainer name="content"> <block class="Magento\CatalogRule\Block\Adminhtml\Promo\Catalog" name="adminhtml.promo.catalog.grid.container"/> diff --git a/app/code/Magento/CatalogSearch/Block/Result.php b/app/code/Magento/CatalogSearch/Block/Result.php index b5c8637c13478ae66b005217f504106c76124b47..ed26a122ac88ad37a1affc5f7e8ee288c0fb66eb 100644 --- a/app/code/Magento/CatalogSearch/Block/Result.php +++ b/app/code/Magento/CatalogSearch/Block/Result.php @@ -26,10 +26,10 @@ namespace Magento\CatalogSearch\Block; use Magento\Catalog\Block\Product\ListProduct; use Magento\Catalog\Model\Layer\Search as ModelLayer; use Magento\CatalogSearch\Helper\Data; -use Magento\CatalogSearch\Model\Query; use Magento\CatalogSearch\Model\Resource\Fulltext\Collection; use Magento\Framework\View\Element\Template; use Magento\Framework\View\Element\Template\Context; +use Magento\Search\Model\QueryFactory; /** * Product search result block @@ -57,31 +57,39 @@ class Result extends Template */ protected $catalogLayer; + /** + * @var QueryFactory + */ + private $queryFactory; + /** * @param Context $context * @param ModelLayer $catalogLayer * @param Data $catalogSearchData + * @param QueryFactory $queryFactory * @param array $data */ public function __construct( Context $context, ModelLayer $catalogLayer, Data $catalogSearchData, + QueryFactory $queryFactory, array $data = array() ) { $this->catalogLayer = $catalogLayer; $this->catalogSearchData = $catalogSearchData; + $this->queryFactory = $queryFactory; parent::__construct($context, $data); } /** * Retrieve query model object * - * @return Query + * @return \Magento\Search\Model\Query */ protected function _getQuery() { - return $this->catalogSearchData->getQuery(); + return $this->queryFactory->get(); } /** @@ -168,18 +176,6 @@ class Result extends Template return $this; } - /** - * Set Search Result collection - * - * @return $this - */ - public function setListCollection() - { - // $this->getListBlock() - // ->setCollection($this->_getProductCollection()); - return $this; - } - /** * Retrieve Search result list HTML output * diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php index dcfcd4c9374b92d390001aa88b87dfbca69e59c5..b25db6f54751df8cf6cf830c0198d08a0f583193 100644 --- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php @@ -24,9 +24,10 @@ */ namespace Magento\CatalogSearch\Controller\Result; -use Magento\Framework\App\Action\Context; use Magento\Catalog\Model\Session; +use Magento\Framework\App\Action\Context; use Magento\Framework\StoreManagerInterface; +use Magento\Search\Model\QueryFactory; class Index extends \Magento\Framework\App\Action\Action { @@ -42,15 +43,26 @@ class Index extends \Magento\Framework\App\Action\Action */ protected $_storeManager; + /** + * @var QueryFactory + */ + private $_queryFactory; + /** * @param Context $context * @param Session $catalogSession * @param StoreManagerInterface $storeManager + * @param QueryFactory $queryFactory */ - public function __construct(Context $context, Session $catalogSession, StoreManagerInterface $storeManager) - { + public function __construct( + Context $context, + Session $catalogSession, + StoreManagerInterface $storeManager, + QueryFactory $queryFactory + ) { $this->_storeManager = $storeManager; $this->_catalogSession = $catalogSession; + $this->_queryFactory = $queryFactory; parent::__construct($context); } @@ -61,8 +73,8 @@ class Index extends \Magento\Framework\App\Action\Action */ public function execute() { - /* @var $query \Magento\CatalogSearch\Model\Query */ - $query = $this->_objectManager->get('Magento\CatalogSearch\Helper\Data')->getQuery(); + /* @var $query \Magento\Search\Model\Query */ + $query = $this->_queryFactory->get(); $query->setStoreId($this->_storeManager->getStore()->getId()); diff --git a/app/code/Magento/CatalogSearch/Helper/Data.php b/app/code/Magento/CatalogSearch/Helper/Data.php index fda9eb9af5bf628b19457f712c0b5909dedc688a..1ab24a67a1aad695df1da36848f92fc6be7f6526 100644 --- a/app/code/Magento/CatalogSearch/Helper/Data.php +++ b/app/code/Magento/CatalogSearch/Helper/Data.php @@ -23,263 +23,11 @@ */ namespace Magento\CatalogSearch\Helper; -use Magento\Framework\App\Helper\AbstractHelper; -use Magento\Framework\App\Helper\Context; -use Magento\CatalogSearch\Model\Fulltext; -use Magento\CatalogSearch\Model\Query; -use Magento\CatalogSearch\Model\QueryFactory; -use Magento\CatalogSearch\Model\Resource\Fulltext\Engine; -use Magento\CatalogSearch\Model\Resource\Query\Collection; -use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Framework\Escaper; -use Magento\Framework\Filter\FilterManager; -use Magento\Framework\Stdlib\String; -use Magento\Framework\StoreManagerInterface; - /** * Catalog search helper */ -class Data extends AbstractHelper +class Data extends \Magento\Search\Helper\Data { - /** - * @var array - */ - protected $_suggestData = null; - - /** - * Query variable - */ - const QUERY_VAR_NAME = 'q'; - - /** - * Max query length - */ - const MAX_QUERY_LEN = 200; - - /** - * Query object - * - * @var Query - */ - protected $_query; - - /** - * Query string - * - * @var string - */ - protected $_queryText; - - /** - * Note messages - * - * @var array - */ - protected $_messages = array(); - - /** - * Is a maximum length cut - * - * @var bool - */ - protected $_isMaxLength = false; - - /** - * Search engine model - * - * @var Engine - */ - protected $_engine; - - /** - * Magento string lib - * - * @var String - */ - protected $string; - - /** - * Core store config - * - * @var ScopeConfigInterface - */ - protected $_scopeConfig; - - /** - * Query factory - * - * @var QueryFactory - */ - protected $_queryFactory; - - /** - * @var Escaper - */ - protected $_escaper; - - /** - * @var FilterManager - */ - protected $filter; - - /** - * @var \Magento\Framework\StoreManagerInterface - */ - protected $_storeManager; - - /** - * Construct - * - * @param Context $context - * @param String $string - * @param ScopeConfigInterface $scopeConfig - * @param QueryFactory $queryFactory - * @param Escaper $escaper - * @param FilterManager $filter - * @param StoreManagerInterface $storeManager - */ - public function __construct( - Context $context, - String $string, - ScopeConfigInterface $scopeConfig, - QueryFactory $queryFactory, - Escaper $escaper, - FilterManager $filter, - StoreManagerInterface $storeManager - ) { - $this->string = $string; - $this->_scopeConfig = $scopeConfig; - $this->_queryFactory = $queryFactory; - $this->_escaper = $escaper; - $this->filter = $filter; - $this->_storeManager = $storeManager; - parent::__construct($context); - } - - /** - * Retrieve search query parameter name - * - * @return string - */ - public function getQueryParamName() - { - return self::QUERY_VAR_NAME; - } - - /** - * Retrieve query model object - * - * @return Query - */ - public function getQuery() - { - if (!$this->_query) { - $this->_query = $this->_queryFactory->create()->loadByQuery($this->getQueryText()); - if (!$this->_query->getId()) { - $this->_query->setQueryText($this->getQueryText()); - } - } - return $this->_query; - } - - /** - * Is a minimum query length - * - * @return bool - */ - public function isMinQueryLength() - { - $minQueryLength = $this->getMinQueryLength(); - $thisQueryLength = $this->string->strlen($this->getQueryText()); - return !$thisQueryLength || $minQueryLength !== '' && $thisQueryLength < $minQueryLength; - } - - /** - * Retrieve search query text - * - * @return string - */ - public function getQueryText() - { - if (!isset($this->_queryText)) { - $this->_queryText = $this->_getRequest()->getParam($this->getQueryParamName()); - if ($this->_queryText === null) { - $this->_queryText = ''; - } else { - $this->_queryText = is_array( - $this->_queryText - ) ? '' : $this->string->cleanString( - trim($this->_queryText) - ); - - $maxQueryLength = $this->getMaxQueryLength(); - if ($maxQueryLength !== '' && $this->string->strlen($this->_queryText) > $maxQueryLength) { - $this->_queryText = $this->string->substr($this->_queryText, 0, $maxQueryLength); - $this->_isMaxLength = true; - } - } - } - return $this->_queryText; - } - - /** - * Retrieve HTML escaped search query - * - * @return string - */ - public function getEscapedQueryText() - { - return $this->_escaper->escapeHtml($this->getQueryText()); - } - - /** - * Retrieve suggest collection for query - * - * @return Collection - */ - public function getSuggestCollection() - { - return $this->getQuery()->getSuggestCollection(); - } - - /** - * Retrieve result page url and set "secure" param to avoid confirm - * message when we submit form from secure page to unsecure - * - * @param string $query - * @return string - */ - public function getResultUrl($query = null) - { - return $this->_getUrl( - 'catalogsearch/result', - array('_query' => array(self::QUERY_VAR_NAME => $query), '_secure' => $this->_request->isSecure()) - ); - } - - /** - * Retrieve suggest url - * - * @return string - */ - public function getSuggestUrl() - { - return $this->_getUrl( - 'catalogsearch/ajax/suggest', - array('_secure' => $this->_storeManager->getStore()->isCurrentlySecure()) - ); - } - - /** - * Retrieve search term url - * - * @return string - */ - public function getSearchTermUrl() - { - return $this->_getUrl('catalogsearch/term/popular'); - } - /** * Retrieve advanced search URL * @@ -289,173 +37,4 @@ class Data extends AbstractHelper { return $this->_getUrl('catalogsearch/advanced'); } - - /** - * Retrieve minimum query length - * - * @param mixed $store - * @return int|string - */ - public function getMinQueryLength($store = null) - { - return $this->_scopeConfig->getValue( - Query::XML_PATH_MIN_QUERY_LENGTH, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $store - ); - } - - /** - * Retrieve maximum query length - * - * @param mixed $store - * @return int|string - */ - public function getMaxQueryLength($store = null) - { - return $this->_scopeConfig->getValue( - Query::XML_PATH_MAX_QUERY_LENGTH, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $store - ); - } - - /** - * Retrieve maximum query words count for like search - * - * @param mixed $store - * @return int - */ - public function getMaxQueryWords($store = null) - { - return $this->_scopeConfig->getValue( - Query::XML_PATH_MAX_QUERY_WORDS, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $store - ); - } - - /** - * Add Note message - * - * @param string $message - * @return $this - */ - public function addNoteMessage($message) - { - $this->_messages[] = $message; - return $this; - } - - /** - * Set Note messages - * - * @param array $messages - * @return $this - */ - public function setNoteMessages(array $messages) - { - $this->_messages = $messages; - return $this; - } - - /** - * Retrieve Current Note messages - * - * @return array - */ - public function getNoteMessages() - { - return $this->_messages; - } - - /** - * Check query of a warnings - * - * @param mixed $store - * @return $this - */ - public function checkNotes($store = null) - { - if ($this->_isMaxLength) { - $this->addNoteMessage( - __( - 'Your search query can\'t be longer than %1, so we had to shorten your query.', - $this->getMaxQueryLength() - ) - ); - } - - $searchType = $this->_scopeConfig->getValue( - Fulltext::XML_PATH_CATALOG_SEARCH_TYPE, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ); - if ($searchType == Fulltext::SEARCH_TYPE_COMBINE || $searchType == Fulltext::SEARCH_TYPE_LIKE) { - $wordsFull = $this->filter->splitWords($this->getQueryText(), array('uniqueOnly' => true)); - $wordsLike = $this->filter->splitWords( - $this->getQueryText(), - array('uniqueOnly' => true, 'wordsQty' => $this->getMaxQueryWords()) - ); - if (count($wordsFull) > count($wordsLike)) { - $wordsCut = array_map(array($this->_escaper, 'escapeHtml'), array_diff($wordsFull, $wordsLike)); - $this->addNoteMessage( - __( - 'Sorry, but the maximum word count is %1. We left out this part of your search: %2.', - $this->getMaxQueryWords(), - join(' ', $wordsCut) - ) - ); - } - } - return $this; - } - - /** - * Join index array to string by separator - * Support 2 level array gluing - * - * @param array $index - * @param string $separator - * @return string - */ - public function prepareIndexdata($index, $separator = ' ') - { - $_index = array(); - foreach ($index as $value) { - if (!is_array($value)) { - $_index[] = $value; - } else { - $_index = array_merge($_index, $value); - } - } - return join($separator, $_index); - } - - /** - * @return array - */ - public function getSuggestData() - { - if (!$this->_suggestData) { - $collection = $this->getSuggestCollection(); - $query = $this->getQueryText(); - $counter = 0; - $data = array(); - foreach ($collection as $item) { - $_data = array( - 'title' => $item->getQueryText(), - 'row_class' => ++$counter % 2 ? 'odd' : 'even', - 'num_of_results' => $item->getNumResults() - ); - - if ($item->getQueryText() == $query) { - array_unshift($data, $_data); - } else { - $data[] = $_data; - } - } - $this->_suggestData = $data; - } - return $this->_suggestData; - } } diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php new file mode 100644 index 0000000000000000000000000000000000000000..de3f6d49097de21af2920df403ac18eb6ec8733d --- /dev/null +++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php @@ -0,0 +1,107 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation; + +use Magento\Catalog\Model\Product; +use Magento\Eav\Model\Config; +use Magento\Framework\App\Resource; +use Magento\Framework\DB\Adapter\AdapterInterface; +use Magento\Framework\DB\Select; +use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface; +use Magento\Framework\Search\Request\BucketInterface; +use Magento\Framework\Search\RequestInterface; +use Magento\Framework\StoreManagerInterface; +use Magento\Store\Model\Store; + +class DataProvider implements DataProviderInterface +{ + /** + * @var Config + */ + private $eavConfig; + + /** + * @var Resource + */ + private $resource; + + /** + * @var StoreManagerInterface + */ + private $storeManager; + + /** + * @param Config $eavConfig + * @param Resource $resource + * @param StoreManagerInterface $storeManager + */ + public function __construct(Config $eavConfig, Resource $resource, StoreManagerInterface $storeManager) + { + $this->eavConfig = $eavConfig; + $this->resource = $resource; + $this->storeManager = $storeManager; + } + + /** + * {@inheritdoc} + */ + public function getDataSet(BucketInterface $bucket, RequestInterface $request) + { + $currentStore = $request->getScopeDimension()->getValue(); + $currentStoreId = $this->storeManager->getStore($currentStore)->getId(); + $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $bucket->getField()); + $table = $attribute->getBackendTable(); + + $ifNullCondition = $this->getConnection()->getIfNullSql('current_store.value', 'main_table.value'); + + $select = $this->getSelect(); + $select->from(['main_table' => $table], null) + ->joinLeft( + ['current_store' => $table], + 'current_store.attribute_id = main_table.attribute_id AND current_store.store_id = ' . $currentStoreId, + null + ) + ->columns([BucketInterface::FIELD_VALUE => $ifNullCondition]) + ->where('main_table.attribute_id = ?', $attribute->getAttributeId()) + ->where('main_table.store_id = ?', Store::DEFAULT_STORE_ID); + + return $select; + } + + /** + * @return Select + */ + private function getSelect() + { + return $this->getConnection()->select(); + } + + /** + * @return AdapterInterface + */ + private function getConnection() + { + return $this->resource->getConnection(Resource::DEFAULT_READ_RESOURCE); + } +} diff --git a/app/code/Magento/CatalogSearch/Model/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Fulltext.php index 1744b288221894955cab83257e193656541db341..f26ec04423e24f179dfcb37c7badfc956f6b6bf9 100644 --- a/app/code/Magento/CatalogSearch/Model/Fulltext.php +++ b/app/code/Magento/CatalogSearch/Model/Fulltext.php @@ -24,11 +24,12 @@ namespace Magento\CatalogSearch\Model; use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\CatalogSearch\Helper\Data; +use Magento\Framework\Data\Collection\Db; use Magento\Framework\Model\Context; -use Magento\Framework\Registry; use Magento\Framework\Model\Resource\AbstractResource; -use Magento\Framework\Data\Collection\Db; +use Magento\Framework\Registry; +use Magento\Search\Model\Query; +use Magento\Search\Model\QueryFactory; /** * Catalog advanced search model @@ -57,9 +58,9 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel /** * Catalog search data * - * @var Data + * @var QueryFactory */ - protected $_catalogSearchData = null; + protected $queryFactory = null; /** * Core store config @@ -71,7 +72,7 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel /** * @param Context $context * @param Registry $registry - * @param Data $catalogSearchData + * @param QueryFactory $queryFactory * @param ScopeConfigInterface $scopeConfig * @param AbstractResource $resource * @param Db $resourceCollection @@ -80,13 +81,13 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel public function __construct( Context $context, Registry $registry, - Data $catalogSearchData, + QueryFactory $queryFactory, ScopeConfigInterface $scopeConfig, AbstractResource $resource = null, Db $resourceCollection = null, array $data = array() ) { - $this->_catalogSearchData = $catalogSearchData; + $this->queryFactory = $queryFactory; $this->_scopeConfig = $scopeConfig; parent::__construct($context, $registry, $resource, $resourceCollection, $data); } @@ -119,9 +120,9 @@ class Fulltext extends \Magento\Framework\Model\AbstractModel public function prepareResult($query = null) { if (!$query instanceof Query) { - $query = $this->_catalogSearchData->getQuery(); + $query = $this->queryFactory->get(); } - $queryText = $this->_catalogSearchData->getQueryText(); + $queryText = $query->getQueryText(); if ($query->getSynonymFor()) { $queryText = $query->getSynonymFor(); } diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/Context.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/Context.php index 809ca9fd7c53d174fd016972dcba883a127bd6c1..7af80b82e99460d231de6c6fd1be7a017fccc4cd 100644 --- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/Context.php +++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/Context.php @@ -28,12 +28,12 @@ class Context extends \Magento\Catalog\Model\Layer\Context { /** * @param ItemCollectionProvider $collectionProvider - * @param \Magento\Catalog\Model\Layer\Search\StateKey $stateKey + * @param \Magento\CatalogSearch\Model\Layer\Search\StateKey $stateKey * @param CollectionFilter $collectionFilter */ public function __construct( ItemCollectionProvider $collectionProvider, - \Magento\Catalog\Model\Layer\Search\StateKey $stateKey, + \Magento\CatalogSearch\Model\Layer\Search\StateKey $stateKey, CollectionFilter $collectionFilter ) { parent::__construct($collectionProvider, $stateKey, $collectionFilter); diff --git a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/CollectionFilter.php similarity index 71% rename from app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php rename to app/code/Magento/CatalogSearch/Model/Layer/Search/CollectionFilter.php index 6781008d8dfd001fb081f7d8ace5861aa18810bd..e6c5f4f169d3df725d8999b5a7425a3f045793ef 100644 --- a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php +++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/CollectionFilter.php @@ -22,46 +22,50 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Model\Layer\Search; +namespace Magento\CatalogSearch\Model\Layer\Search; +use Magento\Catalog\Model\Config; use Magento\Catalog\Model\Layer\CollectionFilterInterface; +use Magento\Catalog\Model\Product\Visibility; +use Magento\Framework\StoreManagerInterface; +use Magento\Search\Model\QueryFactory; class CollectionFilter implements CollectionFilterInterface { /** - * @var \Magento\Catalog\Model\Config + * @var Config */ protected $catalogConfig; /** - * @var \Magento\CatalogSearch\Helper\Data + * @var \Magento\Search\Model\QueryFactory */ - protected $helper; + protected $queryFactory; /** - * @var \Magento\Framework\StoreManagerInterface + * @var StoreManagerInterface */ protected $storeManager; /** - * @var \Magento\Catalog\Model\Product\Visibility + * @var Visibility */ protected $productVisibility; /** - * @param \Magento\Catalog\Model\Config $catalogConfig - * @param \Magento\CatalogSearch\Helper\Data $helper - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Catalog\Model\Product\Visibility $productVisibility + * @param Config $catalogConfig + * @param \Magento\Search\Model\QueryFactory $queryFactory + * @param StoreManagerInterface $storeManager + * @param Visibility $productVisibility */ public function __construct( - \Magento\Catalog\Model\Config $catalogConfig, - \Magento\CatalogSearch\Helper\Data $helper, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Catalog\Model\Product\Visibility $productVisibility + Config $catalogConfig, + QueryFactory $queryFactory, + StoreManagerInterface $storeManager, + Visibility $productVisibility ) { $this->catalogConfig = $catalogConfig; - $this->helper = $helper; + $this->queryFactory = $queryFactory; $this->storeManager = $storeManager; $this->productVisibility = $productVisibility; } @@ -78,7 +82,7 @@ class CollectionFilter implements CollectionFilterInterface ) { $collection ->addAttributeToSelect($this->catalogConfig->getProductAttributes()) - ->addSearchFilter($this->helper->getQuery()->getQueryText()) + ->addSearchFilter($this->queryFactory->get()->getQueryText()) ->setStore($this->storeManager->getStore()) ->addMinimalPrice() ->addFinalPrice() diff --git a/app/code/Magento/Catalog/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php similarity index 78% rename from app/code/Magento/Catalog/Model/Layer/Search/StateKey.php rename to app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php index a6a58adc4e44ba3921a7a15e6a70b4c4264cd746..84c42753ec3a1938e1b4642458771559d5323c41 100644 --- a/app/code/Magento/Catalog/Model/Layer/Search/StateKey.php +++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php @@ -23,27 +23,27 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Model\Layer\Search; +namespace Magento\CatalogSearch\Model\Layer\Search; class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey { /** - * @var \Magento\CatalogSearch\Helper\Data + * @var \Magento\Search\Model\QueryFactory */ - protected $helper; + protected $queryFactory; /** * @param \Magento\Framework\StoreManagerInterface $storeManager * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\CatalogSearch\Helper\Data $helper + * @param \Magento\Search\Model\QueryFactory $queryFactory */ public function __construct( \Magento\Framework\StoreManagerInterface $storeManager, \Magento\Customer\Model\Session $customerSession, - \Magento\CatalogSearch\Helper\Data $helper + \Magento\Search\Model\QueryFactory $queryFactory ) { - $this->helper = $helper; + $this->queryFactory = $queryFactory; parent::__construct($storeManager, $customerSession); } @@ -53,6 +53,6 @@ class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey */ public function toString($category) { - return 'Q_' . $this->helper->getQuery()->getId() . '_' . parent::toString($category); + return 'Q_' . $this->queryFactory->get()->getId() . '_' . \Magento\Catalog\Model\Layer\Category\StateKey::toString($category); } } diff --git a/app/code/Magento/CatalogSearch/Model/Price/Interval.php b/app/code/Magento/CatalogSearch/Model/Price/Interval.php new file mode 100644 index 0000000000000000000000000000000000000000..01607290c68bcfd7dc74fac67fb110d0f41585cd --- /dev/null +++ b/app/code/Magento/CatalogSearch/Model/Price/Interval.php @@ -0,0 +1,82 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\CatalogSearch\Model\Price; + +use Magento\Framework\Search\Dynamic\IntervalInterface; + +class Interval implements IntervalInterface +{ + /** + * @var \Magento\Catalog\Model\Resource\Layer\Filter\Price + */ + private $resource; + + /** + * @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource + */ + public function __construct(\Magento\Catalog\Model\Resource\Layer\Filter\Price $resource) + { + $this->resource = $resource; + } + + /** + * {@inheritdoc} + */ + public function load($limit, $offset = null, $lower = null, $upper = null) + { + $prices = $this->resource->loadPrices($limit, $offset, $lower, $upper); + return $this->arrayValuesToFloat($prices); + } + + /** + * {@inheritdoc} + */ + public function loadPrevious($data, $index, $lower = null) + { + $prices = $this->resource->loadPreviousPrices($data, $index, $lower); + return $this->arrayValuesToFloat($prices); + } + + /** + * {@inheritdoc} + */ + public function loadNext($data, $rightIndex, $upper = null) + { + $prices = $this->resource->loadNextPrices($data, $rightIndex, $upper); + return $this->arrayValuesToFloat($prices); + } + + /** + * @param array $prices + * @return array + */ + private function arrayValuesToFloat($prices) + { + $returnPrices = []; + if (is_array($prices) && !empty($prices)) { + $returnPrices = array_map('floatval', $prices); + } + return $returnPrices; + } +} diff --git a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php index 0536348bc2020393f55be72cf553102540242d70..760144140b7e2369129b818a4c05a8551fa23b5f 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php @@ -31,6 +31,8 @@ use Magento\Store\Model\ScopeInterface; class EngineProvider { + const CONFIG_ENGINE_PATH = 'catalog/search/engine'; + /** * @var \Magento\CatalogSearch\Model\Resource\EngineInterface */ @@ -66,7 +68,7 @@ class EngineProvider public function get() { if (!$this->_engine) { - $engineClassName = $this->_scopeConfig->getValue('catalog/search/engine', ScopeInterface::SCOPE_STORE); + $engineClassName = $this->_scopeConfig->getValue(self::CONFIG_ENGINE_PATH, ScopeInterface::SCOPE_STORE); /** * This needed if there already was saved in configuration some none-default engine @@ -79,9 +81,6 @@ class EngineProvider $this->_engine = $engine; } } - if (!$this->_engine) { - $this->_engine = $this->_engineFactory->create('Magento\CatalogSearch\Model\Resource\Fulltext\Engine'); - } } return $this->_engine; diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext.php index 961e5e2e618708da3470c7fe4d0edd9b798a706d..ac0c24b79b678b40f7a6904dfb33a4cb97cb4dbb 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext.php @@ -23,6 +23,8 @@ */ namespace Magento\CatalogSearch\Model\Resource; +use Magento\Search\Model\Resource\Helper; + /** * CatalogSearch Fulltext Index resource model */ @@ -45,7 +47,7 @@ class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb /** * CatalogSearch resource helper * - * @var \Magento\CatalogSearch\Model\Resource\Helper + * @var \Magento\Search\Model\Resource\Helper */ protected $_resourceHelper; @@ -59,7 +61,7 @@ class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb \Magento\Framework\App\Resource $resource, \Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Framework\Filter\FilterManager $filter, - \Magento\CatalogSearch\Model\Resource\Helper $resourceHelper + \Magento\Search\Model\Resource\Helper $resourceHelper ) { $this->_eventManager = $eventManager; $this->filter = $filter; @@ -87,11 +89,11 @@ class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb public function resetSearchResults($storeId = null, $productIds = null) { $adapter = $this->_getWriteAdapter(); - $adapter->update($this->getTable('catalogsearch_query'), array('is_processed' => 0)); + $adapter->update($this->getTable('search_query'), array('is_processed' => 0)); if ($storeId === null && $productIds === null) { // Keeping public interface - $adapter->update($this->getTable('catalogsearch_query'), array('is_processed' => 0)); + $adapter->update($this->getTable('search_query'), array('is_processed' => 0)); $adapter->delete($this->getTable('catalogsearch_result')); $this->_eventManager->dispatch('catalogsearch_reset_search_result'); } else { @@ -101,7 +103,7 @@ class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb array('r' => $this->getTable('catalogsearch_result')), null )->join( - array('q' => $this->getTable('catalogsearch_query')), + array('q' => $this->getTable('search_query')), 'q.query_id=r.query_id', array() )->join( @@ -121,10 +123,10 @@ class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb /** @var $select \Magento\Framework\DB\Select */ $select = $adapter->select(); $subSelect = $adapter->select()->from(array('res' => $this->getTable('catalogsearch_result')), null); - $select->exists($subSelect, 'res.query_id=' . $this->getTable('catalogsearch_query') . '.query_id', false); + $select->exists($subSelect, 'res.query_id=' . $this->getTable('search_query') . '.query_id', false); $adapter->update( - $this->getTable('catalogsearch_query'), + $this->getTable('search_query'), array('is_processed' => 0), $select->getPart(\Zend_Db_Select::WHERE) ); @@ -138,7 +140,7 @@ class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb * * @param \Magento\CatalogSearch\Model\Fulltext $object * @param string $queryText - * @param \Magento\CatalogSearch\Model\Query $query + * @param \Magento\Search\Model\Query $query * @return $this */ public function prepareResult($object, $queryText, $query) diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php index c8856a0521babd88d7e089ae49d860c0c834f2c4..5ba27c635f0ace68e28ca07fc217b57257f3a127 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php @@ -33,9 +33,9 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection /** * Catalog search data * - * @var \Magento\CatalogSearch\Helper\Data + * @var \Magento\Search\Model\QueryFactory */ - protected $_catalogSearchData = null; + protected $queryFactory = null; /** * Catalog search fulltext @@ -63,7 +63,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate * @param \Magento\Customer\Model\Session $customerSession * @param \Magento\Framework\Stdlib\DateTime $dateTime - * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData + * @param \Magento\Search\Model\QueryFactory $catalogSearchData * @param \Magento\CatalogSearch\Model\Fulltext $catalogSearchFulltext * @param \Zend_Db_Adapter_Abstract $connection * @@ -88,12 +88,12 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate, \Magento\Customer\Model\Session $customerSession, \Magento\Framework\Stdlib\DateTime $dateTime, - \Magento\CatalogSearch\Helper\Data $catalogSearchData, + \Magento\Search\Model\QueryFactory $catalogSearchData, \Magento\CatalogSearch\Model\Fulltext $catalogSearchFulltext, $connection = null ) { $this->_catalogSearchFulltext = $catalogSearchFulltext; - $this->_catalogSearchData = $catalogSearchData; + $this->queryFactory = $catalogSearchData; parent::__construct( $entityFactory, $logger, @@ -120,11 +120,11 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection /** * Retrieve query model object * - * @return \Magento\CatalogSearch\Model\Query + * @return \Magento\Search\Model\Query */ protected function _getQuery() { - return $this->_catalogSearchData->getQuery(); + return $this->queryFactory->get(); } /** diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Engine.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Engine.php index 2f779dd844078cb10804673ec6ae406631f1379f..2fc9920847e1229d9d2636afb8fe2766cf14deb5 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Engine.php @@ -74,7 +74,7 @@ class Engine extends AbstractDb implements EngineInterface /** * Catalog search data * - * @var \Magento\CatalogSearch\Model\Resource\Helper + * @var \Magento\Search\Model\Resource\Helper */ protected $_resourceHelper; @@ -88,7 +88,7 @@ class Engine extends AbstractDb implements EngineInterface * @param \Magento\CatalogSearch\Model\Resource\Advanced $searchResource * @param \Magento\CatalogSearch\Model\Resource\Advanced\Collection $searchResourceCollection * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData - * @param \Magento\CatalogSearch\Model\Resource\Helper $resourceHelper + * @param \Magento\Search\Model\Resource\Helper $resourceHelper */ public function __construct( \Magento\Framework\App\Resource $resource, @@ -98,7 +98,7 @@ class Engine extends AbstractDb implements EngineInterface \Magento\CatalogSearch\Model\Resource\Advanced $searchResource, \Magento\CatalogSearch\Model\Resource\Advanced\Collection $searchResourceCollection, \Magento\CatalogSearch\Helper\Data $catalogSearchData, - \Magento\CatalogSearch\Model\Resource\Helper $resourceHelper + \Magento\Search\Model\Resource\Helper $resourceHelper ) { $this->_catalogSearchAdvancedCollectionFactory = $catalogSearchAdvancedCollectionFactory; $this->_catalogSearchFulltextCollectionFactory = $catalogSearchFulltextCollectionFactory; diff --git a/app/code/Magento/Backend/Model/Search/Catalog.php b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php similarity index 86% rename from app/code/Magento/Backend/Model/Search/Catalog.php rename to app/code/Magento/CatalogSearch/Model/Search/Catalog.php index 2a63c068e96f7c7bbfc6742825171810862ccca4..ecffab8fd6eecae12da18b3a22077bef47dac236 100644 --- a/app/code/Magento/Backend/Model/Search/Catalog.php +++ b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php @@ -21,7 +21,9 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Backend\Model\Search; +namespace Magento\CatalogSearch\Model\Search; + +use Magento\Search\Model\QueryFactory; /** * Search Catalog Model @@ -31,9 +33,9 @@ class Catalog extends \Magento\Framework\Object /** * Catalog search data * - * @var \Magento\CatalogSearch\Helper\Data + * @var \Magento\Search\Model\QueryFactory */ - protected $_catalogSearchData = null; + protected $queryFactory = null; /** * Magento string lib @@ -52,16 +54,16 @@ class Catalog extends \Magento\Framework\Object /** * @param \Magento\Backend\Helper\Data $adminhtmlData * @param \Magento\Framework\Stdlib\String $string - * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData + * @param QueryFactory $queryFactory */ public function __construct( \Magento\Backend\Helper\Data $adminhtmlData, \Magento\Framework\Stdlib\String $string, - \Magento\CatalogSearch\Helper\Data $catalogSearchData + QueryFactory $queryFactory ) { $this->_adminhtmlData = $adminhtmlData; $this->string = $string; - $this->_catalogSearchData = $catalogSearchData; + $this->queryFactory = $queryFactory; } /** @@ -77,7 +79,7 @@ class Catalog extends \Magento\Framework\Object return $this; } - $collection = $this->_catalogSearchData->getQuery()->getSearchCollection()->addAttributeToSelect( + $collection = $this->queryFactory->get()->getSearchCollection()->addAttributeToSelect( 'name' )->addAttributeToSelect( 'description' diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Search/CatalogTest.php b/app/code/Magento/CatalogSearch/Model/Search/CatalogTest.php similarity index 88% rename from dev/tests/integration/testsuite/Magento/Backend/Model/Search/CatalogTest.php rename to app/code/Magento/CatalogSearch/Model/Search/CatalogTest.php index 56fa09f348cbb40d14b50eb9f14fc69e600a444b..ec5fe3bc22e5db06203fc64875e88defce9556a5 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Model/Search/CatalogTest.php +++ b/app/code/Magento/CatalogSearch/Model/Search/CatalogTest.php @@ -22,26 +22,26 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Backend\Model\Search; - -use Magento\TestFramework\Helper\Bootstrap; +namespace Magento\CatalogSearch\Model\Search; /** * @magentoAppArea adminhtml */ class CatalogTest extends \PHPUnit_Framework_TestCase { - /** @var \Magento\Backend\Model\Search\Catalog */ + /** @var \Magento\CatalogSearch\Model\Search\Catalog */ protected $catalogSearch; protected function setUp() { $this->catalogSearch = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('\Magento\Backend\Model\Search\Catalog'); + ->create('\Magento\CatalogSearch\Model\Search\Catalog'); } /** * Dataprovider for testLoad + * + * @return array */ public function dataProviderForTestLoad() { @@ -57,6 +57,10 @@ class CatalogTest extends \PHPUnit_Framework_TestCase * @dataProvider dataProviderForTestLoad * @magentoDbIsolation enabled * @magentoDataFixture Magento/Catalog/_files/product_simple_multistore.php + * + * @param string $viewName + * @param bool $expectedResult + * @return void */ public function testLoad($viewName, $expectedResult) { diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index e976256674b51393015426f7d3f7b58abd71c1b3..9e8a119d34dd9b8e881e4220ddbac4c5d92f89d3 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -3,20 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-search": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogSearch/etc/config.xml b/app/code/Magento/CatalogSearch/etc/config.xml index fdaf6f48e2f42c1331af42d9eed1c14e42d59492..0f2d1204710b6df24ba19fa45e561b7dc127557c 100644 --- a/app/code/Magento/CatalogSearch/etc/config.xml +++ b/app/code/Magento/CatalogSearch/etc/config.xml @@ -30,6 +30,7 @@ <search_terms>1</search_terms> </seo> <search> + <engine>Magento\CatalogSearch\Model\Resource\Fulltext\Engine</engine> <min_query_length>1</min_query_length> <max_query_length>128</max_query_length> <max_query_words>10</max_query_words> diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml index f1cfc63c177d5242ee9821c4174f938044348c8e..a354a4153f42cfe48ce4e71391219d6c06fb27d5 100644 --- a/app/code/Magento/CatalogSearch/etc/di.xml +++ b/app/code/Magento/CatalogSearch/etc/di.xml @@ -24,6 +24,14 @@ */ --> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd"> + <preference for="Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface" type="Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider"/> + <type name="Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer"> + <arguments> + <argument name="dataProviders" xsi:type="array"> + <item name="catalogsearch_fulltext" xsi:type="object">Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider</item> + </argument> + </arguments> + </type> <type name="Magento\Framework\Module\Setup\Migration"> <arguments> <argument name="compositeModules" xsi:type="array"> @@ -69,10 +77,35 @@ </virtualType> <type name="Magento\Framework\Search\Adapter\Mysql\DocumentFactory"> <arguments> - <argument name="entityId" xsi:type="object">Magento\Framework\Search\ProductEntityMetadata</argument> + <argument name="entityMetadata" xsi:type="object">Magento\Framework\Search\ProductEntityMetadata</argument> + </arguments> + </type> + <type name="Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder"> + <arguments> + <argument name="entityMetadata" xsi:type="object">Magento\Framework\Search\ProductEntityMetadata</argument> </arguments> </type> <type name="Magento\Framework\Search\Request\Config\FilesystemReader"> <plugin name="catalogSearchDynamicFields" type="Magento\CatalogSearch\Model\Search\ReaderPlugin" /> </type> + <type name="Magento\Framework\Search\Dynamic\IntervalFactory"> + <arguments> + <argument name="configPath" xsi:type="const">\Magento\CatalogSearch\Model\Resource\EngineProvider::CONFIG_ENGINE_PATH</argument> + <argument name="intervals" xsi:type="array"> + <item name="Magento\CatalogSearch\Model\Resource\Fulltext\Engine" xsi:type="string">Magento\CatalogSearch\Model\Price\Interval</item> + </argument> + <argument name="scope" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument> + </arguments> + </type> + <type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch"> + <arguments> + <argument name="searchModules" xsi:type="array"> + <item name="products" xsi:type="array"> + <item name="class" xsi:type="string">Magento\CatalogSearch\Model\Search\Catalog</item> + <item name="acl" xsi:type="string">Magento_Catalog::catalog</item> + </item> + </argument> + </arguments> + </type> + <preference for="Magento\Search\Model\SearchCollectionInterface" type="Magento\CatalogSearch\Model\Resource\Search\Collection" /> </config> diff --git a/app/code/Magento/CatalogSearch/etc/frontend/page_types.xml b/app/code/Magento/CatalogSearch/etc/frontend/page_types.xml index 8a7900d73032ac9ee5d243ae5d80a506bee32a60..fdf569d0fc14a070d416c843a9f5a5cbd75cecd1 100644 --- a/app/code/Magento/CatalogSearch/etc/frontend/page_types.xml +++ b/app/code/Magento/CatalogSearch/etc/frontend/page_types.xml @@ -27,5 +27,4 @@ <type id="catalogsearch_advanced_index" label="Advanced Search Form"/> <type id="catalogsearch_advanced_result" label="Advanced Search Result"/> <type id="catalogsearch_result_index" label="Quick Search Form"/> - <type id="catalogsearch_term_popular" label="Popular Search Terms"/> </page_types> diff --git a/app/code/Magento/CatalogSearch/etc/module.xml b/app/code/Magento/CatalogSearch/etc/module.xml index a52085a6f433b4b91076d619d1e0482983c929dd..4724d56d6f4d632c12ce6178ee948c10c69cb965 100644 --- a/app/code/Magento/CatalogSearch/etc/module.xml +++ b/app/code/Magento/CatalogSearch/etc/module.xml @@ -26,11 +26,13 @@ <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"> <module name="Magento_CatalogSearch" schema_version="1.6.0.0" active="true"> <sequence> + <module name="Magento_Search"/> <module name="Magento_Catalog"/> </sequence> <depends> <module name="Magento_Store"/> <module name="Magento_Catalog"/> + <module name="Magento_Search"/> <module name="Magento_Customer"/> <module name="Magento_Core"/> <module name="Magento_Directory"/> diff --git a/app/code/Magento/CatalogSearch/etc/search_request.xml b/app/code/Magento/CatalogSearch/etc/search_request.xml index ebb1d50ac8945e72e778ea4ef75d6ee6906cd770..b23b1bb90db5570231ddf84b08774462f2755e7d 100644 --- a/app/code/Magento/CatalogSearch/etc/search_request.xml +++ b/app/code/Magento/CatalogSearch/etc/search_request.xml @@ -52,10 +52,10 @@ <queryReference clause="should" ref="price_query" /> </query> <query name="sku_query" xsi:type="filteredQuery"> - <filterReference ref="sku_query_filter" /> + <filterReference clause="must" ref="sku_query_filter" /> </query> <query name="price_query" xsi:type="filteredQuery"> - <filterReference ref="price_query_filter" /> + <filterReference clause="must" ref="price_query_filter" /> </query> </queries> <filters> diff --git a/app/code/Magento/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php b/app/code/Magento/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php index 26d99fb4ba96c8bb4e875d409ab7e7ed129646e6..89b2b8fe34fd24d9f9c1986d4e64e536bc0c72c9 100644 --- a/app/code/Magento/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php +++ b/app/code/Magento/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php @@ -27,95 +27,6 @@ $installer = $this; $installer->startSetup(); -/** - * Create table 'catalogsearch_query' - */ -$table = $installer->getConnection()->newTable( - $installer->getTable('catalogsearch_query') -)->addColumn( - 'query_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true), - 'Query ID' -)->addColumn( - 'query_text', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - array(), - 'Query text' -)->addColumn( - 'num_results', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - array('unsigned' => true, 'nullable' => false, 'default' => '0'), - 'Num results' -)->addColumn( - 'popularity', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - array('unsigned' => true, 'nullable' => false, 'default' => '0'), - 'Popularity' -)->addColumn( - 'redirect', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - array(), - 'Redirect' -)->addColumn( - 'synonym_for', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - array(), - 'Synonym for' -)->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - array('unsigned' => true, 'nullable' => false, 'default' => '0'), - 'Store ID' -)->addColumn( - 'display_in_terms', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - array('nullable' => false, 'default' => '1'), - 'Display in terms' -)->addColumn( - 'is_active', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - array('default' => '1'), - 'Active status' -)->addColumn( - 'is_processed', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - array('default' => '0'), - 'Processed status' -)->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - array('nullable' => false), - 'Updated at' -)->addIndex( - $installer->getIdxName('catalogsearch_query', array('query_text', 'store_id', 'popularity')), - array('query_text', 'store_id', 'popularity') -)->addIndex( - $installer->getIdxName('catalogsearch_query', 'store_id'), - 'store_id' -)->addForeignKey( - $installer->getFkName('catalogsearch_query', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE -)->setComment( - 'Catalog search query table' -); -$installer->getConnection()->createTable($table); - /** * Create table 'catalogsearch_result' */ @@ -140,9 +51,9 @@ $table = $installer->getConnection()->newTable( array('nullable' => false, 'default' => '0.0000'), 'Relevance' )->addForeignKey( - $installer->getFkName('catalogsearch_result', 'query_id', 'catalogsearch_query', 'query_id'), + $installer->getFkName('catalogsearch_result', 'query_id', 'search_query', 'query_id'), 'query_id', - $installer->getTable('catalogsearch_query'), + $installer->getTable('search_query'), 'query_id', \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml index 6509820bcc06e949398fe56928f42a33f3236604..0ba5c0450a3c9f962861f3c4ac7ab9c8259425f5 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml +++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Advanced Search</title> </head> diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml index b640d14743c88de3b0d3880e5ddeae5ca63494a6..9561d10175a03b9ff6ea2973c59b41fa89b223ea 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="class" value="page-products"/> </body> diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml index f5862aa548d348a38eaa31fe3401dcb6cd5617f9..31345ce122fa6cc257118458e6cbf332232964e4 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="class" value="page-products"/> </body> diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/default.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/default.xml index 853a6600d788071037044b4bb8385bc0b1dc4588..f03975c85616003b71af5b0e3a3d2aa09d8ab983 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/default.xml +++ b/app/code/Magento/CatalogSearch/view/frontend/layout/default.xml @@ -23,17 +23,11 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> - <referenceContainer name="header-wrapper"> - <block class="Magento\Framework\View\Element\Template" name="top.search" as="topSearch" template="Magento_CatalogSearch::form.mini.phtml"/> - </referenceContainer> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <referenceBlock name="top.search"> + <block class="Magento\Framework\View\Element\Template" name="advanced-search-link" template="Magento_CatalogSearch::advanced/link.phtml" /> + </referenceBlock> <referenceBlock name="footer_links"> - <block class="Magento\Framework\View\Element\Html\Link\Current" ifconfig="catalog/seo/search_terms" name="catalog-search-term-popular-link"> - <arguments> - <argument name="label" xsi:type="string">Search Terms</argument> - <argument name="path" xsi:type="string">catalogsearch/term/popular</argument> - </arguments> - </block> <block class="Magento\Framework\View\Element\Html\Link\Current" name="catalog-search-advanced-link"> <arguments> <argument name="label" xsi:type="string">Advanced Search</argument> diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml new file mode 100644 index 0000000000000000000000000000000000000000..2c4fc6b222f8e9651abd15ac68a884c2d59e5888 --- /dev/null +++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml @@ -0,0 +1,31 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ + /** @var \Magento\CatalogSearch\Helper\Data $helper */ +$helper = $this->helper('Magento\CatalogSearch\Helper\Data'); +?> +<div class="nested"> + <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>"> + <?php echo __('Advanced Search'); ?> + </a> +</div> \ No newline at end of file diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index c1c1912ef7eeb4c663d4ee059b901242e5302834..569f5854fd4bf03cc3193786589cf5473cb45099 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-import-export": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-url-rewrite": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-import-export": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-url-rewrite": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogUrlRewrite/data/catalogurlrewrite_setup/data-install-1.0.0.0.php b/app/code/Magento/CatalogUrlRewrite/data/catalogurlrewrite_setup/data-install-1.0.0.0.php index 3f96decf0e1bd71d64232819ba7ea2ebff529cba..7a51d3f0190f236f7b65b09ebddac52dd2369b8d 100644 --- a/app/code/Magento/CatalogUrlRewrite/data/catalogurlrewrite_setup/data-install-1.0.0.0.php +++ b/app/code/Magento/CatalogUrlRewrite/data/catalogurlrewrite_setup/data-install-1.0.0.0.php @@ -32,7 +32,7 @@ $this->addAttribute( 'required' => false, 'sort_order' => 3, 'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE, - 'group' => 'General Information' + 'group' => 'General Information', ) ); @@ -45,6 +45,7 @@ $this->addAttribute( 'sort_order' => 17, 'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE, 'visible' => false, + 'group' => 'General Information', ) ); @@ -59,7 +60,7 @@ $this->addAttribute( 'sort_order' => 10, 'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE, 'used_in_product_listing' => true, - 'group' => 'Search Engine Optimization' + 'group' => 'Search Engine Optimization', ) ); diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json index f9e19a28ff953022b9a85249a685a85545168dfe..b719072f46676c568a4bc4a5041371538bd0e5cf 100644 --- a/app/code/Magento/Centinel/composer.json +++ b/app/code/Magento/Centinel/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationcomplete.xml b/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationcomplete.xml index d650192c0b2f99024565b2fe159229c0dbfb102b..ebbc78f6b31cbda38de804b7f206ee5e96bb89e2 100644 --- a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationcomplete.xml +++ b/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationcomplete.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Centinel\Block\Authentication\Complete" name="page.block" template="authentication/complete.phtml"/> </container> diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationstart.xml b/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationstart.xml index 1341a5df8c330bc8460017dd31e282b70f0ed945..652bcd0136c346d2249c74d87caf32bbf224f57e 100644 --- a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationstart.xml +++ b/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_centinel_index_authenticationstart.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Centinel\Block\Authentication\Start" name="page.block" template="authentication/start.phtml"/> </container> diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml index 6833b9424b1c88e21cd10ab250031c70109924bc..dd4c09f2ad6635ec3a905ffb03a168a1253b791f 100644 --- a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml +++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="data"> <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="order/create/abstract.phtml"> <block class="Magento\Centinel\Block\Adminhtml\Validation\Form" template="validation/form.phtml" name="centinel.validation.form" as="form"/> diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml index 615777f8d69b00ca004a3fc5780b54c937d0deb6..29f54a161feb8b4eae0246b8b11c752cfb11d2bc 100644 --- a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml +++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="order/create/abstract.phtml"> <block class="Magento\Centinel\Block\Adminhtml\Validation\Form" template="validation/form.phtml" name="form"/> diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml index 5aa24fbcaabd63cc8bcc102054a16cf339370d40..28c853b56d8f27dd3242df7c04d99a159e7140dc 100644 --- a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml +++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="data"> <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="order/create/abstract.phtml"> <block class="Magento\Centinel\Block\Adminhtml\Validation\Form" template="validation/form.phtml" name="form"/> diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml index ca66e4cc0d4efef7407d2d5db675d7fd978acf19..2d23bfc62c38150df16ba69ff28d2b8a7a19a6f7 100644 --- a/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml +++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_create_index"/> </page> diff --git a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml index e1d2e20199b97b76fd81b400cc3acd4c75ae4204..df32351a280bf82fe40c056233b5f4615fed9ff8 100644 --- a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml +++ b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Centinel\Block\Authentication\Complete" name="page.block" template="authentication/complete.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml index 498e5bc44c7ace73f3bce7702457ad64215a0c51..0c3753376c2866e0ed55938e2845d5105ca493cd 100644 --- a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml +++ b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Centinel\Block\Authentication\Start" name="page.block" template="authentication/start.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Centinel/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Centinel/view/frontend/layout/checkout_onepage_review.xml index 0bc96a1832560d9c314a9e3134231da9ef6c0910..8ea8d0eec63f824faf715c9667a5b9dd3e10f47a 100644 --- a/app/code/Magento/Centinel/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/Centinel/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="checkout.onepage.review.info.items.before"> <block class="Magento\Centinel\Block\Authentication" name="centinel.frame" template="authentication.phtml"> <action method="setAuthenticationStartMode"> diff --git a/app/code/Magento/Centinel/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Centinel/view/frontend/layout/multishipping_checkout_overview.xml index 6e1f31ba7e7beaa3e5675c3877eabc13b8978ea6..3d41f0ec3221ad276eb200d7af330365cc7c3f13 100644 --- a/app/code/Magento/Centinel/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/Centinel/view/frontend/layout/multishipping_checkout_overview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="checkout.multishipping.overview.items.after"> <block class="Magento\Centinel\Block\Authentication" name="centinel.frame" template="authentication.phtml"> <action method="setAuthenticationStartMode"> diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index f5bbda4fc26a1ec59f1c936e5a8f318e49901967..5b08a9247eedc6eb1483a24d93707c02efd9a139 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-authorization": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-gift-message": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-page-cache": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-msrp": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-gift-message": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-msrp": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Checkout/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Checkout/view/frontend/layout/catalog_category_view.xml index 4158d196a2f2ab17815b102a3ee882bb849bb8f0..3414da599bd405543ace21dfffba693745bb26af 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/catalog_category_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml"> <arguments> diff --git a/app/code/Magento/Checkout/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Checkout/view/frontend/layout/catalog_product_view.xml index 4158d196a2f2ab17815b102a3ee882bb849bb8f0..3414da599bd405543ace21dfffba693745bb26af 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml"> <arguments> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml index 26481bf3057e70fab00dd59fb2fd65d6911f25cf..0bcfbcb229a06be7092fd53246f721a4a638bb26 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view"/> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="checkout_cart_configure_head_components" template="Magento_Checkout::js/components.phtml"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml index 6161961da9123158a46238552a7cf2514843987d..72cf09370b8acdf4318e1fc504bc53993c82ffac 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view_type_simple"/> </page> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml index 25fb62bcbdce0cab6763aa63a02f416e0f234921..db64978132a9b4881e3e847c101594af023efeaa 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_cart_item_renderers" /> <update handle="checkout_shipping_price_renderer" /> <referenceContainer name="content"> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml index c07552a1333c5116856d17a8438fb2a13d26c04c..a94778300f460c341eb91ebc8a46412eaff4d4c9 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_item_price_renderers" /> <referenceBlock name="checkout.cart.item.renderers"> <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="cart/item/default.phtml"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml index 11bd9ae0988551db70a849f663847e3250b48008..38b868258bd87029479d4b57ec055d284df212ad 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="minicart"> <block class="Magento\Checkout\Block\Item\Price\Renderer" name="checkout.cart.item.price.sidebar" template="cart/item/price/sidebar.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index a0cd740e503a92f7dc7bdaaea5b69df5be6e140a..099528659eca9d4d03ea5529f6e54751683eec52 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.sidebar.item.renderers"> <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="cart/sidebar/default.phtml"/> <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="simple" template="cart/sidebar/default.phtml"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml index d7ae863b2604fe9c32f7fce5364193d3b5cfddc4..c294cb1f9ac0c39deea70b4e3df452237dc7be56 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="minicart"> <block class="Magento\Checkout\Block\Cart\Sidebar" name="checkout.cart.minicart.totals" template="cart/minicart/totals.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_item_price_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_item_price_renderers.xml index c3e3670fe1eca401b38b2aa54a6152becd8f01ac..d71cadfb6ddbce2eb69556f392bbb13da7620494 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_item_price_renderers.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_item_price_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Checkout\Block\Item\Price\Renderer" name="checkout.item.price.unit" template="item/price/unit.phtml"/> <block class="Magento\Checkout\Block\Item\Price\Renderer" name="checkout.item.price.row" template="item/price/row.phtml"/> <block class="Magento\Checkout\Block\Item\Price\Renderer" name="checkout.onepage.review.item.price.unit.excl" template="onepage/review/item/price/unit_excl_tax.phtml"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml index 8f736a376d74fcb24626480c58f80ccaf3c6c728..ee4479cd77524d2cfad1586bbca7a211b33ef0c7 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="shipping_method_additional" template="onepage/shipping_method/additional.phtml"> <arguments> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml index 202c4989e340eaf3a9ffea0eac19642b3521bbca..d709bb50021a1c03e9687b0ea4b6c54bb80990b0 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="page.main.title"> <action method="setPageTitle"> <argument translate="true" name="title" xsi:type="string">Your order has been received.</argument> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml index b1c0c6fc979b9ef10e3c8b160ca5f87396086d46..ef46975f196c17f249ab50ec05e847d8264bb78f 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_shipping_price_renderer" /> <referenceContainer name="content"> <block class="Magento\Checkout\Block\Onepage" name="checkout.onepage" template="onepage.phtml"> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml index 160910287db5aa09a5a8ec5f04d1c24b2a0b9850..4952ab1ab8a67127103d05091f7c9a68812243ff 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Checkout\Block\Onepage\Payment\Methods" name="payment_method" template="onepage/payment/methods.phtml" cacheable="false"> <block class="Magento\Framework\View\Element\Template" name="checkout.onepage.payment.methods.scripts" as="scripts"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml index 5e4e12042e0b668a61e7b770b5da742512c63887..e70609d9c787486c59aec00400def929ab9d3d90 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="checkout_shipping_price_renderer" /> <container name="root"> <block class="Magento\Checkout\Block\Onepage\Progress" name="progress" template="onepage/progress.phtml"> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml index b42358c743d357999d86a3e2de95ee53d8247c0b..d0353cbfa365b2fc87b70efc8459fd7b0475800c 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="checkout_onepage_review_item_renderers"/> <container name="root"> <block class="Magento\Checkout\Block\Onepage\Review\Info" name="order_review" template="onepage/review/info.phtml"> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review_item_renderers.xml index 5cc06c2e7ee893cb8fb4a55f9f2123d7f9318418..d8583c588f8bbdc086f138383c9cc7df89c2455c 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_item_price_renderers" /> <referenceBlock name="checkout.onepage.review.item.renderers"> <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml index f6239ab9ab05322da1f17848d656fb99bce952a5..7ce8ecf569a103791b692eea60205a46e0cef02e 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="checkout_shipping_price_renderer" /> <container name="root"> <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Available" name="shipping_method" template="onepage/shipping_method/available.phtml"/> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml index b3bc14ca22b2a7324977db8df05ebb09f8e77fa7..98b5265bd346abf57a1609f38a8036b36eb1663c 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="page.main.title"> <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="button.phtml"/> <action method="setPageTitle"> diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_shipping_price_renderer.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_shipping_price_renderer.xml index d339288bda7c8276e3e2c16a5ad370d0f6c91b3b..7a15a498ac93c2ad482e23d128953bf150c05989 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/checkout_shipping_price_renderer.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_shipping_price_renderer.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Checkout\Block\Shipping\Price" name="checkout.shipping.price" as="shipping.price" template="shipping/price.phtml"/> </container> diff --git a/app/code/Magento/Checkout/view/frontend/layout/default.xml b/app/code/Magento/Checkout/view/frontend/layout/default.xml index a006c4df8299c586cb1e50d6ee8844cd09bff114..9a4fbdd92c1f7ddb6622c540b6bc3333b1f1ef58 100644 --- a/app/code/Magento/Checkout/view/frontend/layout/default.xml +++ b/app/code/Magento/Checkout/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_cart_sidebar_item_renderers" /> <update handle="checkout_cart_sidebar_item_price_renderers" /> <update handle="checkout_cart_sidebar_total_renderers" /> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml index 14f01d2cf9d76cc093f7ecc680119bdcf832d3a1..8b0f31e2dbabe572bc21fba270116443e69dc339 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml @@ -49,7 +49,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima <?php endif; ?> </strong> <?php if ($_options = $this->getOptionList()):?> - <dl class="cart-item-options"> + <dl class="item-options"> <?php foreach ($_options as $_option) : ?> <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?> <dt><?php echo $this->escapeHtml($_option['label']) ?></dt> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml index 9bdb695caaf981f92a5d417c4954e30ec40d5498..a3425177d2a5a87d62e10e4c5699acbbb45cb87d 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml @@ -21,6 +21,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ + /** @var $this \Magento\Checkout\Block\Cart\Sidebar */ ?> <?php if ($this->getInList()): ?> @@ -45,26 +46,10 @@ </strong> </div> <div class="content"> - <?php $_items = $this->getRecentItems() ?> - <?php if (count($_items)): ?> - <strong class="subtitle"><?php echo __('Recently added item(s)') ?></strong> - <div data-action="scroll" class="products minilist"> - <ol id="mini-cart" class="minilist items"> - <?php foreach ($_items as $_item): ?> - <?php echo $this->getItemHtml($_item) ?> - <?php endforeach; ?> - </ol> - </div> - <?php else: ?> - <strong class="subtitle empty"> - <?php echo __('You have no items in your shopping cart.') ?> - </strong> - <?php if ($this->getCartEmptyMessage()): ?> - <p class="minicart empty text"><?php echo $this->getCartEmptyMessage(); ?></p> - <?php endif; ?> - <?php endif ?> - <?php if ($_cartQty || $this->getAllowCartLink()): ?> + <div class="items-total"> + <?php echo ($_cartQty == 1) ? __('1 item ') : __('%1 items ', $_cartQty) ?> + </div> <?php $isPossibleOnepageCheckout = $_cartQty && $this->isPossibleOnepageCheckout() ?> <?php if ($isPossibleOnepageCheckout): ?> <?php echo $this->getChildHtml('subtotal'); ?> @@ -73,39 +58,54 @@ <div class="actions"> <div class="primary"> <?php if ($isPossibleOnepageCheckout): ?> - <?php echo $this->getChildHtml('extra_actions') ?> <button id="top-cart-btn-checkout" type="button" class="action checkout primary" - title="<?php echo __('Checkout') ?>"> - <span><?php echo __('Checkout') ?></span> + title="<?php echo __('Go to Checkout') ?>"> + <span><?php echo __('Go to Checkout') ?></span> </button> + <?php echo $this->getChildHtml('extra_actions') ?> <?php endif; ?> </div> <div class="secondary"> <a class="action viewcart" href="<?php echo $this->getUrl('checkout/cart'); ?>"> - <span><?php echo __('View cart') ?></span> + <span><?php echo __('Go to Shopping Cart') ?></span> </a> </div> </div> <?php endif ?> + <?php $_items = $this->getRecentItems() ?> + <?php if (count($_items)): ?> + <strong class="subtitle"><?php echo __('Recently added item(s)') ?></strong> + <div data-action="scroll" class="products minilist"> + <ol id="mini-cart" class="minilist items"> + <?php foreach ($_items as $_item): ?> + <?php echo $this->getItemHtml($_item) ?> + <?php endforeach; ?> + </ol> + </div> + <?php else: ?> + <strong class="subtitle empty"> + <?php echo __('You have no items in your shopping cart.') ?> + </strong> + <?php if ($this->getCartEmptyMessage()): ?> + <p class="minicart empty text"><?php echo $this->getCartEmptyMessage(); ?></p> + <?php endif; ?> + <?php endif ?> </div> </div> <?php endif ?> <?php endif; ?> <script type="text/javascript"> -require([ - "jquery", - "mage/mage" -], function($){ - $('[data-block="minicart"]').mage('sidebar',{ + (function($) { + $('[data-block="minicart"]').mage('sidebar', { checkoutUrl: '<?php echo $this->getCheckoutUrl();?>', checkoutButton: '#top-cart-btn-checkout', removeButton: '#mini-cart a.action.delete', confirmMessage: '<?php echo __('Are you sure you would like to remove this item from the shopping cart?') ?>' }); -}); + })(jQuery); </script> <?php if ($this->getInList()): ?> </li> diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml index ce95274d4ef257d2178e7e949a5263c60f90c678..7f09e6c36ec9fb7749ec25dd50f824ba0a7a949a 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml @@ -27,9 +27,9 @@ $_item = $this->getItem(); ?> <tr> - <td class="col item" data-th="<?php echo $this->escapeHtml(__('Product Name'));?>"><strong class="product name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong> + <td class="col item" data-th="<?php echo $this->escapeHtml(__('Product Name'));?>"><strong class="product name product-item-name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong> <?php if ($_options = $this->getOptionList()):?> - <dl class="review-item-options"> + <dl class="item-options"> <?php foreach ($_options as $_option) : ?> <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?> <dt><?php echo $this->escapeHtml($_option['label']) ?></dt> diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 83c52cd325b9ddc5626007d508d46b55d74d9574..5c8fab2b69cd0b609965fdba784c7b6dc5722364 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml index 98e8901bffee327341d66fc04793a161fc881815..2b82e637e57ef5585dd0bb87ae10e05b99122c4f 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_review"> <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.onepage.agreements" as="agreements" template="agreements.phtml"/> </referenceBlock> diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml index 915cabf185ddf835fd4e11a5fde811c25905ce16..4e0eef6b396f447671cd9e10a421d98204caf590 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout_overview"> <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="multishipping_agreements.phtml" /> </referenceBlock> diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml index c221177ac6dfc86dd427bff90f805bf315683d1a..e2c1fea67e04fc63d9ed409526c3f076b8c5e2ee 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="paypal.express.review"> <block class="Magento\CheckoutAgreements\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="agreements.phtml" /> </referenceBlock> diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml index c221177ac6dfc86dd427bff90f805bf315683d1a..e2c1fea67e04fc63d9ed409526c3f076b8c5e2ee 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="paypal.express.review"> <block class="Magento\CheckoutAgreements\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="agreements.phtml" /> </referenceBlock> diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index 49ffbcf4fa66c6c03a6508680a9fcd61ac439ae6..40f67d3f187d30ec8227e1badc3ba6f6f45cc159 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-email": "0.1.0-alpha98", - "magento/module-ui": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-email": "0.1.0-alpha99", + "magento/module-ui": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml index ffce5673a3443b5afa8894ff4ea2f4600e74211e..957342f77380898e1443e4d388b8db005757a14e 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml index 6439c07fd168679fc38e224875a13dadd7dc5070..e9e74c3dd24cf3178ad9df9e742d71c63cf1b20d 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <ui_component name="cms_block_listing" component="listing" /> </referenceContainer> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml index 4c9f1a309ee99bd89f32e9a12feee22a44a6c0e9..29bb9e9f047329138499c7fb5562685d24c6e353 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="listing"> <arguments> <argument name="name" xsi:type="string">cms_block_listing</argument> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml index 01ca2f6dc4f204e3b27414d882e610397eb9cdb1..618ce5c81b9c96a340e27145dff7066486a5ce5b 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="cms_block_edit"/> </page> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml index ecfc23280d6dfcb548120a043fa52fa81bec1ee9..bf3d34736470d9c6a369256b8b6f65b2b57859d3 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> <link src="jquery/fileUploader/bootstrap.js"/> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml index bfe3daab138c36c4f0186e3e13d6fefcb9e52886..56397a6e711b76d1d59121439db7bff71bbff7c1 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <ui_component name="cms_page_listing" component="listing" /> </referenceContainer> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml index 7dedb50ab33b88fd22f26145fa1aa3685a37ac25..21b2d0cd9871e72bab2e103adc2a2f434e88d8a7 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <referenceBlock name="listing"> <arguments> <argument name="name" xsi:type="string">cms_page_listing</argument> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml index 98b741cc5da044cef1a124c2ff89612c3917e2b8..369394cdf3c139cfdb3fbf234501fb5181d9015c 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="cms_page_edit"/> </page> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml index 718e5353d60a662809728110b79795ace5dae6aa..ad6220813a64c69a31bc788b7a1c649d857f3b37 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files" name="wysiwyg_images.files" template="browser/content/files.phtml"/> </container> diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml index f2f91a1955d736d0b8a83d6d6241067a339e49ab..d3dcb3de1e87a8b79e9f4d0dd74b4f4690907575 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="footer"/> <remove name="left"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml index 9de082fb7429278bb6ab7bd7dd2b3e6ad767ad84..d51e83b6d36626e5bb451e13422d5c32532b7fd7 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Framework\View\Element\Template" name="default_home_page" template="Magento_Cms::default/home.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml index 6f358ae111abc63e8d0b990338bdde7b973fbc78..07909c50537ab4f6d2355ff8371f280177c2157d 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Framework\View\Element\Template" name="default_no_route" template="Magento_Cms::default/no-route.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml b/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml index b665dcf4f6408411b5d2fab12f17dd7a9769a6b9..bede1914e156a8bad458219da02aa44abab7655c 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Cms\Block\Page" name="cms_page"/> </referenceContainer> diff --git a/app/code/Magento/Cms/view/frontend/layout/default.xml b/app/code/Magento/Cms/view/frontend/layout/default.xml index 2680f611724a8e07476e06213389cafec2ca5e6d..ddfc2668cb3f6522e1d5ab3662a9f9b7281ead82 100644 --- a/app/code/Magento/Cms/view/frontend/layout/default.xml +++ b/app/code/Magento/Cms/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="footer"> <container name="cms_footer_links_container" label="CMS Footer Links" htmlTag="div" htmlClass="links" before="footer_links"> <block class="Magento\Cms\Block\Block" name="cms_footer_links"> diff --git a/app/code/Magento/Cms/view/frontend/layout/print.xml b/app/code/Magento/Cms/view/frontend/layout/print.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Cms/view/frontend/layout/print.xml +++ b/app/code/Magento/Cms/view/frontend/layout/print.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 0817b25e54b151545e4ea5911de385c30de25981..0b9eb21309d7d5db5b9721eb7d7580ee73b252f4 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-url-rewrite": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-url-rewrite": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 60a4cb8ee0a1f0c57924e16f9d0c6c027499389b..ff6273fb6cbbe1700ee429f691b306595a7696ec 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-import-export": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-configurable-product": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-import-export": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-configurable-product": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index a73d1b581d4f66d68faf76870ede5abad01cd5e5..9ed7ffec610a226cf1f02ae6c9b2dfd983a548db 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-webapi": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-webapi": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml index 447c8e94c509bfbfff9b018306715d8dedf0e8ed..f45a634c98fd0981610de8effdd03010e2194734 100644 --- a/app/code/Magento/ConfigurableProduct/etc/di.xml +++ b/app/code/Magento/ConfigurableProduct/etc/di.xml @@ -40,7 +40,7 @@ <plugin name="configurable_product" type="Magento\ConfigurableProduct\Model\Order\Admin\Item\Plugin\Configurable" sortOrder="50" /> </type> <type name="Magento\Catalog\Helper\Product\Configuration"> - <plugin name="confiburable_product" type="Magento\ConfigurableProduct\Helper\Product\Configuration\Plugin" sortOrder="50" /> + <plugin name="configurable_product" type="Magento\ConfigurableProduct\Helper\Product\Configuration\Plugin" sortOrder="50" /> </type> <type name="Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface"> <plugin name="configurable_product" type="Magento\ConfigurableProduct\Model\Entity\Product\Attribute\Group\AttributeMapper\Plugin" sortOrder="50" /> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml index 853f9abf1e1110700c28b5d2a42613cf6ce4f445..447b9bc1dea43261c20c1b76a89153adf5b7cef7 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\Backend\Block\Template" name="attribute_edit_js_configurable" template="Magento_ConfigurableProduct::catalog/product/attribute/js.phtml" after="attribute_edit_js"/> </referenceContainer> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml index 7b05745a67be03fdc0b7c0021edb182af58e9c4b..2ceb7fecedb27b57d103d2314a04cb1351b31477 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="left"/> <referenceBlock name="attribute_edit_content"> <arguments> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml index e2569e2bf7efaa7635b090f4d4aa9df62338c84b..45c110a4cfba7e5c73c65bb46dcc222bdd34c7f4 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_superconfig_config"/> <head> <css src="Magento_ConfigurableProduct::css/configurable-product.css"/> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml index 386ab12e51ec25d09e727d89e6120d56bf76276d..8e9e19b1cd5d9f42784e00a04b178c7cf0d1a55f 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_superconfig_config"/> <referenceBlock name="product_tabs"> <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container"> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml index a891595b108e582f6345fe26a8b17ebbf89049ae..9e628183fb5a2bbbb802be6fc50e482a59f184b3 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_ConfigurableProduct::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator"> <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_ConfigurableProduct::catalog/product/edit/super/attribute-js-template.phtml" as="template"/> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml index bbbd73d4218110b2d673d1dd193dbf8119fe787f..9936ee8bc207a886c76bab0562cfb982e48dfc97 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector" template="product/configurable/attribute-selector/js.phtml"/> <block class="Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector" template="product/configurable/affected-attribute-set-selector/js.phtml"/> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml index 572ff0bbe75e53e12830797d219b30bf0a5ff7ee..339aa7d30c304c07fbaf53a2d29769de69d1ca41 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Backend\Block\Template" name="adminhtml.catalog.product.set.edit.configurable" diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_simple.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_simple.xml index 386ab12e51ec25d09e727d89e6120d56bf76276d..8e9e19b1cd5d9f42784e00a04b178c7cf0d1a55f 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_simple.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_simple.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_superconfig_config"/> <referenceBlock name="product_tabs"> <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container"> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml index 3d55a7decd045743267c64cda9a97313cd4d3ef7..3de64f391f5bfeb97aa6cc7628e68fd48349a1e4 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="admin.product.edit.tab.super.config.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="admin.product.edit.tab.super.config.grid" as="grid"> <arguments> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml index ebae1ddde3278db8eb422df5150a3b704d9bb2a4..90e927ebbcf7b6609a34db70fb288ddfed2ec216 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="catalog_product_superconfig_config"/> <container name="root"> <block class="Magento\Backend\Block\Widget\Grid\Container" name="admin.product.edit.tab.super.config.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml index 8ae8aa4f5f8cb47b355700ecc0982e76e12733de..fadab3f38eb65af329ff2c1c3c9a2cc52a738afc 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.composite.fieldset"> <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable" name="product.composite.fieldset.configurable" before="product.composite.fieldset.options" template="catalog/product/composite/fieldset/configurable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml index 386ab12e51ec25d09e727d89e6120d56bf76276d..8e9e19b1cd5d9f42784e00a04b178c7cf0d1a55f 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_superconfig_config"/> <referenceBlock name="product_tabs"> <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container"> diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml index e269f3e3c81c0bbc1539bf0f348728ca59171535..46b6e7334220950cf4f750e8fbc1460080531727 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml @@ -73,6 +73,8 @@ require([ collapsableArea = $('> .collapse', collapsableWrapper), stockAvailabilityField = $('#quantity_and_stock_status'), qtyField = $('#qty'), + inventoryQty = $('#inventory_qty'), + inventoryAvailabilityField = $('#inventory_stock_availability'), currentProductTemplateControl = $('#product-template-suggest-container .action-dropdown > .action-toggle'), attributesInput = $("input[name='attributes[]']", variationsContainer), hasVariations = <?php echo ($this->getProduct()->getTypeId() == Configurable::TYPE_CODE || $this->getRequest()->has('attributes')) ? 'true' : 'false' ?>, @@ -86,8 +88,7 @@ require([ }, enableElement = function (element) { if (!isLocked(element)) { - element.removeProp('disabled').trigger('change'); - + element.removeProp('disabled').trigger('change'); } }; @@ -99,9 +100,11 @@ require([ attributesInput.prop('disabled', false); + stockAvailabilityField.val(1); + inventoryQty.prop('disabled', true); + inventoryAvailabilityField.removeProp('disabled'); disableElement(qtyField); enableElement(stockAvailabilityField); - $.each($.mage.variationsAttributes($('#configurable-attributes-container')).getAttributes(), function() { $('#attribute-' + this.code + '-container select').prop('disabled', true); }) @@ -113,7 +116,8 @@ require([ currentProductTemplateControl .removeClass('disabled') .removeProp('disabled'); - + inventoryQty.removeProp('disabled'); + inventoryAvailabilityField.prop('disabled', true); disableElement(stockAvailabilityField); enableElement(qtyField); }) diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml index 525f54a7e47930d0e504e2b64c8a2bcd192323ee..9c786c809e8d8bc0f2ae6ff321b8513cbe208c48 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml @@ -25,7 +25,9 @@ <script type="text/javascript"> require(['jquery'], function($){ $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) { - if ($('[data-panel=product-variations]').is('.opened')) { + var variations = $('[data-panel=product-variations]'); + if (variations.is(':visible') && variations.is('.opened')) { + e.stopPropagation(); return false; } }); diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/ConfigurableProduct/view/frontend/layout/catalog_product_view_type_configurable.xml index 225f40ddc618d695d95bd680564e2eb2ed584968..84348b125a86663e6425b8201b9a9315d397cd8f 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/layout/catalog_product_view_type_configurable.xml +++ b/app/code/Magento/ConfigurableProduct/view/frontend/layout/catalog_product_view_type_configurable.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> - <attribute name="class" value="type-configurable"/> + <attribute name="class" value="page-product-configurable"/> </body> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="configurableproduct_product_view_head_components" template="Magento_ConfigurableProduct::js/components.phtml"/> diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_configure_type_configurable.xml b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_configure_type_configurable.xml index 85eaee5def3f8a109ec255d5759114ffd82608a9..754470b8da2cedd6f9e21cc00509aa2af30e80cc 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_configure_type_configurable.xml +++ b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_configure_type_configurable.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view_type_configurable"/> </page> diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_item_renderers.xml index 0bcc29df90eb60bcc78f650a28c55726bd0f9652..cbbcbabe82f9011ab26cbaea9e0c00b551abe2d3 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.item.renderers"> <block class="Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable" as="configurable" template="Magento_Checkout::cart/item/default.phtml" cacheable="false"/> </referenceBlock> diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index 72cbd1100f2fa2ceecbf6971cc1abccd37afc693..eb385afb16016c3cb74b2f89da37fab0b2b53641 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.sidebar.item.renderers"> <block class="Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable" as="configurable" template="Magento_Checkout::cart/sidebar/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml index fb1dae71689231e5a82fc55f91e284785b81699c..11fba2f08736889e77b7b6581a53c38e82159fd2 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/ConfigurableProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.onepage.review.item.renderers"> <block class="Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable" as="configurable" template="Magento_Checkout::onepage/review/item.phtml" cacheable="false"/> </referenceBlock> diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 01e17f636387e200c3e03a8e9b744bbdda73942a..0a2f4639ffb236d1cee71164a673588375c46406 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml index 136bbae3e5111a5e117500be6016743e4c519fd3..64a6af6adc0fe52229ff3e171d2a0114422a56cf 100644 --- a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml +++ b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Contact Us</title> </head> diff --git a/app/code/Magento/Contact/view/frontend/layout/default.xml b/app/code/Magento/Contact/view/frontend/layout/default.xml index c3c7f733943a4a29069bd73a407ce09acd16a980..a8f1e562d78bf2c1f3d4f929584f1b398e5c6591 100644 --- a/app/code/Magento/Contact/view/frontend/layout/default.xml +++ b/app/code/Magento/Contact/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="footer_links"> <block class="Magento\Framework\View\Element\Html\Link\Current" ifconfig="contact/contact/enabled" name="contact-us-link"> diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php index 94e82c47d0e17c7ccfc566e8152c60b2fd99d3b4..e4b938d3a485531731e5b275272329c566798d30 100644 --- a/app/code/Magento/Core/Model/Layout/Merge.php +++ b/app/code/Magento/Core/Model/Layout/Merge.php @@ -105,6 +105,11 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface */ private $_fileSource; + /** + * @var \Magento\Framework\View\File\CollectorInterface + */ + private $pageLayoutFileSource; + /** * @var \Magento\Core\Model\Resource\Layout\Update */ @@ -151,6 +156,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface * @param \Magento\Framework\View\DesignInterface $design * @param \Magento\Framework\StoreManagerInterface $storeManager * @param \Magento\Framework\View\File\CollectorInterface $fileSource + * @param \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource * @param \Magento\Core\Model\Resource\Layout\Update $resource * @param \Magento\Framework\App\State $appState * @param \Magento\Framework\Cache\FrontendInterface $cache @@ -164,6 +170,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface \Magento\Framework\View\DesignInterface $design, \Magento\Framework\StoreManagerInterface $storeManager, \Magento\Framework\View\File\CollectorInterface $fileSource, + \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource, \Magento\Core\Model\Resource\Layout\Update $resource, \Magento\Framework\App\State $appState, \Magento\Framework\Cache\FrontendInterface $cache, @@ -176,6 +183,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface $this->_theme = $theme ?: $design->getDesignTheme(); $this->_store = $storeManager->getStore(); $this->_fileSource = $fileSource; + $this->pageLayoutFileSource = $pageLayoutFileSource; $this->_resource = $resource; $this->_appState = $appState; $this->_cache = $cache; @@ -685,6 +693,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface $layoutStr = ''; $theme = $this->_getPhysicalTheme($this->_theme); $updateFiles = $this->_fileSource->getFiles($theme, '*.xml'); + $updateFiles = array_merge($updateFiles, $this->pageLayoutFileSource->getFiles($theme, '*.xml')); $dir = $this->filesystem->getDirectoryRead(\Magento\Framework\App\Filesystem::ROOT_DIR); $useErrors = libxml_use_internal_errors(true); foreach ($updateFiles as $file) { diff --git a/app/code/Magento/Core/Model/Layout/Update/Validator.php b/app/code/Magento/Core/Model/Layout/Update/Validator.php index a809581e0da015beb78abeae57df7087cca1131f..bc0735adaa85153c7ad48a08e21995da83ad339a 100644 --- a/app/code/Magento/Core/Model/Layout/Update/Validator.php +++ b/app/code/Magento/Core/Model/Layout/Update/Validator.php @@ -23,12 +23,12 @@ */ namespace Magento\Core\Model\Layout\Update; +use Magento\Framework\App\Filesystem; + /** * Validator for custom layout update * * Validator checked XML validation and protected expressions - * - * @author Magento Core Team <core@magentocommerce.com> */ class Validator extends \Zend_Validate_Abstract { @@ -40,7 +40,7 @@ class Validator extends \Zend_Validate_Abstract const XML_NAMESPACE_XSI = 'http://www.w3.org/2001/XMLSchema-instance'; - const LAYOUT_SCHEMA_SINGLE_HANDLE = 'layout_single'; + const LAYOUT_SCHEMA_PAGE_HANDLE = 'page_layout'; const LAYOUT_SCHEMA_MERGED = 'layout_merged'; @@ -68,37 +68,27 @@ class Validator extends \Zend_Validate_Abstract */ protected $_xsdSchemas; - /** - * @var \Magento\Framework\Module\Dir\Reader - */ - protected $_modulesReader; - /** * @var \Magento\Framework\Config\DomFactory */ protected $_domConfigFactory; /** - * @param \Magento\Framework\Module\Dir\Reader $modulesReader + * @param Filesystem $filesystem * @param \Magento\Framework\Config\DomFactory $domConfigFactory */ public function __construct( - \Magento\Framework\Module\Dir\Reader $modulesReader, + Filesystem $filesystem, \Magento\Framework\Config\DomFactory $domConfigFactory ) { - $this->_modulesReader = $modulesReader; $this->_domConfigFactory = $domConfigFactory; $this->_initMessageTemplates(); - $this->_xsdSchemas = array( - self::LAYOUT_SCHEMA_SINGLE_HANDLE => $this->_modulesReader->getModuleDir( - 'etc', - 'Magento_Core' - ) . '/layout_single.xsd', - self::LAYOUT_SCHEMA_MERGED => $this->_modulesReader->getModuleDir( - 'etc', - 'Magento_Core' - ) . '/layout_merged.xsd' - ); + $this->_xsdSchemas = [ + self::LAYOUT_SCHEMA_PAGE_HANDLE => $filesystem->getPath(Filesystem::LIB_INTERNAL) + . '/Magento/Framework/View/Layout/etc/page_layout.xsd', + self::LAYOUT_SCHEMA_MERGED => $filesystem->getPath(Filesystem::LIB_INTERNAL) + . '/Magento/Framework/View/Layout/etc/layout_merged.xsd' + ]; } /** @@ -130,7 +120,7 @@ class Validator extends \Zend_Validate_Abstract * @param bool $isSecurityCheck * @return bool */ - public function isValid($value, $schema = self::LAYOUT_SCHEMA_SINGLE_HANDLE, $isSecurityCheck = true) + public function isValid($value, $schema = self::LAYOUT_SCHEMA_PAGE_HANDLE, $isSecurityCheck = true) { try { //wrap XML value in the "layout" and "handle" tags to make it validatable diff --git a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php index bcdf4988d40b713c94211d7b4904ccf6982c2e7a..3fdb96de60e9eda53f29dc434a0c64d6a7161454 100644 --- a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php +++ b/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php @@ -73,7 +73,7 @@ class DebugHints implements \Magento\Framework\View\TemplateEngineInterface { return <<<HTML <div class="debugging-hints" style="position: relative; border: 1px dotted red; margin: 6px 2px; padding: 18px 2px 2px 2px;"> -<div class="debugging-hint-template-file" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; left: 0; color: white;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$templateFile}">{$templateFile}</div> +<div class="debugging-hint-template-file" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; left: 0; color: white; white-space: nowrap;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$templateFile}">{$templateFile}</div> {$blockHtml} </div> HTML; @@ -90,7 +90,7 @@ HTML; { $blockClass = get_class($block); return <<<HTML -<div class="debugging-hint-block-class" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; right: 0; color: blue;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$blockClass}">{$blockClass}</div> +<div class="debugging-hint-block-class" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; right: 0; color: blue; white-space: nowrap;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$blockClass}">{$blockClass}</div> {$blockHtml} HTML; } diff --git a/app/code/Magento/Core/Model/View/Design.php b/app/code/Magento/Core/Model/View/Design.php index 3b21a1a216e334029ed592edd0f940648c792163..cb304d5a885a53ac86a806c2fede3364b843d190 100644 --- a/app/code/Magento/Core/Model/View/Design.php +++ b/app/code/Magento/Core/Model/View/Design.php @@ -78,6 +78,11 @@ class Design implements \Magento\Framework\View\DesignInterface */ protected $_locale; + /** + * @var \Magento\Framework\ObjectManager + */ + protected $objectManager; + /** * @var \Magento\Framework\App\State */ @@ -88,7 +93,7 @@ class Design implements \Magento\Framework\View\DesignInterface * @param \Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\Core\Model\ThemeFactory $themeFactory - * @param \Magento\Framework\Locale\ResolverInterface $locale + * @param \Magento\Framework\ObjectManager $objectManager * @param \Magento\Framework\App\State $appState * @param array $themes */ @@ -97,7 +102,7 @@ class Design implements \Magento\Framework\View\DesignInterface \Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory, \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, \Magento\Core\Model\ThemeFactory $themeFactory, - \Magento\Framework\Locale\ResolverInterface $locale, + \Magento\Framework\ObjectManager $objectManager, \Magento\Framework\App\State $appState, array $themes ) { @@ -107,7 +112,7 @@ class Design implements \Magento\Framework\View\DesignInterface $this->_scopeConfig = $scopeConfig; $this->_appState = $appState; $this->_themes = $themes; - $this->_locale = $locale; + $this->objectManager = $objectManager; } /** @@ -257,6 +262,9 @@ class Design implements \Magento\Framework\View\DesignInterface */ public function getLocale() { + if (null === $this->_locale) { + $this->_locale = $this->objectManager->get('Magento\Framework\Locale\ResolverInterface'); + } return $this->_locale->getLocaleCode(); } diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json index 23b7e1efcde2075fdfd72a5580545b2e13dd2d56..6385a681288b6d89f558405ebe71ad3a3f108364 100644 --- a/app/code/Magento/Core/composer.json +++ b/app/code/Magento/Core/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-page-cache": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml index 04ae981c354cfecae2c0463cd251e834fe18a6ad..27c7dedf9039ea75dc62c589b37a83e9a74c41a9 100644 --- a/app/code/Magento/Core/etc/di.xml +++ b/app/code/Magento/Core/etc/di.xml @@ -126,6 +126,7 @@ <type name="Magento\Core\Model\Layout\Merge"> <arguments> <argument name="fileSource" xsi:type="object">Magento\Framework\View\Layout\File\Collector\Aggregated\Proxy</argument> + <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument> <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument> </arguments> </type> @@ -208,6 +209,79 @@ </arguments> </type> + <virtualType name="pageLayoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base"> + <arguments> + <argument name="subDir" xsi:type="string">page_layout</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceBase</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceBaseFiltered</argument> + </arguments> + </virtualType> + + <virtualType name="pageLayoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular"> + <arguments> + <argument name="subDir" xsi:type="string">page_layout</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceTheme</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceThemeFiltered</argument> + </arguments> + </virtualType> + + <virtualType name="pageLayoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base"> + <arguments> + <argument name="subDir" xsi:type="string">page_layout/override/base</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBase</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBaseFiltered</argument> + </arguments> + </virtualType> + + <virtualType name="pageLayoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular"> + <arguments> + <argument name="subDir" xsi:type="string">page_layout/override/theme</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideTheme</argument> + </arguments> + </virtualType> + <virtualType name="pageLayoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency"> + <arguments> + <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideThemeFiltered</argument> + </arguments> + </virtualType> + + <virtualType name="pageLayoutFileCollectorAggregated" type="Magento\Framework\View\Layout\File\Collector\Aggregated"> + <arguments> + <argument name="baseFiles" xsi:type="object">pageLayoutFileSourceBaseSorted</argument> + <argument name="themeFiles" xsi:type="object">pageLayoutFileSourceThemeSorted</argument> + <argument name="overrideBaseFiles" xsi:type="object">pageLayoutFileSourceOverrideBaseSorted</argument> + <argument name="overrideThemeFiles" xsi:type="object">pageLayoutFileSourceOverrideThemeSorted</argument> + </arguments> + </virtualType> + <virtualType name="pageFileSourceBase" type="Magento\Framework\View\File\Collector\Base"/> <virtualType name="pageFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput"> <arguments> diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index 6cb1f839846d5d1e08a3a390d2a7ae4937200352..7160659a279f23e9015ac8fb41296868bca430f4 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index 72802c323858aa0a00bb7aebd73e6a4e86fc5f14..623cca53af80ebd4a644e2f786ad59ec3216c700 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-page-cache": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml b/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml index 813f219c3fed676b80936722b0a6287d07cba9d0..b29d8f31f33535c770f99043e35d668a5779e56c 100644 --- a/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml +++ b/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\CurrencySymbol\Block\Adminhtml\System\Currencysymbol" name="mage.system.currencysymbol" template="grid.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Hello.php b/app/code/Magento/Customer/Block/Account/Dashboard/Hello.php deleted file mode 100644 index 72f9c840f0204b4e5963cd9d2760aa0718e1ee7b..0000000000000000000000000000000000000000 --- a/app/code/Magento/Customer/Block/Account/Dashboard/Hello.php +++ /dev/null @@ -1,78 +0,0 @@ -<?php -/** - * Magento - * - * NOTICE OF LICENSE - * - * This source file is subject to the Open Software License (OSL 3.0) - * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magentocommerce.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade Magento to newer - * versions in the future. If you wish to customize Magento for your - * needs please refer to http://www.magentocommerce.com for more information. - * - * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ -namespace Magento\Customer\Block\Account\Dashboard; - -use Magento\Customer\Service\V1\CustomerAccountServiceInterface; - -class Hello extends \Magento\Framework\View\Element\Template -{ - /** - * @var \Magento\Customer\Model\Session - */ - protected $_customerSession; - - /** - * @var \Magento\Customer\Helper\View - */ - protected $_viewHelper; - - /** - * @var CustomerAccountServiceInterface - */ - protected $_customerAccountService; - - /** - * Constructor - * - * @param \Magento\Framework\View\Element\Template\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Customer\Helper\View $viewHelper - * @param CustomerAccountServiceInterface $customerAccountService - * @param array $data - */ - public function __construct( - \Magento\Framework\View\Element\Template\Context $context, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Helper\View $viewHelper, - CustomerAccountServiceInterface $customerAccountService, - array $data = array() - ) { - $this->_customerSession = $customerSession; - $this->_viewHelper = $viewHelper; - $this->_customerAccountService = $customerAccountService; - parent::__construct($context, $data); - $this->_isScopePrivate = true; - } - - /** - * Concatenate all customer name parts into full customer name. - * - * @return string - */ - public function getCustomerName() - { - $customer = $this->_customerAccountService->getCustomer($this->_customerSession->getCustomerId()); - return $this->_viewHelper->getCustomerName($customer); - } -} diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php index e091c1d7a0c059911364a035c0f18faa7f821a0b..3fd6e8f1a0c2b1ffa5e489f2ade9bae58c18d6c8 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php @@ -24,7 +24,7 @@ namespace Magento\Customer\Block\Adminhtml\Edit\Tab; use Magento\Customer\Service\V1\CustomerAccountServiceInterface; -use \Magento\Framework\Service\SimpleDataObjectConverter; +use Magento\Framework\Service\ExtensibleDataObjectConverter; /** * Customer account form block @@ -180,7 +180,8 @@ class Account extends GenericMetadata ); $form->getElement('website_id')->setRenderer($renderer); - $accountData = SimpleDataObjectConverter::toFlatArray($this->_getCustomerDataObject()); + $accountData = ExtensibleDataObjectConverter::toFlatArray($this->_getCustomerDataObject()); + if ($this->_getCustomerDataObject()->getId()) { $customerFormFields = $this->_addEditCustomerFormFields($fieldset); } else { @@ -285,7 +286,7 @@ class Account extends GenericMetadata $this->_customerForm = $this->_customerFormFactory->create( 'customer', 'adminhtml_customer', - SimpleDataObjectConverter::toFlatArray($this->_getCustomerDataObject()) + ExtensibleDataObjectConverter::toFlatArray($this->_getCustomerDataObject()) ); } return $this->_customerForm; diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php index 07d928b2aacd977146f1698cfe153244a00e0ba3..2f1426bdb5a4adc257055ee7cc48048c6bd0e69e 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php @@ -91,19 +91,24 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element 'countryElementId' => $countryElementId, 'groupIdHtmlId' => 'group_id', 'validateUrl' => $validateUrl, - 'vatValidMessage' => __('The VAT ID is valid. The current Customer Group will be used.'), + 'vatValidMessage' => __('The VAT ID is valid.'), + 'vatInvalidMessage' => __('The VAT ID entered (%s) is not a valid VAT ID.'), + 'vatValidAndGroupValidMessage' => __( + 'The VAT ID is valid. The current Customer Group will be used.' + ), + 'vatValidAndGroupInvalidMessage' => __( + 'The VAT ID is valid but no Customer Group is assigned for it.' + ), 'vatValidAndGroupChangeMessage' => __( - 'Based on the VAT ID, ' . 'the customer would belong to the Customer Group %s.' - ) . "\n" . $groupMessage, - 'vatInvalidMessage' => __( - 'The VAT ID entered (%s) is not a valid VAT ID. ' . - 'The customer would belong to Customer Group %s.' + 'Based on the VAT ID, the customer would belong to the Customer Group %s.' ) . "\n" . $groupMessage, 'vatValidationFailedMessage' => __( - 'There was an error validating the VAT ID. ' . + 'There was an error validating the VAT ID. ' + ), + 'vatCustomerGroupMessage' => __( 'The customer would belong to Customer Group %s.' - ) . "\n" . $groupMessage, - 'vatErrorMessage' => __('There was an error validating the VAT ID.') + ), + 'vatGroupErrorMessage' => __('There was an error detecting Customer Group.'), ) ); diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php index c8734afd9a0e7464e3a1d4a648d5f6084705e396..2a33cba3ea95d4530d0cc4a6b58d7843251da11f 100644 --- a/app/code/Magento/Customer/Block/Widget/Dob.php +++ b/app/code/Magento/Customer/Block/Widget/Dob.php @@ -42,6 +42,29 @@ class Dob extends AbstractWidget */ protected $_dateInputs = array(); + /** + * @var \Magento\Framework\View\Element\Html\Date + */ + protected $dateElement; + + /** + * @param \Magento\Framework\View\Element\Template\Context $context + * @param \Magento\Customer\Helper\Address $addressHelper + * @param \Magento\Customer\Service\V1\CustomerMetadataServiceInterface $customerMetadataService + * @param \Magento\Framework\View\Element\Html\Date $dateElement + * @param array $data + */ + public function __construct( + \Magento\Framework\View\Element\Template\Context $context, + \Magento\Customer\Helper\Address $addressHelper, + \Magento\Customer\Service\V1\CustomerMetadataServiceInterface $customerMetadataService, + \Magento\Framework\View\Element\Html\Date $dateElement, + array $data = array() + ) { + $this->dateElement = $dateElement; + parent::__construct($context, $addressHelper, $customerMetadataService, $data); + } + /** * @return void */ @@ -104,6 +127,44 @@ class Dob extends AbstractWidget return $this->getTime() ? date('Y', $this->getTime()) : ''; } + /** + * Return label + * + * @return string + */ + public function getLabel() + { + return __('Date of Birth'); + } + + /** + * Create correct date field + * + * @return string + */ + public function getFieldHtml() + { + $this->dateElement->setData([ + 'name' => $this->getHtmlId(), + 'id' => $this->getHtmlId(), + 'class' => $this->getHtmlClass(), + 'value' => $this->getValue(), + 'date_format' => $this->getDateFormat(), + 'image' => $this->getViewFileUrl('Magento_Core::calendar.gif'), + ]); + return $this->dateElement->getHtml(); + } + + /** + * Return id + * + * @return string + */ + public function getHtmlId() + { + return 'dob'; + } + /** * Returns format which will be applied for DOB in javascript * diff --git a/app/code/Magento/Customer/Controller/Account.php b/app/code/Magento/Customer/Controller/Account.php index fdfbeceb97d7dd4e943ba95af8385275c4f2c55c..03c3636ed811e4c2ca4b526fcf46dbe86786af2a 100644 --- a/app/code/Magento/Customer/Controller/Account.php +++ b/app/code/Magento/Customer/Controller/Account.php @@ -23,14 +23,13 @@ */ namespace Magento\Customer\Controller; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; use Magento\Framework\App\RequestInterface; -use Magento\Customer\Service\V1\CustomerAccountServiceInterface; -use Magento\Customer\Service\V1\CustomerGroupServiceInterface; /** * Customer account controller * - * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) * @SuppressWarnings(PHPMD.NumberOfChildren) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ @@ -41,7 +40,7 @@ class Account extends \Magento\Framework\App\Action\Action * * @var string[] */ - protected $_openActions = array( + protected $openActions = array( 'create', 'login', 'logoutsuccess', @@ -56,59 +55,29 @@ class Account extends \Magento\Framework\App\Action\Action 'loginpost' ); - /** @var \Magento\Customer\Model\Session */ - protected $_session; - - /** @var \Magento\Customer\Helper\Address */ - protected $_addressHelper; - - /** @var \Magento\Framework\UrlFactory */ - protected $_urlFactory; - - /** @var \Magento\Framework\StoreManagerInterface */ - protected $_storeManager; - - /** @var \Magento\Framework\App\Config\ScopeConfigInterface */ - protected $_scopeConfig; - - /** @var CustomerAccountServiceInterface */ - protected $_customerAccountService; + /** @var Session */ + protected $session; /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Customer\Helper\Address $addressHelper - * @param \Magento\Framework\UrlFactory $urlFactory - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig - * @param CustomerAccountServiceInterface $customerAccountService + * @param Context $context + * @param Session $customerSession */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Helper\Address $addressHelper, - \Magento\Framework\UrlFactory $urlFactory, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, - CustomerAccountServiceInterface $customerAccountService + Context $context, + Session $customerSession ) { - $this->_session = $customerSession; - $this->_addressHelper = $addressHelper; - $this->_urlFactory = $urlFactory; - $this->_storeManager = $storeManager; - $this->_scopeConfig = $scopeConfig; - $this->_customerAccountService = $customerAccountService; + $this->session = $customerSession; parent::__construct($context); } /** * Retrieve customer session model object * - * @return \Magento\Customer\Model\Session + * @return Session */ protected function _getSession() { - return $this->_session; + return $this->session; } /** @@ -116,9 +85,9 @@ class Account extends \Magento\Framework\App\Action\Action * * @return string[] */ - protected function _getAllowedActions() + protected function getAllowedActions() { - return $this->_openActions; + return $this->openActions; } /** @@ -134,7 +103,7 @@ class Account extends \Magento\Framework\App\Action\Action } $action = strtolower($this->getRequest()->getActionName()); - $pattern = '/^(' . implode('|', $this->_getAllowedActions()) . ')$/i'; + $pattern = '/^(' . implode('|', $this->getAllowedActions()) . ')$/i'; if (!preg_match($pattern, $action)) { if (!$this->_getSession()->authenticate($this)) { @@ -148,79 +117,4 @@ class Account extends \Magento\Framework\App\Action\Action $this->_getSession()->unsNoReferer(false); return $result; } - - /** - * Adds welcome message and returns success URL - * - * @return string - */ - protected function _welcomeCustomer() - { - $this->_addWelcomeMessage(); - - $successUrl = $this->_createUrl()->getUrl('*/*/index', array('_secure' => true)); - if (!$this->_scopeConfig->isSetFlag( - \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ) && $this->_getSession()->getBeforeAuthUrl() - ) { - $successUrl = $this->_getSession()->getBeforeAuthUrl(true); - } - return $successUrl; - } - - /** - * Adds a welcome message to the session - * - * @return void - */ - protected function _addWelcomeMessage() - { - $this->messageManager->addSuccess( - __('Thank you for registering with %1.', $this->_storeManager->getStore()->getFrontendName()) - ); - if ($this->_isVatValidationEnabled()) { - // Show corresponding VAT message to customer - $configAddressType = $this->_addressHelper->getTaxCalculationAddressType(); - $editAddersUrl = $this->_createUrl()->getUrl('customer/address/edit'); - switch ($configAddressType) { - case \Magento\Customer\Helper\Address::TYPE_SHIPPING: - // @codingStandardsIgnoreStart - $userPrompt = __( - 'If you are a registered VAT customer, please click <a href="%1">here</a> to enter you shipping address for proper VAT calculation', - $editAddersUrl - ); - // @codingStandardsIgnoreEnd - break; - default: - // @codingStandardsIgnoreStart - $userPrompt = __( - 'If you are a registered VAT customer, please click <a href="%1">here</a> to enter you billing address for proper VAT calculation', - $editAddersUrl - ); - // @codingStandardsIgnoreEnd - break; - } - $this->messageManager->addSuccess($userPrompt); - } - } - - /** - * Check whether VAT ID validation is enabled - * - * @param \Magento\Store\Model\Store|string|int $store - * @return bool - */ - protected function _isVatValidationEnabled($store = null) - { - return $this->_addressHelper->isVatValidationEnabled($store); - } - - /** - * @return \Magento\Framework\UrlInterface - */ - protected function _createUrl() - { - return $this->_urlFactory->create(); - } } diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php index c931d7a4cb20c8a59c3bb9d524ae3954181ca824..bb1eba638197f45fb09959383bb1cc1ac5422af0 100644 --- a/app/code/Magento/Customer/Controller/Account/Confirm.php +++ b/app/code/Magento/Customer/Controller/Account/Confirm.php @@ -24,15 +24,69 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\StoreManagerInterface; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Customer\Helper\Address; +use Magento\Framework\UrlFactory; use Magento\Framework\Exception\StateException; +use Magento\Customer\Helper\Data as CustomerData; +use Magento\Store\Model\ScopeInterface; +/** + * Class Confirm + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class Confirm extends \Magento\Customer\Controller\Account { + /** @var ScopeConfigInterface */ + protected $scopeConfig; + + /** @var StoreManagerInterface */ + protected $storeManager; + + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var Address */ + protected $addressHelper; + + /** @var \Magento\Framework\UrlInterface */ + protected $urlModel; + + /** + * @param Context $context + * @param Session $customerSession + * @param ScopeConfigInterface $scopeConfig + * @param StoreManagerInterface $storeManager + * @param CustomerAccountServiceInterface $customerAccountService + * @param Address $addressHelper + * @param UrlFactory $urlFactory + */ + public function __construct( + Context $context, + Session $customerSession, + ScopeConfigInterface $scopeConfig, + StoreManagerInterface $storeManager, + CustomerAccountServiceInterface $customerAccountService, + Address $addressHelper, + UrlFactory $urlFactory + ) { + $this->scopeConfig = $scopeConfig; + $this->storeManager = $storeManager; + $this->customerAccountService = $customerAccountService; + $this->addressHelper = $addressHelper; + $this->urlModel = $urlFactory->create(); + parent::__construct($context, $customerSession); + } + /** * Confirm customer account by id and confirmation key * * @return void - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function execute() { @@ -43,17 +97,16 @@ class Confirm extends \Magento\Customer\Controller\Account try { $customerId = $this->getRequest()->getParam('id', false); $key = $this->getRequest()->getParam('key', false); - $backUrl = $this->getRequest()->getParam('back_url', false); if (empty($customerId) || empty($key)) { throw new \Exception(__('Bad request.')); } - $customer = $this->_customerAccountService->activateCustomer($customerId, $key); - // log in and send greeting email, then die happy + $customer = $this->customerAccountService->activateCustomer($customerId, $key); $this->_getSession()->setCustomerDataAsLoggedIn($customer); - $successUrl = $this->_welcomeCustomer(); - $this->getResponse()->setRedirect($this->_redirect->success($backUrl ? $backUrl : $successUrl)); + + $this->messageManager->addSuccess($this->getSuccessMessage()); + $this->getResponse()->setRedirect($this->getSuccessRedirect()); return; } catch (StateException $e) { $this->messageManager->addException($e, __('This confirmation key is invalid or has expired.')); @@ -61,8 +114,57 @@ class Confirm extends \Magento\Customer\Controller\Account $this->messageManager->addException($e, __('There was an error confirming the account')); } // die unhappy - $url = $this->_createUrl()->getUrl('*/*/index', array('_secure' => true)); + $url = $this->urlModel->getUrl('*/*/index', array('_secure' => true)); $this->getResponse()->setRedirect($this->_redirect->error($url)); return; } + + /** + * Retrieve success message + * + * @return string + */ + protected function getSuccessMessage() + { + if ($this->addressHelper->isVatValidationEnabled()) { + if ($this->addressHelper->getTaxCalculationAddressType() == Address::TYPE_SHIPPING) { + // @codingStandardsIgnoreStart + $message = __( + 'If you are a registered VAT customer, please click <a href="%1">here</a> to enter you shipping address for proper VAT calculation', + $this->urlModel->getUrl('customer/address/edit') + ); + // @codingStandardsIgnoreEnd + } else { + // @codingStandardsIgnoreStart + $message = __( + 'If you are a registered VAT customer, please click <a href="%1">here</a> to enter you billing address for proper VAT calculation', + $this->urlModel->getUrl('customer/address/edit') + ); + // @codingStandardsIgnoreEnd + } + } else { + $message = __('Thank you for registering with %1.', $this->storeManager->getStore()->getFrontendName()); + } + return $message; + } + + /** + * Retrieve success redirect URL + * + * @return string + */ + protected function getSuccessRedirect() + { + $backUrl = $this->getRequest()->getParam('back_url', false); + $redirectToDashboard = $this->scopeConfig->isSetFlag( + CustomerData::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD, + ScopeInterface::SCOPE_STORE + ); + if (!$redirectToDashboard && $this->_getSession()->getBeforeAuthUrl()) { + $successUrl = $this->_getSession()->getBeforeAuthUrl(true); + } else { + $successUrl = $this->urlModel->getUrl('*/*/index', array('_secure' => true)); + } + return $this->_redirect->success($backUrl ? $backUrl : $successUrl); + } } diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php index 1465fb89ba5ccb549f438486837e66964fca65e7..374d42e14d7d69d63cf8591cacd57486ee206f3a 100644 --- a/app/code/Magento/Customer/Controller/Account/Confirmation.php +++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php @@ -24,10 +24,44 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Framework\StoreManagerInterface; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Framework\UrlFactory; use Magento\Framework\Exception\State\InvalidTransitionException; class Confirmation extends \Magento\Customer\Controller\Account { + /** @var StoreManagerInterface */ + protected $storeManager; + + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var \Magento\Framework\UrlInterface */ + protected $urlModel; + + /** + * @param Context $context + * @param Session $customerSession + * @param StoreManagerInterface $storeManager + * @param CustomerAccountServiceInterface $customerAccountService + * @param UrlFactory $urlFactory + */ + public function __construct( + Context $context, + Session $customerSession, + StoreManagerInterface $storeManager, + CustomerAccountServiceInterface $customerAccountService, + UrlFactory $urlFactory + ) { + $this->storeManager = $storeManager; + $this->customerAccountService = $customerAccountService; + $this->urlModel = $urlFactory->create(); + parent::__construct($context, $customerSession); + } + /** * Send confirmation link to specified email * @@ -44,9 +78,9 @@ class Confirmation extends \Magento\Customer\Controller\Account $email = $this->getRequest()->getPost('email'); if ($email) { try { - $this->_customerAccountService->resendConfirmation( + $this->customerAccountService->resendConfirmation( $email, - $this->_storeManager->getStore()->getWebsiteId() + $this->storeManager->getStore()->getWebsiteId() ); $this->messageManager->addSuccess(__('Please, check your email for confirmation key.')); } catch (InvalidTransitionException $e) { @@ -54,12 +88,12 @@ class Confirmation extends \Magento\Customer\Controller\Account } catch (\Exception $e) { $this->messageManager->addException($e, __('Wrong email.')); $this->getResponse()->setRedirect( - $this->_createUrl()->getUrl('*/*/*', array('email' => $email, '_secure' => true)) + $this->urlModel->getUrl('*/*/*', array('email' => $email, '_secure' => true)) ); return; } $this->_getSession()->setUsername($email); - $this->getResponse()->setRedirect($this->_createUrl()->getUrl('*/*/index', array('_secure' => true))); + $this->getResponse()->setRedirect($this->urlModel->getUrl('*/*/index', array('_secure' => true))); return; } diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php index b3d11180172675ae2ddd8a059b388018934010ca..d78b2cc4d316640664cf848654ed24dc356831c1 100644 --- a/app/code/Magento/Customer/Controller/Account/Create.php +++ b/app/code/Magento/Customer/Controller/Account/Create.php @@ -24,44 +24,27 @@ */ namespace Magento\Customer\Controller\Account; -use Magento\Customer\Service\V1\CustomerAccountServiceInterface; -use Magento\Framework\App\Action\Action; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Customer\Helper\Data as CustomerHelper; class Create extends \Magento\Customer\Controller\Account { - /** @var \Magento\Customer\Helper\Data */ + /** @var CustomerHelper */ protected $customerHelper; /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Customer\Helper\Address $addressHelper - * @param \Magento\Framework\UrlFactory $urlFactory - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig - * @param CustomerAccountServiceInterface $customerAccountService - * @param \Magento\Customer\Helper\Data $customerHelper + * @param Context $context + * @param Session $customerSession + * @param CustomerHelper $customerHelper */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Helper\Address $addressHelper, - \Magento\Framework\UrlFactory $urlFactory, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, - CustomerAccountServiceInterface $customerAccountService, - \Magento\Customer\Helper\Data $customerHelper + Context $context, + Session $customerSession, + CustomerHelper $customerHelper ) { $this->customerHelper = $customerHelper; - parent::__construct( - $context, - $customerSession, - $addressHelper, - $urlFactory, - $storeManager, - $scopeConfig, - $customerAccountService - ); + parent::__construct($context, $customerSession); } /** diff --git a/app/code/Magento/Customer/Controller/Account/CreatePassword.php b/app/code/Magento/Customer/Controller/Account/CreatePassword.php index 27386b7b9421532699ab70cd6acd62082f4a402d..d79bec4b5434a2ad9b537bd51da0851721e9cdac 100644 --- a/app/code/Magento/Customer/Controller/Account/CreatePassword.php +++ b/app/code/Magento/Customer/Controller/Account/CreatePassword.php @@ -24,8 +24,29 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; + class CreatePassword extends \Magento\Customer\Controller\Account { + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** + * @param Context $context + * @param Session $customerSession + * @param CustomerAccountServiceInterface $customerAccountService + */ + public function __construct( + Context $context, + Session $customerSession, + CustomerAccountServiceInterface $customerAccountService + ) { + $this->customerAccountService = $customerAccountService; + parent::__construct($context, $customerSession); + } + /** * Resetting password handler * @@ -36,7 +57,7 @@ class CreatePassword extends \Magento\Customer\Controller\Account $resetPasswordToken = (string)$this->getRequest()->getParam('token'); $customerId = (int)$this->getRequest()->getParam('id'); try { - $this->_customerAccountService->validateResetPasswordLinkToken($customerId, $resetPasswordToken); + $this->customerAccountService->validateResetPasswordLinkToken($customerId, $resetPasswordToken); $this->_view->loadLayout(); // Pass received parameters to the reset forgotten password form $this->_view->getLayout()->getBlock( diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php index cb34708150371a805c7c1ec2f2743382a60d31d5..b973b74dc821c4b67453aadb024a9d2cee7ae5c6 100644 --- a/app/code/Magento/Customer/Controller/Account/CreatePost.php +++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php @@ -24,92 +24,119 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\StoreManagerInterface; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Customer\Helper\Address; +use Magento\Framework\UrlFactory; +use Magento\Customer\Model\Metadata\FormFactory; +use Magento\Newsletter\Model\SubscriberFactory; +use Magento\Customer\Service\V1\Data\RegionBuilder; +use Magento\Customer\Service\V1\Data\AddressBuilder; +use Magento\Customer\Service\V1\Data\CustomerDetailsBuilder; +use Magento\Customer\Helper\Data as CustomerHelper; +use Magento\Framework\Escaper; +use Magento\Customer\Model\CustomerExtractor; use Magento\Framework\Exception\StateException; use Magento\Framework\Exception\InputException; -use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Store\Model\ScopeInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class CreatePost extends \Magento\Customer\Controller\Account { - /** @var \Magento\Customer\Model\CustomerExtractor */ - protected $customerExtractor; + /** @var ScopeConfigInterface */ + protected $scopeConfig; + + /** @var StoreManagerInterface */ + protected $storeManager; + + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var Address */ + protected $addressHelper; - /** @var \Magento\Customer\Model\Metadata\FormFactory */ - protected $_formFactory; + /** @var FormFactory */ + protected $formFactory; - /** @var \Magento\Newsletter\Model\SubscriberFactory */ - protected $_subscriberFactory; + /** @var SubscriberFactory */ + protected $subscriberFactory; - /** @var \Magento\Customer\Service\V1\Data\RegionBuilder */ - protected $_regionBuilder; + /** @var RegionBuilder */ + protected $regionBuilder; - /** @var \Magento\Customer\Service\V1\Data\AddressBuilder */ - protected $_addressBuilder; + /** @var AddressBuilder */ + protected $addressBuilder; - /** @var \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder */ - protected $_customerDetailsBuilder; + /** @var CustomerDetailsBuilder */ + protected $customerDetailsBuilder; - /** @var \Magento\Customer\Helper\Data */ - protected $_customerHelperData; + /** @var CustomerHelper */ + protected $customerHelperData; - /** @var \Magento\Framework\Escaper */ + /** @var Escaper */ protected $escaper; + /** @var CustomerExtractor */ + protected $customerExtractor; + + /** @var \Magento\Framework\UrlInterface */ + protected $urlModel; + /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Customer\Helper\Address $addressHelper - * @param \Magento\Framework\UrlFactory $urlFactory - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + * @param Context $context + * @param Session $customerSession + * @param StoreManagerInterface $storeManager + * @param ScopeConfigInterface $scopeConfig * @param CustomerAccountServiceInterface $customerAccountService - * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory - * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory - * @param \Magento\Customer\Service\V1\Data\RegionBuilder $regionBuilder - * @param \Magento\Customer\Service\V1\Data\AddressBuilder $addressBuilder - * @param \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder $customerDetailsBuilder - * @param \Magento\Customer\Helper\Data $customerHelperData - * @param \Magento\Framework\Escaper $escaper - * @param \Magento\Customer\Model\CustomerExtractor $customerExtractor + * @param Address $addressHelper + * @param UrlFactory $urlFactory + * @param FormFactory $formFactory + * @param SubscriberFactory $subscriberFactory + * @param RegionBuilder $regionBuilder + * @param AddressBuilder $addressBuilder + * @param CustomerDetailsBuilder $customerDetailsBuilder + * @param CustomerHelper $customerHelperData + * @param Escaper $escaper + * @param CustomerExtractor $customerExtractor * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Helper\Address $addressHelper, - \Magento\Framework\UrlFactory $urlFactory, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + Context $context, + Session $customerSession, + ScopeConfigInterface $scopeConfig, + StoreManagerInterface $storeManager, CustomerAccountServiceInterface $customerAccountService, - \Magento\Customer\Model\Metadata\FormFactory $formFactory, - \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory, - \Magento\Customer\Service\V1\Data\RegionBuilder $regionBuilder, - \Magento\Customer\Service\V1\Data\AddressBuilder $addressBuilder, - \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder $customerDetailsBuilder, - \Magento\Customer\Helper\Data $customerHelperData, - \Magento\Framework\Escaper $escaper, - \Magento\Customer\Model\CustomerExtractor $customerExtractor + Address $addressHelper, + UrlFactory $urlFactory, + FormFactory $formFactory, + SubscriberFactory $subscriberFactory, + RegionBuilder $regionBuilder, + AddressBuilder $addressBuilder, + CustomerDetailsBuilder $customerDetailsBuilder, + CustomerHelper $customerHelperData, + Escaper $escaper, + CustomerExtractor $customerExtractor ) { - $this->_formFactory = $formFactory; - $this->_subscriberFactory = $subscriberFactory; - $this->_regionBuilder = $regionBuilder; - $this->_addressBuilder = $addressBuilder; - $this->_customerDetailsBuilder = $customerDetailsBuilder; - $this->_customerHelperData = $customerHelperData; + $this->scopeConfig = $scopeConfig; + $this->storeManager = $storeManager; + $this->customerAccountService = $customerAccountService; + $this->addressHelper = $addressHelper; + $this->formFactory = $formFactory; + $this->subscriberFactory = $subscriberFactory; + $this->regionBuilder = $regionBuilder; + $this->addressBuilder = $addressBuilder; + $this->customerDetailsBuilder = $customerDetailsBuilder; + $this->customerHelperData = $customerHelperData; $this->escaper = $escaper; $this->customerExtractor = $customerExtractor; - parent::__construct( - $context, - $customerSession, - $addressHelper, - $urlFactory, - $storeManager, - $scopeConfig, - $customerAccountService - ); + $this->urlModel = $urlFactory->create(); + parent::__construct($context, $customerSession); } /** @@ -117,13 +144,13 @@ class CreatePost extends \Magento\Customer\Controller\Account * * @return \Magento\Customer\Service\V1\Data\Address|null */ - protected function _extractAddress() + protected function extractAddress() { if (!$this->getRequest()->getPost('create_address')) { return null; } - $addressForm = $this->_formFactory->create('customer_address', 'customer_register_address'); + $addressForm = $this->formFactory->create('customer_address', 'customer_register_address'); $allowedAttributes = $addressForm->getAllowedAttributes(); $addressData = array(); @@ -136,34 +163,24 @@ class CreatePost extends \Magento\Customer\Controller\Account } switch ($attributeCode) { case 'region_id': - $this->_regionBuilder->setRegionId($value); + $this->regionBuilder->setRegionId($value); break; case 'region': - $this->_regionBuilder->setRegion($value); + $this->regionBuilder->setRegion($value); break; default: $addressData[$attributeCode] = $value; } } - $this->_addressBuilder->populateWithArray($addressData); - $this->_addressBuilder->setRegion($this->_regionBuilder->create()); + $this->addressBuilder->populateWithArray($addressData); + $this->addressBuilder->setRegion($this->regionBuilder->create()); - $this->_addressBuilder->setDefaultBilling( + $this->addressBuilder->setDefaultBilling( $this->getRequest()->getParam('default_billing', false) )->setDefaultShipping( $this->getRequest()->getParam('default_shipping', false) ); - return $this->_addressBuilder->create(); - } - - /** - * Is registration allowed - * - * @return bool - */ - protected function isRegistrationAllowed() - { - return $this->_customerHelperData->isRegistrationAllowed(); + return $this->addressBuilder->create(); } /** @@ -174,33 +191,33 @@ class CreatePost extends \Magento\Customer\Controller\Account */ public function execute() { - if ($this->_getSession()->isLoggedIn() || !$this->isRegistrationAllowed()) { + if ($this->_getSession()->isLoggedIn() || !$this->customerHelperData->isRegistrationAllowed()) { $this->_redirect('*/*/'); return; } if (!$this->getRequest()->isPost()) { - $url = $this->_createUrl()->getUrl('*/*/create', array('_secure' => true)); + $url = $this->urlModel->getUrl('*/*/create', array('_secure' => true)); $this->getResponse()->setRedirect($this->_redirect->error($url)); return; } - $this->_session->regenerateId(); + $this->_getSession()->regenerateId(); try { $customer = $this->customerExtractor->extract('customer_account_create', $this->_request); - $address = $this->_extractAddress(); + $address = $this->extractAddress(); $addresses = is_null($address) ? array() : array($address); $password = $this->getRequest()->getParam('password'); $redirectUrl = $this->_getSession()->getBeforeAuthUrl(); - $customerDetails = $this->_customerDetailsBuilder + $customerDetails = $this->customerDetailsBuilder ->setCustomer($customer) ->setAddresses($addresses) ->create(); - $customer = $this->_customerAccountService->createCustomer($customerDetails, $password, $redirectUrl); + $customer = $this->customerAccountService->createCustomer($customerDetails, $password, $redirectUrl); if ($this->getRequest()->getParam('is_subscribed', false)) { - $this->_subscriberFactory->create()->subscribeCustomerById($customer->getId()); + $this->subscriberFactory->create()->subscribeCustomerById($customer->getId()); } $this->_eventManager->dispatch( @@ -208,9 +225,9 @@ class CreatePost extends \Magento\Customer\Controller\Account array('account_controller' => $this, 'customer' => $customer) ); - $confirmationStatus = $this->_customerAccountService->getConfirmationStatus($customer->getId()); + $confirmationStatus = $this->customerAccountService->getConfirmationStatus($customer->getId()); if ($confirmationStatus === CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_REQUIRED) { - $email = $this->_customerHelperData->getEmailConfirmationUrl($customer->getEmail()); + $email = $this->customerHelperData->getEmailConfirmationUrl($customer->getEmail()); // @codingStandardsIgnoreStart $this->messageManager->addSuccess( __( @@ -219,16 +236,17 @@ class CreatePost extends \Magento\Customer\Controller\Account ) ); // @codingStandardsIgnoreEnd - $url = $this->_createUrl()->getUrl('*/*/index', array('_secure' => true)); + $url = $this->urlModel->getUrl('*/*/index', array('_secure' => true)); $this->getResponse()->setRedirect($this->_redirect->success($url)); } else { $this->_getSession()->setCustomerDataAsLoggedIn($customer); - $url = $this->_welcomeCustomer($customer); - $this->getResponse()->setRedirect($this->_redirect->success($url)); + + $this->messageManager->addSuccess($this->getSuccessMessage()); + $this->getResponse()->setRedirect($this->getSuccessRedirect()); } return; } catch (StateException $e) { - $url = $this->_createUrl()->getUrl('customer/account/forgotpassword'); + $url = $this->urlModel->getUrl('customer/account/forgotpassword'); // @codingStandardsIgnoreStart $message = __( 'There is already an account with this email address. If you are sure that it is your email address, <a href="%1">click here</a> to get your password and access your account.', @@ -246,7 +264,55 @@ class CreatePost extends \Magento\Customer\Controller\Account } $this->_getSession()->setCustomerFormData($this->getRequest()->getPost()); - $defaultUrl = $this->_createUrl()->getUrl('*/*/create', array('_secure' => true)); + $defaultUrl = $this->urlModel->getUrl('*/*/create', array('_secure' => true)); $this->getResponse()->setRedirect($this->_redirect->error($defaultUrl)); } + + /** + * Retrieve success message + * + * @return string + */ + protected function getSuccessMessage() + { + if ($this->addressHelper->isVatValidationEnabled()) { + if ($this->addressHelper->getTaxCalculationAddressType() == Address::TYPE_SHIPPING) { + // @codingStandardsIgnoreStart + $message = __( + 'If you are a registered VAT customer, please click <a href="%1">here</a> to enter you shipping address for proper VAT calculation', + $this->urlModel->getUrl('customer/address/edit') + ); + // @codingStandardsIgnoreEnd + } else { + // @codingStandardsIgnoreStart + $message = __( + 'If you are a registered VAT customer, please click <a href="%1">here</a> to enter you billing address for proper VAT calculation', + $this->urlModel->getUrl('customer/address/edit') + ); + // @codingStandardsIgnoreEnd + } + } else { + $message = __('Thank you for registering with %1.', $this->storeManager->getStore()->getFrontendName()); + } + return $message; + } + + /** + * Retrieve success redirect URL + * + * @return string + */ + protected function getSuccessRedirect() + { + $redirectToDashboard = $this->scopeConfig->isSetFlag( + CustomerHelper::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD, + ScopeInterface::SCOPE_STORE + ); + if (!$redirectToDashboard && $this->_getSession()->getBeforeAuthUrl()) { + $successUrl = $this->_getSession()->getBeforeAuthUrl(true); + } else { + $successUrl = $this->urlModel->getUrl('*/*/index', array('_secure' => true)); + } + return $this->_redirect->success($successUrl); + } } diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php index d89d5b2e95b806422d3b0456617f35609852f518..df78e2f6ddc7f532527e8cf84699002d7d8234d3 100644 --- a/app/code/Magento/Customer/Controller/Account/Edit.php +++ b/app/code/Magento/Customer/Controller/Account/Edit.php @@ -24,47 +24,34 @@ */ namespace Magento\Customer\Controller\Account; -use Magento\Customer\Service\V1\CustomerAccountServiceInterface; use Magento\Framework\App\Action\Context; use Magento\Customer\Model\Session; -use Magento\Customer\Helper\Address as CustomerHelper; -use Magento\Framework\UrlFactory; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Customer\Service\V1\Data\CustomerBuilder; class Edit extends \Magento\Customer\Controller\Account { - /** @var \Magento\Customer\Service\V1\Data\CustomerBuilder */ - protected $_customerBuilder; + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var CustomerBuilder */ + protected $customerBuilder; /** * @param Context $context * @param Session $customerSession - * @param CustomerHelper $addressHelper - * @param UrlFactory $urlFactory - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig * @param CustomerAccountServiceInterface $customerAccountService - * @param \Magento\Customer\Service\V1\Data\CustomerBuilder $customerBuilder + * @param CustomerBuilder $customerBuilder */ public function __construct( Context $context, Session $customerSession, - CustomerHelper $addressHelper, - UrlFactory $urlFactory, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, CustomerAccountServiceInterface $customerAccountService, - \Magento\Customer\Service\V1\Data\CustomerBuilder $customerBuilder + CustomerBuilder $customerBuilder ) { - $this->_customerBuilder = $customerBuilder; - parent::__construct( - $context, - $customerSession, - $addressHelper, - $urlFactory, - $storeManager, - $scopeConfig, - $customerAccountService - ); + $this->customerAccountService = $customerAccountService; + $this->customerBuilder = $customerBuilder; + parent::__construct($context, $customerSession); } /** @@ -84,9 +71,9 @@ class Edit extends \Magento\Customer\Controller\Account $data = $this->_getSession()->getCustomerFormData(true); $customerId = $this->_getSession()->getCustomerId(); - $customerDataObject = $this->_customerAccountService->getCustomer($customerId); + $customerDataObject = $this->customerAccountService->getCustomer($customerId); if (!empty($data)) { - $customerDataObject = $this->_customerBuilder->mergeDataObjectWithArray($customerDataObject, $data); + $customerDataObject = $this->customerBuilder->mergeDataObjectWithArray($customerDataObject, $data); } $this->_getSession()->setCustomerData($customerDataObject); $this->_getSession()->setChangePassword($this->getRequest()->getParam('changepass') == 1); diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php index 23a41d93a64373ec0b34a53fb1a5a60f25796adf..a72249034d63352c1ecf07906b1a10ff1d566cce 100644 --- a/app/code/Magento/Customer/Controller/Account/EditPost.php +++ b/app/code/Magento/Customer/Controller/Account/EditPost.php @@ -24,7 +24,13 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Customer\Service\V1\Data\CustomerBuilder; +use Magento\Customer\Service\V1\Data\CustomerDetailsBuilder; +use Magento\Core\App\Action\FormKeyValidator; +use Magento\Customer\Model\CustomerExtractor; use Magento\Framework\Exception\InputException; use Magento\Framework\Exception\AuthenticationException; @@ -33,59 +39,47 @@ use Magento\Framework\Exception\AuthenticationException; */ class EditPost extends \Magento\Customer\Controller\Account { - /** @var \Magento\Customer\Model\CustomerExtractor */ - protected $customerExtractor; + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var CustomerBuilder */ + protected $customerBuilder; - /** @var \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder */ - protected $_customerDetailsBuilder; + /** @var CustomerDetailsBuilder */ + protected $customerDetailsBuilder; - /** @var \Magento\Core\App\Action\FormKeyValidator */ - protected $_formKeyValidator; + /** @var FormKeyValidator */ + protected $formKeyValidator; - /** @var \Magento\Customer\Service\V1\Data\CustomerBuilder */ - protected $_customerBuilder; + /** @var CustomerExtractor */ + protected $customerExtractor; /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Customer\Helper\Address $addressHelper - * @param \Magento\Framework\UrlFactory $urlFactory - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + * @param Context $context + * @param Session $customerSession * @param CustomerAccountServiceInterface $customerAccountService - * @param \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder $customerDetailsBuilder - * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator - * @param \Magento\Customer\Service\V1\Data\CustomerBuilder $customerBuilder - * @param \Magento\Customer\Model\CustomerExtractor $customerExtractor + * @param CustomerDetailsBuilder $customerDetailsBuilder + * @param FormKeyValidator $formKeyValidator + * @param CustomerBuilder $customerBuilder + * @param CustomerExtractor $customerExtractor * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Helper\Address $addressHelper, - \Magento\Framework\UrlFactory $urlFactory, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + Context $context, + Session $customerSession, CustomerAccountServiceInterface $customerAccountService, - \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder $customerDetailsBuilder, - \Magento\Core\App\Action\FormKeyValidator $formKeyValidator, - \Magento\Customer\Service\V1\Data\CustomerBuilder $customerBuilder, - \Magento\Customer\Model\CustomerExtractor $customerExtractor + CustomerBuilder $customerBuilder, + CustomerDetailsBuilder $customerDetailsBuilder, + FormKeyValidator $formKeyValidator, + CustomerExtractor $customerExtractor ) { - $this->_customerDetailsBuilder = $customerDetailsBuilder; - $this->_formKeyValidator = $formKeyValidator; - $this->_customerBuilder = $customerBuilder; + $this->customerAccountService = $customerAccountService; + $this->customerBuilder = $customerBuilder; + $this->customerDetailsBuilder = $customerDetailsBuilder; + $this->formKeyValidator = $formKeyValidator; $this->customerExtractor = $customerExtractor; - parent::__construct( - $context, - $customerSession, - $addressHelper, - $urlFactory, - $storeManager, - $scopeConfig, - $customerAccountService - ); + parent::__construct($context, $customerSession); } /** @@ -96,7 +90,7 @@ class EditPost extends \Magento\Customer\Controller\Account */ public function execute() { - if (!$this->_formKeyValidator->validate($this->getRequest())) { + if (!$this->formKeyValidator->validate($this->getRequest())) { $this->_redirect('*/*/edit'); return; } @@ -104,9 +98,9 @@ class EditPost extends \Magento\Customer\Controller\Account if ($this->getRequest()->isPost()) { $customerId = $this->_getSession()->getCustomerId(); $customer = $this->customerExtractor->extract('customer_account_edit', $this->_request); - $this->_customerBuilder->populate($customer); - $this->_customerBuilder->setId($customerId); - $customer = $this->_customerBuilder->create(); + $this->customerBuilder->populate($customer); + $this->customerBuilder->setId($customerId); + $customer = $this->customerBuilder->create(); if ($this->getRequest()->getParam('change_password')) { $currPass = $this->getRequest()->getPost('current_password'); @@ -116,7 +110,7 @@ class EditPost extends \Magento\Customer\Controller\Account if (strlen($newPass)) { if ($newPass == $confPass) { try { - $this->_customerAccountService->changePassword($customerId, $currPass, $newPass); + $this->customerAccountService->changePassword($customerId, $currPass, $newPass); } catch (AuthenticationException $e) { $this->messageManager->addError($e->getMessage()); } catch (\Exception $e) { @@ -134,8 +128,8 @@ class EditPost extends \Magento\Customer\Controller\Account } try { - $this->_customerDetailsBuilder->setCustomer($customer); - $this->_customerAccountService->updateCustomer($customerId, $this->_customerDetailsBuilder->create()); + $this->customerDetailsBuilder->setCustomer($customer); + $this->customerAccountService->updateCustomer($customerId, $this->customerDetailsBuilder->create()); } catch (AuthenticationException $e) { $this->messageManager->addError($e->getMessage()); } catch (InputException $e) { diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php index 0fa38e97bff673f12df22265b4343451e5fed45c..90387e33f56a8d2bf075f03924bfa69232f68963 100644 --- a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php +++ b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php @@ -24,49 +24,35 @@ */ namespace Magento\Customer\Controller\Account; -use Magento\Framework\Exception\NoSuchEntityException; -use Magento\Customer\Service\V1\CustomerAccountServiceInterface; use Magento\Framework\App\Action\Context; use Magento\Customer\Model\Session; -use Magento\Customer\Helper\Address; -use Magento\Framework\UrlFactory; -use Magento\Framework\StoreManagerInterface; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Framework\Escaper; +use Magento\Framework\Exception\NoSuchEntityException; class ForgotPasswordPost extends \Magento\Customer\Controller\Account { - /** @var \Magento\Framework\Escaper */ + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var Escaper */ protected $escaper; /** * @param Context $context * @param Session $customerSession - * @param Address $addressHelper - * @param UrlFactory $urlFactory - * @param StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig * @param CustomerAccountServiceInterface $customerAccountService - * @param \Magento\Framework\Escaper $escaper + * @param Escaper $escaper */ public function __construct( Context $context, Session $customerSession, - Address $addressHelper, - UrlFactory $urlFactory, - StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, CustomerAccountServiceInterface $customerAccountService, - \Magento\Framework\Escaper $escaper + Escaper $escaper ) { + $this->customerAccountService = $customerAccountService; $this->escaper = $escaper; - parent::__construct( - $context, - $customerSession, - $addressHelper, - $urlFactory, - $storeManager, - $scopeConfig, - $customerAccountService - ); + parent::__construct($context, $customerSession); } /** @@ -86,7 +72,7 @@ class ForgotPasswordPost extends \Magento\Customer\Controller\Account } try { - $this->_customerAccountService->initiatePasswordReset( + $this->customerAccountService->initiatePasswordReset( $email, CustomerAccountServiceInterface::EMAIL_RESET ); diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php index 751a4258fa5797d142ec6b3844722f489bb4a7af..53d3a7a57e49c3e834e780b473d52c742e3df509 100644 --- a/app/code/Magento/Customer/Controller/Account/LoginPost.php +++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php @@ -24,62 +24,69 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\StoreManagerInterface; use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Core\Helper\Data as CoreHelper; +use Magento\Customer\Helper\Data as CustomerHelper; use Magento\Framework\Exception\EmailNotConfirmedException; use Magento\Framework\Exception\AuthenticationException; +use Magento\Core\App\Action\FormKeyValidator; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class LoginPost extends \Magento\Customer\Controller\Account { - /** @var \Magento\Core\Helper\Data */ + /** @var ScopeConfigInterface */ + protected $scopeConfig; + + /** @var StoreManagerInterface */ + protected $storeManager; + + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** @var CoreHelper */ protected $coreHelperData; - /** @var \Magento\Customer\Helper\Data */ - protected $_customerHelperData; + /** @var CustomerHelper */ + protected $customerHelperData; - /** @var \Magento\Core\App\Action\FormKeyValidator */ - protected $_formKeyValidator; + /** @var FormKeyValidator */ + protected $formKeyValidator; /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Customer\Helper\Address $addressHelper - * @param \Magento\Framework\UrlFactory $urlFactory - * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + * @param Context $context + * @param Session $customerSession + * @param ScopeConfigInterface $scopeConfig + * @param StoreManagerInterface $storeManager * @param CustomerAccountServiceInterface $customerAccountService - * @param \Magento\Core\Helper\Data $coreHelperData - * @param \Magento\Customer\Helper\Data $customerHelperData - * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator + * @param CoreHelper $coreHelperData + * @param CustomerHelper $customerHelperData + * @param FormKeyValidator $formKeyValidator * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Helper\Address $addressHelper, - \Magento\Framework\UrlFactory $urlFactory, - \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + Context $context, + Session $customerSession, + ScopeConfigInterface $scopeConfig, + StoreManagerInterface $storeManager, CustomerAccountServiceInterface $customerAccountService, - \Magento\Core\Helper\Data $coreHelperData, - \Magento\Customer\Helper\Data $customerHelperData, - \Magento\Core\App\Action\FormKeyValidator $formKeyValidator + CoreHelper $coreHelperData, + CustomerHelper $customerHelperData, + FormKeyValidator $formKeyValidator ) { + $this->scopeConfig = $scopeConfig; + $this->storeManager = $storeManager; + $this->customerAccountService = $customerAccountService; $this->coreHelperData = $coreHelperData; - $this->_customerHelperData = $customerHelperData; - $this->_formKeyValidator = $formKeyValidator; - parent::__construct( - $context, - $customerSession, - $addressHelper, - $urlFactory, - $storeManager, - $scopeConfig, - $customerAccountService - ); + $this->customerHelperData = $customerHelperData; + $this->formKeyValidator = $formKeyValidator; + parent::__construct($context, $customerSession); } /** @@ -88,7 +95,7 @@ class LoginPost extends \Magento\Customer\Controller\Account * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - protected function _loginPostRedirect() + protected function loginPostRedirect() { $lastCustomerId = $this->_getSession()->getLastCustomerId(); if (isset( @@ -98,18 +105,18 @@ class LoginPost extends \Magento\Customer\Controller\Account $this->_getSession()->unsBeforeAuthUrl()->setLastCustomerId($this->_getSession()->getId()); } if (!$this->_getSession()->getBeforeAuthUrl() || - $this->_getSession()->getBeforeAuthUrl() == $this->_storeManager->getStore()->getBaseUrl() + $this->_getSession()->getBeforeAuthUrl() == $this->storeManager->getStore()->getBaseUrl() ) { // Set default URL to redirect customer to - $this->_getSession()->setBeforeAuthUrl($this->_customerHelperData->getAccountUrl()); + $this->_getSession()->setBeforeAuthUrl($this->customerHelperData->getAccountUrl()); // Redirect customer to the last page visited after logging in if ($this->_getSession()->isLoggedIn()) { - if (!$this->_scopeConfig->isSetFlag( - \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD, + if (!$this->scopeConfig->isSetFlag( + CustomerHelper::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD, \Magento\Store\Model\ScopeInterface::SCOPE_STORE ) ) { - $referer = $this->getRequest()->getParam(\Magento\Customer\Helper\Data::REFERER_QUERY_PARAM_NAME); + $referer = $this->getRequest()->getParam(CustomerHelper::REFERER_QUERY_PARAM_NAME); if ($referer) { $referer = $this->coreHelperData->urlDecode($referer); if ($this->_url->isOwnOriginUrl()) { @@ -120,10 +127,10 @@ class LoginPost extends \Magento\Customer\Controller\Account $this->_getSession()->setBeforeAuthUrl($this->_getSession()->getAfterAuthUrl(true)); } } else { - $this->_getSession()->setBeforeAuthUrl($this->_customerHelperData->getLoginUrl()); + $this->_getSession()->setBeforeAuthUrl($this->customerHelperData->getLoginUrl()); } - } elseif ($this->_getSession()->getBeforeAuthUrl() == $this->_customerHelperData->getLogoutUrl()) { - $this->_getSession()->setBeforeAuthUrl($this->_customerHelperData->getDashboardUrl()); + } elseif ($this->_getSession()->getBeforeAuthUrl() == $this->customerHelperData->getLogoutUrl()) { + $this->_getSession()->setBeforeAuthUrl($this->customerHelperData->getDashboardUrl()); } else { if (!$this->_getSession()->getAfterAuthUrl()) { $this->_getSession()->setAfterAuthUrl($this->_getSession()->getBeforeAuthUrl()); @@ -143,7 +150,7 @@ class LoginPost extends \Magento\Customer\Controller\Account */ public function execute() { - if ($this->_getSession()->isLoggedIn() || !$this->_formKeyValidator->validate($this->getRequest())) { + if ($this->_getSession()->isLoggedIn() || !$this->formKeyValidator->validate($this->getRequest())) { $this->_redirect('*/*/'); return; } @@ -152,11 +159,11 @@ class LoginPost extends \Magento\Customer\Controller\Account $login = $this->getRequest()->getPost('login'); if (!empty($login['username']) && !empty($login['password'])) { try { - $customer = $this->_customerAccountService->authenticate($login['username'], $login['password']); + $customer = $this->customerAccountService->authenticate($login['username'], $login['password']); $this->_getSession()->setCustomerDataAsLoggedIn($customer); $this->_getSession()->regenerateId(); } catch (EmailNotConfirmedException $e) { - $value = $this->_customerHelperData->getEmailConfirmationUrl($login['username']); + $value = $this->customerHelperData->getEmailConfirmationUrl($login['username']); $message = __( 'This account is not confirmed.' . ' <a href="%1">Click here</a> to resend confirmation email.', @@ -179,6 +186,6 @@ class LoginPost extends \Magento\Customer\Controller\Account } } - $this->_loginPostRedirect(); + $this->loginPostRedirect(); } } diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php index 8129ba9a44e8b18ee734c414c2c10bb76a50ca2b..3bc67d8e6aa8fa1fbebcb001c45eb20d680fffef 100644 --- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php +++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php @@ -24,8 +24,29 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\Context; +use Magento\Customer\Model\Session; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; + class ResetPasswordPost extends \Magento\Customer\Controller\Account { + /** @var CustomerAccountServiceInterface */ + protected $customerAccountService; + + /** + * @param Context $context + * @param Session $customerSession + * @param CustomerAccountServiceInterface $customerAccountService + */ + public function __construct( + Context $context, + Session $customerSession, + CustomerAccountServiceInterface $customerAccountService + ) { + $this->customerAccountService = $customerAccountService; + parent::__construct($context, $customerSession); + } + /** * Reset forgotten password * @@ -51,7 +72,7 @@ class ResetPasswordPost extends \Magento\Customer\Controller\Account } try { - $this->_customerAccountService->resetPassword($customerId, $resetPasswordToken, $password); + $this->customerAccountService->resetPassword($customerId, $resetPasswordToken, $password); $this->messageManager->addSuccess(__('Your password has been updated.')); $this->_redirect('*/*/login'); return; diff --git a/app/code/Magento/Customer/Helper/Data.php b/app/code/Magento/Customer/Helper/Data.php index 3fc9d9fd2968ad86ffb96ffc513820c89f559eee..dc6bba79213e170eb0b5aff13b0992519c2f2b0f 100644 --- a/app/code/Magento/Customer/Helper/Data.php +++ b/app/code/Magento/Customer/Helper/Data.php @@ -70,7 +70,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper /** * Config path to option that enables/disables automatic group assignment based on VAT */ - const XML_PATH_CUSTOMER_VIV_GROUP_AUTO_ASSIGN = 'customer/create_account/viv_disable_auto_group_assign_default'; + const XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN = 'customer/create_account/auto_group_assign'; /** * Config path to support email @@ -500,6 +500,15 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper { $groupId = null; + $isAutoGroupAssign = $this->_scopeConfig->isSetFlag( + self::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $store + ); + if (!$isAutoGroupAssign) { + return $groupId; + } + $vatClass = $this->getCustomerVatClass($customerCountryCode, $vatValidationResult, $store); $vatClassToGroupXmlPathMap = array( diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php index 99cf6d6bdb8e6ad88488324fd32e0b5d905e8dd8..83b77cd509d3f661c9fb3c8da453ef3be1eb0336 100644 --- a/app/code/Magento/Customer/Model/Customer.php +++ b/app/code/Magento/Customer/Model/Customer.php @@ -866,7 +866,11 @@ class Customer extends \Magento\Framework\Model\AbstractModel { if (!$this->hasData('group_id')) { $storeId = $this->getStoreId() ? $this->getStoreId() : $this->_storeManager->getStore()->getId(); - $groupId = $this->_groupService->getDefaultGroup($storeId)->getId(); + $groupId = $this->_scopeConfig->getValue( + \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $storeId + ); $this->setData('group_id', $groupId); } return $this->getData('group_id'); diff --git a/app/code/Magento/Customer/Model/Group.php b/app/code/Magento/Customer/Model/Group.php index 2d2068d49cfb5a2f373589cdf1df95d01bf3e239..7c0211c13697f978a7bb23f47f14679e7a242d50 100644 --- a/app/code/Magento/Customer/Model/Group.php +++ b/app/code/Magento/Customer/Model/Group.php @@ -34,11 +34,6 @@ namespace Magento\Customer\Model; */ class Group extends \Magento\Framework\Model\AbstractModel { - /** - * Xml config path for create account default group - */ - const XML_PATH_DEFAULT_ID = 'customer/create_account/default_group'; - const NOT_LOGGED_IN_ID = 0; const CUST_GROUP_ALL = 32000; @@ -149,7 +144,9 @@ class Group extends \Magento\Framework\Model\AbstractModel */ public function usesAsDefault() { - $data = $this->_storesConfig->getStoresConfigByPath(self::XML_PATH_DEFAULT_ID); + $data = $this->_storesConfig->getStoresConfigByPath( + \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID + ); if (in_array($this->getId(), $data)) { return true; } diff --git a/app/code/Magento/Customer/Service/V1/CustomerGroupService.php b/app/code/Magento/Customer/Service/V1/CustomerGroupService.php index 12abb8020905c9d073010fa11a49088532a1e741..52aa6be08a999c78da030bb7953d7fc05b1e5ead 100644 --- a/app/code/Magento/Customer/Service/V1/CustomerGroupService.php +++ b/app/code/Magento/Customer/Service/V1/CustomerGroupService.php @@ -245,7 +245,7 @@ class CustomerGroupService implements CustomerGroupServiceInterface } try { $groupId = $this->_scopeConfig->getValue( - CustomerGroupModel::XML_PATH_DEFAULT_ID, + \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId ); diff --git a/app/code/Magento/Customer/Service/V1/CustomerGroupServiceInterface.php b/app/code/Magento/Customer/Service/V1/CustomerGroupServiceInterface.php index a635ff9dd42da6fe86c54dadece0f6de968a7d99..98b8e7034d8f26dd202cd7a8989a2551ccce4dca 100644 --- a/app/code/Magento/Customer/Service/V1/CustomerGroupServiceInterface.php +++ b/app/code/Magento/Customer/Service/V1/CustomerGroupServiceInterface.php @@ -28,6 +28,8 @@ namespace Magento\Customer\Service\V1; */ interface CustomerGroupServiceInterface { + const XML_PATH_DEFAULT_ID = 'customer/create_account/default_group'; + const NOT_LOGGED_IN_ID = 0; const CUST_GROUP_ALL = 32000; diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 2606751e6141c20a3c212cbbd3fe48a4aee825b1..1ecbe8de0d0095c2a5b39aab641da25a16bcfc11 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-newsletter": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-review": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-page-cache": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-authorization": "0.1.0-alpha98", - "magento/module-integration": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-newsletter": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-review": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha99", + "magento/module-integration": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml index 5d48956d3341cd88fc8274419b415c2119c6c7bd..5e440b2ebab0ba89494117c2a3f173ac79a0cbd7 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Customer\Block\Adminhtml\Group" name="adminhtml.block.customer.group.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.customer.group.grid" as="grid"> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_cart.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_cart.xml index 7b6f1c29d9f889d6a43726e661fc037cc61dc3a8..42fdd04c61edee3065ce7e87cbaf4a0e334db341 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_cart.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_cart.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\Cart" name="admin.customer.view.edit.cart"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_carts.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_carts.xml index 1b3e905f7166b7800b178ca505a93e6ac0a3ed3b..a86e54962f7641750161725b70d90d129d29a2d0 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_carts.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_carts.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\Carts" name="admin.customer.carts"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml index 03053ea4bd547bcbd4857857784dff656938db9c..a10fef9f7f1307ba3b60e5777617bc1769111108 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Customer\Block\Adminhtml\Edit" name="customer_edit"/> </referenceContainer> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid.xml index cee63688c8b0e423ad93d29e8b794d11c518233d..b0a764a7e4b9fb61ce073990412c7eee5566cdcb 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="customer_index_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid_block.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid_block.xml index 045015c85f1e8aba26b45aab8667088a97c5df4d..1583c5863533cdf4c71be220be3feed9fad64ba2 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid_block.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_grid_block.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="admin.block.customer.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="admin.block.customer.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_index.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_index.xml index 91109be0f3c1e93640e145884007ec84a111385a..3fbd053f8873835b4ce7a9ab20c553e8cea650d9 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_index.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_index.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="customer_index_grid_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_lastorders.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_lastorders.xml index 734feca1cb4a15538dee7b7dfc6498a309261ab5..d0e73ef978957e3acd1f8d08b91b59ab6403f1df 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_lastorders.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_lastorders.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\View\Orders" name="admin.customer.lastorders"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_newsletter.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_newsletter.xml index 0334ebf483d70f90562a7ccabf1cb7f2285596d6..e858e675aea9bca8385b4bc34d96a3c5fa60253d 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_newsletter.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_newsletter.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid" name="admin.customer.newsletter.grid"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_orders.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_orders.xml index 2a7ad35b69f8e45a01b662015d2a35aaf66f4b30..77f925497c75d7e4166af57e402e73bd123059aa 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_orders.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_orders.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\Orders" name="adminhtml.customer.edit.tab.orders"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_productreviews.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_productreviews.xml index 682d3e660cf406b02c203a10ab0fac71ececa453..c22ab176a3793a59c025ee8da755620c8d84d37e 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_productreviews.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_productreviews.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\Reviews" name="admin.customer.reviews"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewcart.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewcart.xml index 05be2b4b98f4405fbcee9fd6347b42a8ca47a9b0..d3f422953e068d3240f26f793f638fa3e5a71480 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewcart.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewcart.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\View\Cart" name="admin.customer.view.cart"/> </container> diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist.xml index d112b92a2ba79d00eba74bca23ba8800f54e5ea5..333de8cd6a649a6106f2d4229ad90d1059c37753 100644 --- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist.xml +++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\View\Wishlist" name="admin.customer.view.wishlist"/> </container> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml index 7fe3000489802adb343b45a8701718649e69f9d5..49482d28ca8a411fb111825baef1b95517eff5ab 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Customer My Account (All Pages)" design_abstraction="custom"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Customer My Account (All Pages)" design_abstraction="custom"> <body> <attribute name="class" value="account"/> </body> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml index 1b6bf3ce5ff22a040342722ab2e7311055f10609..4bf5a631e735d355bc73666f08ae71454e75fad4 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Send confirmation link</title> </head> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml index 223116ce1b4d69c803299c92cacd788338664603..7cec5d48ca8fe4ef79d1d12fb4328cc2b0190b1e 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="customer_account_create_head_components" template="Magento_Customer::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml index 5bb398f8e603c9aaef531c9c76d93a27cee8dadf..fd0c4a6d112440b3abdf66968d2be8c6492192e1 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Reset a Password</title> </head> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml index 6de3569eaa38b1457e34e99310c17a9e49ff55cd..233afffab264b832deadc3b9f2e6740c3438887a 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="customer_account_edit_head_components" template="Magento_Customer::js/components.phtml"/> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml index ce979c44bc76bbc6323263a78bc2d5fef8301a61..8c7a3d96ec8ff487da18ccd412ab4af42c3b66e4 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Forgot Your Password</title> </head> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml index ffda3ac4609c0b991f811e68fff28cade9ade88c..e101de356d8978b351115873668ce9ebb8caffa9 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceBlock name="page.main.title"> <action method="setPageTitle"> @@ -31,7 +31,6 @@ </action> </referenceBlock> <referenceContainer name="content"> - <block class="Magento\Customer\Block\Account\Dashboard\Hello" name="customer_account_dashboard_hello" as="hello" template="account/dashboard/hello.phtml"/> <block class="Magento\Framework\View\Element\Template" name="customer_account_dashboard_top" as="top"/> <block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="account/dashboard/info.phtml"/> <block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="account/dashboard/address.phtml"/> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml index 96e458f82f9ae996fe10c6d4fcd27d2a19b26ff1..3ad7210093c136669c733d23a15ec686431376f5 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <!-- customer.form.login.extra --> <container name="customer.login.container" label="Customer Login Container" htmlTag="div" htmlClass="login container"> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml index 4d618e8a96163165766b3df0b2e8b91b2e208f0f..58fc121782d9130aaf0d2dacc871f5b0388daae9 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="page.main.title"> <action method="setPageTitle"> <argument name="title" translate="true" xsi:type="string">You are now logged out</argument> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml index 99cfdfd59463732a41bb0c73b65ef5b05a3b91ec..29a96a4d6d691ad5e75e13975d942b45f7efcd41 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="customer_page_head_components" template="Magento_Customer::js/components.phtml"/> diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml index 33d54cad6eddf7e750fceb5311833b021096b619..c9159675d91cfd08ddf2e0f26000540e537e98ec 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="customer_address_head_components" template="Magento_Customer::js/components.phtml"/> diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml index 09ed0de1f99e901fb06e966a87a347aac4c1752a..0fcd958c95b1b6f7752afb86ba43d72e50e7e6ac 100644 --- a/app/code/Magento/Customer/view/frontend/layout/default.xml +++ b/app/code/Magento/Customer/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="top.links"> <block class="Magento\Customer\Block\Account\Link" name="my-account-link"> <arguments> diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml index e72b310e9b15d9d8ae112fb54923c2ed6a7b65fa..011b4716a714df476bdaf511a63127e181cf2833 100644 --- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml @@ -47,35 +47,16 @@ NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css * @see \Magento\Customer\Block\Widget\Dob */ ?> -<div class="field dob<?php if ($this->isRequired()) echo ' required' ?>"> - <label class="label" for="<?php echo $this->getFieldId('month')?>"><span><?php echo __('Date of Birth') ?></span></label> +<?php +$fieldCssClass = 'field date field-' . $this->getHtmlId(); +$fieldCssClass .= $this->isRequired() ? ' required' : ''; +?> +<div class="<?php echo $fieldCssClass; ?>"> + <label class="label" for="<?php echo $this->getHtmlId()?>"><span><?php echo $this->getLabel() ?></span></label> <div class="control customer-dob"> - <div class="fields group group-3"> - <?php - $this->setDateInput('d', - '<div class="field dob-day day"> - <label class="label" for="' . $this->getFieldId('day') . '"><span>' . __('DD') . '</span></label> - <div class="control"><input type="text" id="' . $this->getFieldId('day') . '" name="' . $this->getFieldName('day') . '" value="' . $this->getDay() . '" title="' . __('Day') . '" class="input-text validate-custom" ' . $this->getFieldParams() . '></div> - </div>' - ); - - $this->setDateInput('m', - '<div class="field dob-month month"> - <label class="label" for="' . $this->getFieldId('month') . '"><span>' . __('MM') . '</span></label> - <div class="control"><input type="text" id="' . $this->getFieldId('month') . '" name="' . $this->getFieldName('month') . '" value="' . $this->getMonth() . '" title="' . __('Month') . '" class="input-text validate-custom" ' . $this->getFieldParams() . '></div> - </div>' - ); - - $this->setDateInput('y', - '<div class="field dob-year year"> - <label class="label" for="' . $this->getFieldId('year') . '"><span>' . __('YYYY') . '</span></label> - <div class="control"><input type="text" id="' . $this->getFieldId('year') . '" name="' . $this->getFieldName('year') . '" value="' . $this->getYear() . '" title="' . __('Year') . '" class="input-text validate-custom" ' . $this->getFieldParams() . '></div> - </div>' - ); - ?> - <?php echo $this->getSortedDateInputs() ?> - </div> - <input type="hidden" id="<?php echo $this->getFieldId('full')?>" name="<?php echo $this->getFieldName('dob')?>" data-validate="{'validate-dob': ['.dob-day', '.dob-month', '.dob-year', <?php echo $this->isRequired() ? 'true' : 'false' ?>]<?php if ($this->getMinDateRange() && $this->getMaxDateRange()):?>, 'validate-date-between':['<?php echo $this->getMinDateRange()?>', '<?php echo $this->getMaxDateRange()?>']<?php endif;?>}"> - <div class="validation-advice" id="<?php echo $this->getFieldId('date-advice')?>" style="opacity:0.999999; display:none;"></div> + <?php echo $this->getFieldHtml(); ?> + <?php if ($_message = $this->getAdditionalDescription()) : ?> + <div class="note"><?php echo $_message; ?></div> + <?php endif; ?> </div> </div> diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index a15aa5a2ab4ae8f2d55b053beb79373367452a01..483378e0d32898274ad8d71fde92fe97e56faaca 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportcsv.xml b/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportcsv.xml index 5cbb3d519ce89509cede68b073e5c8567eda6e69..3d849759843cc2c38e436bb2c73e87ecba6c21c8 100644 --- a/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportcsv.xml +++ b/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_index_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="admin.block.customer.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportxml.xml b/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportxml.xml index 5cbb3d519ce89509cede68b073e5c8567eda6e69..3d849759843cc2c38e436bb2c73e87ecba6c21c8 100644 --- a/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportxml.xml +++ b/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_import_export_index_exportxml.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_index_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="admin.block.customer.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_index_grid_block.xml b/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_index_grid_block.xml index 2728b24a1788377221c08c664d2be72574d8e359..57ca2d8cefb6be04b698be84768e065c5f173543 100644 --- a/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_index_grid_block.xml +++ b/app/code/Magento/CustomerImportExport/view/adminhtml/layout/customer_index_grid_block.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="admin.block.customer.grid"> <block class="Magento\Backend\Block\Widget\Grid\Export" name="admin.block.customer.grid.export" as="grid.export"> <arguments> diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index 17e3dce6173d364492704c6363f86bc904f3a716..6b7bd9c982195f71ebca8ea9dfcf8765d4c433c1 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_contents.xml b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_contents.xml index 5611bc397c087d6a59a33b915222df16c9856c07..c8fe2858cb41e8d7bc70576b9691d429e65fe172 100644 --- a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_contents.xml +++ b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_contents.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Files\Content\Files" name="editor_files.files" template="Magento_DesignEditor::editor/tools/files/content/files.phtml"/> </container> diff --git a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_index.xml b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_index.xml index 844d664cb24e9d61614de1afc26e66e0a08413dd..437d8353cc4737dae2e874d1dd6f5479111005d8 100644 --- a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_index.xml +++ b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="footer"/> <referenceContainer name="left"> <block class="Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Files\Content" name="editor_files.js" template="Magento_DesignEditor::editor/tools/files/js.phtml"/> diff --git a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_firstentrance.xml b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_firstentrance.xml index ae4d67c378986b67dcb64242327b2cf826ba321e..ad4e7f42bded231ab5176daccc15819a951000f3 100644 --- a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_firstentrance.xml +++ b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_firstentrance.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_DesignEditor::js/bootstrap/edit.js"/> <css src="Magento_DesignEditor::css/styles.css"/> diff --git a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_index.xml b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_index.xml index a1b98032ba728dfd4907dd070b16f5c1a600558f..ec577a515dc550df5af7c40a3955d5164ca7aac3 100644 --- a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_index.xml +++ b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_DesignEditor::js/bootstrap/edit.js"/> <css src="Magento_DesignEditor::css/styles.css"/> diff --git a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_launch.xml b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_launch.xml index 7bff8f9b72a28dc016206b3cc34907a2493130ca..bd87be2c15be7f8294262e9b4ecbf360d4da16c3 100644 --- a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_launch.xml +++ b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_launch.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="id" value="html-body"/> </body> diff --git a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_loadthemelist.xml b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_loadthemelist.xml index 543f087ee5126e1b1cdf65535b2905e6327d541c..c14b9c1a9b64f14ebb27ab48480972f542a98825 100644 --- a/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_loadthemelist.xml +++ b/app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_loadthemelist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\Available" name="available.theme.list" template="Magento_DesignEditor::theme/list/available_ajax.phtml"> <block class="Magento\DesignEditor\Block\Adminhtml\Theme" name="design.editor.theme" as="theme" template="Magento_DesignEditor::theme/available.phtml"/> diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index a6e18f87b530b2cef615f6cd02eb2eab3cca309e..27a24171501ce1b9a3beeae86c98d81ac305d86f 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index 649e7f2cce9ecddf77267301afa58273535cc7e4..27cec5f8ecb70d6a52b4023ed767f1d91926b764 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml index 11bde6d84c3f0db6925054c907623ce676947b7f..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml +++ b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> \ No newline at end of file +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Directory/view/frontend/layout/default.xml b/app/code/Magento/Directory/view/frontend/layout/default.xml index ca17a3fd7c1f5134aef8a3defc3923ff0aad3a49..aea7205e04a70bb18244c700521ae388d71936ee 100644 --- a/app/code/Magento/Directory/view/frontend/layout/default.xml +++ b/app/code/Magento/Directory/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="header.panel"> <block class="Magento\Directory\Block\Currency" name="currency" before="store_language" template="currency.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 29ce648667608faff84868cea8e9d970998b30c3..0ff75b817a638c5faf48e6d6a16cfa87f72fd9d9 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-gift-message": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-msrp": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-gift-message": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-msrp": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml index c30961aec4d3d22c3f613e63a3306fbaae5d0775..bb5bd6ce120ddd61d4b5f75254a2f99acdc7e389 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">downloadable_items</argument> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml index c30961aec4d3d22c3f613e63a3306fbaae5d0775..bb5bd6ce120ddd61d4b5f75254a2f99acdc7e389 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">downloadable_items</argument> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml index 3780fb5d8f88cb026e8d92d0402f248e71d95935..30f822d9f24b65e0b4550eab0e42c82c34829430 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.composite.fieldset"> <block class="Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Downloadable" name="product.composite.fieldset.downloadable" before="product.composite.fieldset.options" template="product/composite/fieldset/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml index c30961aec4d3d22c3f613e63a3306fbaae5d0775..bb5bd6ce120ddd61d4b5f75254a2f99acdc7e389 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">downloadable_items</argument> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/customer_index_wishlist.xml index 139349f9cdc37ba99f783d666dff232db21e573f..80f9ddfa3d603eb5c37743c32366fac8971d0805 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/customer_index_wishlist.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/customer_index_wishlist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer.wishlist.edit.tab"> <arguments> <argument name="product_configuration_helpers" xsi:type="array"> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml index 8f0cb9bd31d14a54603106e7c71647c95ee6be1b..2487c0f8cdba3b0979381183831b52262615ed51 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/creditmemo/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index 8f0cb9bd31d14a54603106e7c71647c95ee6be1b..2487c0f8cdba3b0979381183831b52262615ed51 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/creditmemo/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml index 079d6594d2bf597b2218149c44ba43cdaa62d6f2..6a6a9cca4ace4e74ee611b2783dfe9655dcab88a 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/creditmemo/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml index a28086b3f8d56b6762e3ed9e13d050968905841d..6111b9957b1e39346411b4ed51852a3c678d3c7f 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/invoice/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml index a28086b3f8d56b6762e3ed9e13d050968905841d..6111b9957b1e39346411b4ed51852a3c678d3c7f 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/invoice/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml index dffde9fb6d3112e2950c257fa0060b6e28cc92da..ba09092de3fd3b41ded1012c74d1cf68995e78c7 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/invoice/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml index 4f5bd3ae97696b150682e0c2395ebb770a90cdc7..8e19053b5e2da012c83e8ea77feea504320cf7af 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_name_downloadable" template="sales/items/column/downloadable/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml index fbb9bfe93cfa767c21ff6d5cf179f062ff84b8ac..6ad0d48d9321cd95b894ea58c18e7a6b76f9cd61 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml @@ -23,14 +23,16 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="class" value="page-product-downloadable"/> </body> + <referenceContainer name="product.info.main"> + <block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml" after="product.price.tier" /> + </referenceContainer> <referenceContainer name="product.info.type"> <block class="Magento\Downloadable\Block\Catalog\Product\View\Type" name="product.info.downloadable" as="product_type_data" template="catalog/product/type.phtml"> <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" name="product.info.downloadable.extra" as="product_type_data_extra" template="stockqty/default.phtml"/> - <block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml"/> </block> </referenceContainer> <referenceBlock name="product.info.options.wrapper"> @@ -43,7 +45,20 @@ </block> </block> </referenceBlock> + <referenceContainer name="product.info.options.wrapper.bottom"> + <block class="Magento\Catalog\Pricing\Render" name="product.price.final.copy" before="-"> + <arguments> + <argument name="price_render" xsi:type="string">product.price.render.default</argument> + <argument name="price_type_code" xsi:type="string">final_price</argument> + <argument name="display_msrp_help_message" xsi:type="string">1</argument> + <argument name="zone" xsi:type="string">item_view</argument> + <argument name="id_suffix" xsi:type="string">copy-</argument> + </arguments> + </block> + </referenceContainer> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="downloadable_page_head_components" template="Magento_Downloadable::js/components.phtml"/> </referenceBlock> + <move element="product.info" destination="content" after="product.info.main" /> + <move element="product.info.social" destination="product.info.options.wrapper.bottom" after="-" /> </page> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml index be75e2a58e62d6f1ee333ee6fac440acf6ae4efe..71d0f188b857a3631389e92b341c7b81626ddcfa 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view_type_downloadable"/> </page> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml index bdd5ec99c4209259104aeeb661b38256161a4a14..d5b93ff7bf6ca27cef093e1ed55ce08baede5782 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.item.renderers"> <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="checkout/cart/item/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index 9b7dc670854ca7ab3d857d5031ac4fd0093dab98..602e31c2b444595909a53b3072f5483e7393a108 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.sidebar.item.renderers"> <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="Magento_Checkout::cart/sidebar/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml index b66a06c83294769ede3eb4bde11c3694db98b4fa..d37c5a9304470d61e0b2b5b29f3f67c9d5a0b764 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.onepage.review.item.renderers"> <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="Magento_Checkout::onepage/review/item.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_success.xml index 6233242047dd5a821d3cc8e6bbb79495289080fb..a2a7cbb283d2c7b26aa012293151e5ed847284d0 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_onepage_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.success"> <block class="Magento\Downloadable\Block\Checkout\Success" name="downloadable.checkout.success" template="checkout/success.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml index 2b93c6d057e3efceea1f3c1f2bc38b5297c38eda..1db5ed471e3c85637b36d8d7c1c1bb2d4da8a73e 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_account_navigation"> <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-downloadable-products-link"> <arguments> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml b/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml index 3cfb243e6b7e810a09ba1fffdc6f88b765d147b5..8d516c4760ebd6157b3360db809af721f8d5ae4a 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Downloadable\Block\Customer\Products\ListProducts" name="downloadable_customer_products_list" template="customer/products/list.phtml"/> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_success.xml index 44b6fedfa533e2325e11a7a2c3b5a6a00bcc279e..efa0545fdd86c9207b3b28749fc99eb22471bc60 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_success.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/multishipping_checkout_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout_success"> <block class="Magento\Downloadable\Block\Checkout\Success" name="downloadable.checkout.success" template="checkout/success.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml index 4f26536566b3a49dc7b0af279a059c9701eb96f7..28fba6b3cb016b9657e76856b21fd66682ff4344 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.creditmemo.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable" as="downloadable" template="email/order/items/creditmemo/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml index 692ea3067e0740176987eb1eac7f8df4374fa27b..755331cb482016b61620782671f290f7455fdb5e 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.invoice.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable" as="downloadable" template="email/order/items/invoice/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml index 0fdd84c0669ce96b745b6c067744e653347cfadc..16547044fa542e10e740a8132641ec875a12ef71 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_email_order_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.email.order.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Email\Items\Order\Downloadable" as="downloadable" template="email/order/items/order/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml index 174e000ff17b6a676f6432cba25c9216427f8c9e..61db3d7f3922467c7b213daff79e802846f0e5fb 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.creditmemo.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable" as="downloadable" template="sales/order/creditmemo/items/renderer/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml index c3ea08a88cb2dae92efe340cadc2353d7fd23a91..e64824cb739ffe738929f9fdd532f1a18c1c58dd 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.invoice.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable" as="downloadable" template="sales/order/invoice/items/renderer/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml index fe8139f3ba19837ccf7e3a3ef67ebaf1d11cb1e4..c6f1071216d33f4f7dcebf33e95e2be84b9f8b7b 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.items.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable" as="downloadable" template="sales/order/items/renderer/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml index db6fe7be41083fb506cf4def6386e61195824940..60166ac7b2b78698465784ff3cb8e24b4cc7dc4b 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.creditmemo.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable" as="downloadable" template="sales/order/creditmemo/items/renderer/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml index 9696092756b7d4c104a71025910408943d5856f1..2a9418920e1a4dca1bb08ee184ddc4c4d1d49526 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.invoice.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable" as="downloadable" template="sales/order/invoice/items/renderer/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml index 6f738bce9585a1b00915cdfabc72c070c17889ee..02bb06e747ade6f581a2d82b0f4dc1bad56daf5b 100644 --- a/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml +++ b/app/code/Magento/Downloadable/view/frontend/layout/sales_order_print_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.renderers"> <block class="Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable" as="downloadable" template="sales/order/items/renderer/downloadable.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 54e4f1f2853ccbec6b7ca802c0c1774325bffbca..56733a7de084fd87fdcf6bcf0600e2d74b696be5 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index 00e01ba77459fa5fabb4a3f61f44b443a3c80959..bd66dbac1126d7a45f9e740ac57048a68aef662d 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_edit.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_edit.xml index fd109d1916649b74a3147e49b3362a3d4cb3ce07..12368d58fa2ba78de56b5927e204cfe00ab58bb4 100644 --- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_edit.xml +++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_Email::js/bootstrap.js"/> </head> diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid.xml index 0c9a623cc4a9bf579e90ae01110fac4ada82acf5..663e964267fb07dad5f8092a4673143b1eefc8e8 100644 --- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid.xml +++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_email_template_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml index 65bb7bec189f9029418f1829c4a88983e818ea72..8107c1e00ded69e1ae58a031808365d8968c7b4d 100644 --- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml +++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.system.email.template.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.email.template.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_index.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_index.xml index 7aa58115f1e4473862849d375bf42854b67948d0..fe3c8049cd51b9dd46818ad04c25b6cb27210548 100644 --- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_index.xml +++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_email_template_grid_block"/> <referenceContainer name="content"> <block class="Magento\Email\Block\Adminhtml\Template" name="adminhtml.system.email.template.container"/> diff --git a/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml b/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml index 4ab41a0fd66cb6e74acef4041a042fec31dc8f22..f01a08997e2099e90393a65d7a54ee53471572aa 100644 --- a/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml +++ b/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Framework\View\Element\Template" name="page.block" template="Magento_Email::template/preview.phtml"> <block class="Magento\Email\Block\Adminhtml\Template\Preview" name="content" as="content"/> diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index 32b84ec73ef3c2af021ebbd68c12e59ce11eed16..35cac1d39fd6e10b3b75b66ac4f33e443784c145 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index b6f223ae1fab03eeb20190f44b0192445cc372e1..1fad6737923706adba272deaa661f32da338f84c 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-multishipping": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-multishipping": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml index 1a8bbcbcc11d570998a79b4cc4338c0d9fb0350b..f81900e39874ce67f40b29388e19b8ad96e61b72 100644 --- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml +++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_item_extra_info"> <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Giftoptions" name="gift_options_link" template="sales/order/create/giftoptions.phtml"> <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Items" name="gift_options_item_data" template="sales/order/create/items.phtml"/> diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml index 1a8bbcbcc11d570998a79b4cc4338c0d9fb0350b..f81900e39874ce67f40b29388e19b8ad96e61b72 100644 --- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml +++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_item_extra_info"> <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Giftoptions" name="gift_options_link" template="sales/order/create/giftoptions.phtml"> <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Items" name="gift_options_item_data" template="sales/order/create/items.phtml"/> diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml index 1a8bbcbcc11d570998a79b4cc4338c0d9fb0350b..f81900e39874ce67f40b29388e19b8ad96e61b72 100644 --- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml +++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_item_extra_info"> <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Giftoptions" name="gift_options_link" template="sales/order/create/giftoptions.phtml"> <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Items" name="gift_options_item_data" template="sales/order/create/items.phtml"/> diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml index 7101a6292d6b7420486d40476c8eea48e77407b0..84c3c06ad63331e95af5d8a0586996592d9180f6 100644 --- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="Magento_Core::prototype/magento.css"/> </head> diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml index 8c19cffdf49867f7e1eb7b0e126ff26ab9d15f5b..2bbaa2ba473e83349a1dc802cb469b0b92b89fd3 100644 --- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml +++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml @@ -177,9 +177,8 @@ require([ <label for="allow_gift_options_<?php echo $this->getEntity()->getId() ?>" class="label"><span><?php echo __('Add gift options') ?></span></label> </div> - <dl class="block items" id="allow-gift-options-container-<?php echo $this->getEntity()->getId() ?>"> - <dt id="add-gift-options-for-order-<?php echo $this->getEntity()->getId() ?>" class="order"> - <div class="title"><span><?php echo __('Gift Options for this address.'); ?></span></div> + <dl class="options-items" id="allow-gift-options-container-<?php echo $this->getEntity()->getId() ?>"> + <dt id="add-gift-options-for-order-<?php echo $this->getEntity()->getId() ?>" class="order-title"> <div class="field choice"> <input type="checkbox" name="allow_gift_options_for_order_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?php echo $this->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="allow_gift_options_for_order_<?php echo $this->getEntity()->getId() ?>" class="label"><span><?php echo __('Add gift options for the Entire Order') ?></span></label> @@ -191,7 +190,7 @@ require([ <?php if ($this->isMessagesAvailable()): ?> <?php $_giftMessage = true; ?> <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>"}}'><?php echo __('Gift Message') ?></a> - <div id="gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>" class="block message hidden"> + <div id="gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>" class="gift-messages-order hidden"> <fieldset class="fieldset"> <p><?php echo __('You can leave this box blank if you do not wish to add a gift message for this address.') ?></p> <div class="field from"> @@ -218,28 +217,27 @@ require([ </dd> <?php if ($this->isItemsAvailable()): ?> - <dt id="add-gift-options-for-items-<?php echo $this->getEntity()->getId() ?>" class="individual"> - <div class="title"><span><?php echo __('Gift Options for Individual Items'); ?></span></div> + <dt id="add-gift-options-for-items-<?php echo $this->getEntity()->getId() ?>" class="order-title individual"> <div class="field choice"> <input type="checkbox" name="allow_gift_options_for_items_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?php echo $this->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="allow_gift_options_for_items_<?php echo $this->getEntity()->getId() ?>" class="label"><span><?php echo __('Add gift options for Individual Items') ?></span></label> </div> </dt> - <dd id="allow-gift-options-for-items-container-<?php echo $this->getEntity()->getId() ?>" class="options individual"> - <ol> + <dd id="allow-gift-options-for-items-container-<?php echo $this->getEntity()->getId() ?>" class="order-options individual"> + <ol class="items"> <?php foreach($this->getItems() as $_index=>$_item): ?> <?php $_product=$_item->getProduct() ?> <li class="item"> - <p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p> <div class="product"> + <div class="number"><?php echo __('<span>Item %1</span> of %2', $_index+1, $this->countItems()) ?></div> <div class="img photo container"> <?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?> <?php echo $imageBlock->init($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?> </div> - <strong class="product name"><?php echo $this->escapeHtml($_product->getName()) ?></strong> + <strong class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></strong> </div> - <div class="item options"> + <div class="options"> <div class="options-items-container" id="options-items-container-<?php echo $this->getEntity()->getId() ?>-<?php echo $_item->getId() ?>"></div> <input type="hidden" name="giftoptions[quote_address_item][<?php echo $_item->getId() ?>][address]" value="<?php echo $this->getEntity()->getId()?>" /> @@ -280,15 +278,15 @@ require([ <dt class="extra-options-container" id="extra-options-container-<?php echo $this->getEntity()->getId() ?>"></dt> </dl> </fieldset> - <script type="text/javascript"> -require(['jquery', 'mage/mage'], function(jQuery){ +<script type="text/javascript"> + require(['jquery', 'mage/mage'], function(jQuery){ - jQuery('#allow_gift_options_<?php echo $this->getEntity()->getId() ?>') - .add('#allow_gift_options_for_order_<?php echo $this->getEntity()->getId() ?>') - .add('#allow_gift_options_for_items_<?php echo $this->getEntity()->getId() ?>') - .mage('giftOptions'); - -}); + jQuery('#allow_gift_options_<?php echo $this->getEntity()->getId() ?>') + .add('#allow_gift_options_for_order_<?php echo $this->getEntity()->getId() ?>') + .add('#allow_gift_options_for_items_<?php echo $this->getEntity()->getId() ?>') + .mage('giftOptions'); + + }); </script> <?php break; ?> <?php endswitch ?> diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 30d86f3de8621b045209c8c79b26d6796163e825..a0b8bf47eab8fec67fd633ac1a0410f821c75e88 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml index 04767858e601fa8a67d15bf15770b26964b77a7b..771022f1eff10d7400b4f76838d595286892e7be 100644 --- a/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\GoogleAdwords\Block\Code" name="google.adwords.code" template="code.phtml"/> </referenceContainer> diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index d37451ce687547026391035ffb81bd2796363854..0dd38270051288eb0fb21dff28dc6a837ef6217c 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml index ba1d676c236fdd229806e1ef6a838671d30c3bac..8f228b649f330985f6b2a8125570cfde9a383d02 100644 --- a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml +++ b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml @@ -23,8 +23,8 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> - <referenceContainer name="after_body_start"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <referenceContainer name="after.body.start"> <block class="Magento\GoogleAnalytics\Block\Ga" name="google_analytics" as="google_analytics" template="ga.phtml"/> </referenceContainer> </page> diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index 61834880cdddb83647ebae6a64f42c99cc70f157..a971bab4db4d8f7a5b146275e46053f5dcb09f9d 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-google-analytics": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-google-analytics": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml index f4994744affc3cafa8f34a7db41d8e3efb593745..21b5bc5e38cc5c5477dff8a9f5373f46722bbc5f 100644 --- a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml +++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="cms_page_edit_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">google-experiment</argument> diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml index 6dafa0833c9290abb2f5f0d9496e469ba73a1bd5..bb6873e23ad03e77435ca8bb6ea56c849c8d146e 100644 --- a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">google-experiment</argument> diff --git a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml index 5f6e4a8562614a59c981dfb462ce59cd9413d23f..91a83d5bac467006d3395a4484c0d2787c16f510 100644 --- a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="after.body.start"> <block class="Magento\GoogleOptimizer\Block\Code\Category" before="-" name="googleoptimizer.experiment.script"/> </referenceContainer> diff --git a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml index c8e69375781eb29509cd2ede0946093be5335805..9167cac80984fb00dc304251a402769ab1d34cc9 100644 --- a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="after.body.start"> <block class="Magento\GoogleOptimizer\Block\Code\Product" before="-" name="googleoptimizer.experiment.script"/> </referenceContainer> diff --git a/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml b/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml index c8f53e719a5fe0b4b803df743ea2a9ae82a99736..9a0c00b8d54d82866570ddd61c15c5640f42ab01 100644 --- a/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml +++ b/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="after.body.start"> <block class="Magento\GoogleOptimizer\Block\Code\Page" before="-" name="googleoptimizer.experiment.script"/> </referenceContainer> diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index a745694b62e9ddbfbde188d9e9beb50339ec724b..b8da01b942a1d5e2172c8f59a5de0244d33adf96 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml index 5ff3bd78037aa4b3fcb0870a2ebfec4b64dbf7bd..a0600a8c3194937b3de361f5e1f56c51da8abdc7 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_GoogleShopping::js/bootstrap.js"/> </head> diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml index 55726205dbaa555470674afc066a3fef32c3fbad..a7e7f571bc7e7830a68a0adeebe9d524c799b32b 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="googleshopping.types.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.googleshopping.types.grid" as="grid"> <arguments> diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml index 3847e080441e7f05e75d0a621974c1de45027000..ebb70097ff7f529d6d8d8ab8e69d53e4056da72c 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_googleshopping_types_block"/> <container name="root"> diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml index b193cabf7143bab6c62d6d65469e3922d1d5d581..281d1e56d2f6388c9ad9a448e2ebca8a68384048 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="adminhtml_googleshopping_types_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml b/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml index 48ddf5978c5c2ceb32386a93df7494ba2c4f0a5d..7154d2ab1e15bc2132468eeec7b9fbce28052708 100644 --- a/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml +++ b/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="after.body.start"> <block class="Magento\GoogleShopping\Block\SiteVerification"/> </referenceContainer> diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index c6f0282751b99c5c4aa20b2d62cb402fa9ad35b7..24eee9c8ca0faaefd494e12082f78bf13a01dbb0 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-catalog-import-export": "0.1.0-alpha98", - "magento/module-grouped-product": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-catalog-import-export": "0.1.0-alpha99", + "magento/module-grouped-product": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 157c79664c81a3d2a47dbed9513e8bfc07f0d1f5..105c39d73cecfe4becd4df7c264a8d4f1512c848 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-msrp": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-msrp": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml index e40ba57b44a27e5ebac7450e96466903ec25feb2..de004287bbd550bb32b27e70b70b5cf82df31561 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="groupedproduct_popup_grid"/> <head> <css src="Magento_GroupedProduct::css/grouped-product.css"/> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml index 5360a6ce095e9836a084818f7fbb9a5b2b78b8df..e26f78d9cd00cef77da2dcf12c5e254d52f52f26 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\Framework\View\Element\Template" template="Magento_GroupedProduct::product/stock/disabler.phtml"/> </referenceContainer> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml index b041dbba665ff34bae91828012778a1ed3143e87..d7eb6329e387fce47016093b7fa35bdae7f82edd 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.composite.fieldset"> <block class="Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped" name="product.composite.fieldset.grouped" before="product.composite.fieldset.options" template="catalog/product/composite/fieldset/grouped.phtml"/> <remove name="product.composite.fieldset.qty"/> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml index d23628c37125fc20db3f8db6d48d22db3e06e819..e8309072286ba9c0f4115082ac7489add20e8ef5 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="catalog_product_grouped"/> <container name="root"> <block class="Magento\Backend\Block\Widget\Grid\Container" name="catalog.product.edit.tab.super.grid.popup.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml index 753488728ae1d4864544e47d1c8579b6ca1c431b..d7f5b87fced0e30e4cd0064c142478ad6b87c16e 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="catalog.product.edit.tab.super.grid.popup.container"> <block class="Magento\Backend\Block\Widget\Grid" name="catalog.product.edit.tab.super.group.popup" as="grid"> <arguments> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml index 00181c29d9dbd7101a15f95672a3f45ba799ec12..0d378f8b19a4f91ec1335718e8f60bc4b7229e22 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index 00181c29d9dbd7101a15f95672a3f45ba799ec12..0d378f8b19a4f91ec1335718e8f60bc4b7229e22 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml index 22c8958e3b4f14077c030fd7b38c6b84dbd55b0c..40c89c4e475386d34fa11e09afb3c5fac1ff30f1 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml index 00181c29d9dbd7101a15f95672a3f45ba799ec12..0d378f8b19a4f91ec1335718e8f60bc4b7229e22 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml index 00181c29d9dbd7101a15f95672a3f45ba799ec12..0d378f8b19a4f91ec1335718e8f60bc4b7229e22 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml index 2f2706f0ad4d23d5190c9c1c8fc3214972b2bfe9..5839c6fae2394727a14895abf4181b1fa0a35f27 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml index 00181c29d9dbd7101a15f95672a3f45ba799ec12..0d378f8b19a4f91ec1335718e8f60bc4b7229e22 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\GroupedProduct\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="Magento_Sales::items/column/name.phtml" group="column"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml index c79defd79eba87c22b6ef84bc1996ca2ed889727..a5b32d96478de7c94930cdd1bc85a8032fc04dc1 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml @@ -24,12 +24,11 @@ ?> <script type="text/javascript"> require(['jquery'], function($){ - $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) { if (e.productType === 'grouped') { + e.stopPropagation(); return false; } }); - }); </script> diff --git a/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml b/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml index bd252f53f43ebda4f022bad0fc2bcbb4baaf5fac..682cdc69cbea570dbafa7ae78e2202e0e8a84b59 100644 --- a/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="render.product.prices"> <arguments> <argument name="grouped" xsi:type="array"> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml index 01274abfeaa5308f1031b0b16194acaf9753e580..6096237b090a741e757ce82d2dd49863331f7987 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Framework\Pricing\Render" name="product.price.render.grouped"> <arguments> <argument name="price_render_handle" xsi:type="string">catalog_product_prices</argument> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml index f157c3dc85484444f99fd117340f1acf8c638aed..506bf1718da08b33f165409a9949c31104089666 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml @@ -23,7 +23,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <body> + <attribute name="class" value="page-product-grouped"/> + </body> <referenceContainer name="product.info.form.content"> <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="product/view/type/grouped.phtml"/> <container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml index 534237f5f2432ba32a56968332356224c20e5aa1..e28ab0ee9bed7cfdce3cf6c6fe3cc919726194d4 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.item.renderers"> <block class="Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped" as="grouped" template="Magento_Checkout::cart/item/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index 5037d6ab8e87559cb6c6dca852783cb0ab594d88..f86ce5c6a1047b1a1d5e515a8a96f871333aac69 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.cart.sidebar.item.renderers"> <block class="Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped" as="grouped" template="Magento_Checkout::cart/sidebar/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml index 477c5dfe9fde0232ac96512f2c7beb78e5958dde..8cc7148842228af1b30c0e16230bb8d4e14d0914 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.onepage.review.item.renderers"> <block class="Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped" as="grouped" template="Magento_Checkout::onepage/review/item.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml index d5a9e85466e186e97b62a8f6ea49136f00251e77..11fccaa410991a9cb419b6a17f77e917b97682c6 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> <referenceBlock name="sales.email.order.creditmemo.renderers"> <block class="Magento\GroupedProduct\Block\Order\Email\Items\Order\Grouped" as="grouped" template="Magento_Sales::email/items/creditmemo/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml index 3ef1ea6d5dd5c0d7be176df47eaaf79ddae6b095..46c53cfc1307221c3838354058c26f2523ba55ed 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Invoice Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Invoice Items List" design_abstraction="custom"> <referenceBlock name="sales.email.order.invoice.renderers"> <block class="Magento\GroupedProduct\Block\Order\Email\Items\Order\Grouped" as="grouped" template="Magento_Sales::email/items/invoice/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml index 4244ff7d511a99144252d4ef502b73e9034a737f..675f206e4f31c649d1522c53e20b33546f09bcba 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Order Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Order Items List" design_abstraction="custom"> <block name="sales.email.order.renderers"> <block class="Magento\GroupedProduct\Block\Order\Email\Items\Order\Grouped" as="grouped" template="Magento_Sales::email/items/order/default.phtml"/> </block> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml index 9df7cf6639d8c764c507f7823c3cac7235b4dcfc..e697612034cb5d5ebd51d14d231f31357b6e46bc 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.invoice.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/invoice/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml index 9f32e9a595e5d695e4ebcbcad3a093efd8a90aff..c28802936da115257a65d9f9267631f2d14c0b96 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.creditmemo.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/creditmemo/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml index 9df7cf6639d8c764c507f7823c3cac7235b4dcfc..e697612034cb5d5ebd51d14d231f31357b6e46bc 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.invoice.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/invoice/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml index 5add41f8b1101950023d18dab2a4f6d8b8b0fcce..2da4237857c1735ca6df6a519e777bcadcde0cd8 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.items.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml index 099a0d75ab1fe596f86255723fca052ff49d7d37..6763f97aa426b6be382893ccb270f73213f77934 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.creditmemo.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/creditmemo/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml index 833610a391880970b98b2a6eaf403e3694f1f15a..9b1db40e5efb9c2c0b99780f6153deed2991f5ff 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="checkout.order.print.invoice.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/invoice/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml index d60e003153b0548076a8a017e84e1a4e99fcfba0..fdbef13de242ac435fc8e0f96bcac71eea81c766 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.renderers"> <block class="Magento\GroupedProduct\Block\Order\Item\Renderer\Grouped" as="grouped" template="Magento_Sales::order/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index 0893d2ffac4946bc162885cdf8df3f30b9798e3d..c4df769cd1cb5ddf8a77c0d6f7446ed53af3f5e2 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml index e732b8a72c1b13fb2c4d0e6f2e47ebc99f02dd52..f71d119db7eca3b03fa44fc34cd70712ea942139 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\ImportExport\Block\Adminhtml\Export\Filter" name="export.filter"/> <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/filter/after.phtml" name="export.form.after" as="form_after"/> diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml index ac895c6fd1fc61661ea79877403f704f730c25d0..d07c5087acdcd5dff78b2b60e15c49b9fcac1835 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/before.phtml" name="export.form.before" as="form_before"/> <block class="Magento\ImportExport\Block\Adminhtml\Export\Edit" name="export.form.container"/> diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml index 479436acd5b32075f0f06994e6c769c5c404a8ec..da4b7e44fac53508e8f8950edb56fc5b6c5445fb 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Framework\View\Element\Template" template="Magento_ImportExport::busy.phtml" name="busy" as="busy"/> </referenceContainer> diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml index f0939e9e998212e818a2e5e7a77d98e89d895fff..464c563ece8231f877f07ba25fd54e72a41edeca 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\ImportExport\Block\Adminhtml\Import\Edit\Before" template="Magento_ImportExport::import/form/before.phtml" name="import.form.before" as="form_before"/> <block class="Magento\ImportExport\Block\Adminhtml\Import\Edit" name="import.form.container"/> diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml index 8e45931900594c835567a86af9482a84bdc9fec2..038b61cf25e046a8e43080f14ea9f647a56bd05a 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\ImportExport\Block\Adminhtml\Import\Frame\Result" template="import/frame/result.phtml" name="import.frame.result" as="import_frame_result"/> </container> diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml index 8e45931900594c835567a86af9482a84bdc9fec2..038b61cf25e046a8e43080f14ea9f647a56bd05a 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\ImportExport\Block\Adminhtml\Import\Frame\Result" template="import/frame/result.phtml" name="import.frame.result" as="import_frame_result"/> </container> diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index c077d1cb6d95aa184f6945f4a8e1e771ee5f94bb..89158bdb712fd48be333a40b1ebdccc8165b9a67 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-page-cache": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml index 1fba3b04c1b249dbc91808c6e9f2d5f6f42862a5..114704ab23474dfc4d4657be43a3829a7c1ca76a 100644 --- a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml +++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="indexer_indexer_list_grid"/> <referenceContainer name="content"> <block class="Magento\Indexer\Block\Backend\Container" name="adminhtml.indexer.grid.container"/> </referenceContainer> -</page> \ No newline at end of file +</page> diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml index 7838f6daa6e5ff6a36ea9fe49a7aa99f22e5aef4..14d756faa8b78a403450635eec04acb7e743ae0a 100644 --- a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml +++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.indexer.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.indexer.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Install/Block/Begin.php b/app/code/Magento/Install/Block/Begin.php deleted file mode 100644 index 1cd3952eb00c199071d5a97d3911c608a8a8cd8c..0000000000000000000000000000000000000000 --- a/app/code/Magento/Install/Block/Begin.php +++ /dev/null @@ -1,87 +0,0 @@ -<?php -/** - * Magento - * - * NOTICE OF LICENSE - * - * This source file is subject to the Open Software License (OSL 3.0) - * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magentocommerce.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade Magento to newer - * versions in the future. If you wish to customize Magento for your - * needs please refer to http://www.magentocommerce.com for more information. - * - * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Installation begin block - */ -namespace Magento\Install\Block; - -class Begin extends \Magento\Install\Block\AbstractBlock -{ - /** - * @var string - */ - protected $_template = 'begin.phtml'; - - /** - * Eula file name - * - * @var string - */ - protected $_eulaFile; - - /** - * @param \Magento\Framework\View\Element\Template\Context $context - * @param \Magento\Install\Model\Installer $installer - * @param \Magento\Install\Model\Wizard $installWizard - * @param \Magento\Framework\Session\Generic $session - * @param null $eulaFile - * @param array $data - */ - public function __construct( - \Magento\Framework\View\Element\Template\Context $context, - \Magento\Install\Model\Installer $installer, - \Magento\Install\Model\Wizard $installWizard, - \Magento\Framework\Session\Generic $session, - $eulaFile = null, - array $data = array() - ) { - $this->_eulaFile = $eulaFile; - parent::__construct($context, $installer, $installWizard, $session, $data); - } - - /** - * Get wizard URL - * - * @return string - */ - public function getPostUrl() - { - return $this->getUrl('install/wizard/beginPost'); - } - - /** - * Get License HTML contents - * - * @return string - */ - public function getLicenseHtml() - { - return $this->_eulaFile ? $this->_filesystem->getDirectoryRead( - \Magento\Framework\App\Filesystem::ROOT_DIR - )->readFile( - $this->_eulaFile - ) : ''; - } -} diff --git a/app/code/Magento/Install/Model/Installer.php b/app/code/Magento/Install/Model/Installer.php index 5d5984ce81edbca779456990eb4a2eebd8cad3c4..c65795f30daba6db0ba9bd48641507a34b513ee0 100644 --- a/app/code/Magento/Install/Model/Installer.php +++ b/app/code/Magento/Install/Model/Installer.php @@ -401,7 +401,7 @@ class Installer extends \Magento\Framework\Object } if (!empty($data['admin_no_form_key'])) { - $this->_installSetup->setConfigData('admin/security/use_form_key', 0); + $this->_installSetup->setConfigData(\Magento\Backend\Model\Url::XML_PATH_USE_SECURE_KEY, 0); } $unsecureBaseUrl = $this->_storeManager->getStore()->getBaseUrl('web'); diff --git a/app/code/Magento/Install/composer.json b/app/code/Magento/Install/composer.json index e77069c40ddce51028c8bbdec7c43e0081c8f8ee..d97e8728870e1224cefa55cb4d3279045b5ea661 100644 --- a/app/code/Magento/Install/composer.json +++ b/app/code/Magento/Install/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Install/etc/di.xml b/app/code/Magento/Install/etc/di.xml index d324d9ebac622d45777eac2c21ba38535e6b0dde..d937d383f98abdc68a19b65f66c36abf3d3e069e 100644 --- a/app/code/Magento/Install/etc/di.xml +++ b/app/code/Magento/Install/etc/di.xml @@ -43,12 +43,6 @@ </argument> </arguments> </type> - <type name="Magento\Install\Block\Begin"> - <arguments> - <argument name="eulaFile" xsi:type="string">LICENSE.html</argument> - <argument name="session" xsi:type="object">Magento\Install\Model\Session</argument> - </arguments> - </type> <type name="Magento\Install\Block\End"> <arguments> <argument name="cryptKey" xsi:type="init_parameter">Magento\Framework\Encryption\Encryptor::PARAM_CRYPT_KEY</argument> diff --git a/app/code/Magento/Install/view/adminhtml/layout/default.xml b/app/code/Magento/Install/view/adminhtml/layout/default.xml index 3bacc7545573010403ab3d37ddcbf041c42e472b..926dc03ac0142350ada1a9f092c03525e88d46ee 100644 --- a/app/code/Magento/Install/view/adminhtml/layout/default.xml +++ b/app/code/Magento/Install/view/adminhtml/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_Install::survey_notification.js"/> </head> diff --git a/app/code/Magento/Install/view/install/layout/install_wizard.xml b/app/code/Magento/Install/view/install/layout/install_wizard.xml index fe808ace143a74cfca9169246df299958417a933..202c11765cef93f8ca7362feb4ce2ffaa35ddecc 100644 --- a/app/code/Magento/Install/view/install/layout/install_wizard.xml +++ b/app/code/Magento/Install/view/install/layout/install_wizard.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Framework\View\Element\Template" name="page.block"> <action method="setTemplate"> diff --git a/app/code/Magento/Install/view/install/layout/install_wizard_config.xml b/app/code/Magento/Install/view/install/layout/install_wizard_config.xml index 3badd73bdf650da82c7aa160bebe9100a21ca57b..789941b22da00da52c9d36db82e908d1e871d144 100644 --- a/app/code/Magento/Install/view/install/layout/install_wizard_config.xml +++ b/app/code/Magento/Install/view/install/layout/install_wizard_config.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="database"> <action method="setTemplate"> <argument name="template" xsi:type="string">db/main.phtml</argument> diff --git a/app/code/Magento/Install/view/install/templates/begin.phtml b/app/code/Magento/Install/view/install/templates/begin.phtml deleted file mode 100644 index 9ab46265ed829b0cab596dd72767b0c051a4154f..0000000000000000000000000000000000000000 --- a/app/code/Magento/Install/view/install/templates/begin.phtml +++ /dev/null @@ -1,63 +0,0 @@ -<?php -/** - * Magento - * - * NOTICE OF LICENSE - * - * This source file is subject to the Academic Free License (AFL 3.0) - * that is bundled with this package in the file LICENSE_AFL.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magentocommerce.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade Magento to newer - * versions in the future. If you wish to customize Magento for your - * needs please refer to http://www.magentocommerce.com for more information. - * - * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - */ - -/** - * Installation start page - * - * @see \Magento\Install\Block\Begin - */ -?> -<div class="page-head"> - <h3><?php echo __("Welcome to Magento's Installation Wizard") ?>!</h3> -</div> -<?php echo $this->getLayout()->getMessagesBlock()->getGroupedHtml() ?> -<?php if (count($this->getLayout()->getMessagesBlock()->getMessages()) == 0): ?> -<form action="<?php echo $this->getPostUrl() ?>" method="post"> - <div - style="height:20em; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;"> - <?php echo $this->getLicenseHtml() ?> - </div> - <p> - <input type="checkbox" name="agree" value="1" id="agree" class="checkbox"/> - <label for="agree"><?php echo __('I agree to the above terms and conditions.') ?></label> - </p> - - <div class="button-set"> - <button class="form-button mage-disabled" type="submit" id="submitButton" disabled="disabled"> - <span><?php echo __('Continue') ?></span></button> - </div> -</form> -<script type="text/javascript"> -require([ - "jquery", - "Magento_Install/js/install" -], function($){ - -//<![CDATA[ - $.mage.install.begin('#agree', '#submitButton'); -//]]> - -}); -</script> -<?php endif ?> diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index ac122e1c5aa8d19ed56562df0c712ec698b1add2..aceae5052c4141bfff48f20b8f5ac0de7627321d 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-authorization": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml index c32013899ef227a1614e7d0b55592420ef858b1f..3a54525dece7a09ccb8ccb93e38f1ba179a3fc5d 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <referenceContainer name="left"> <block class="Magento\Integration\Block\Adminhtml\Integration\Edit\Tabs" name="integration_edit_tabs"> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml index 2325b44b985e3f6aebc52569a8dcefad627655f2..25a665b1451d0cbf5d3983d63c6f21d922d49e89 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="adminhtml_integration_grid_block"/> <container name="root"> <block class="Magento\Integration\Block\Adminhtml\Integration" name="integration.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml index 152395b8753eb66f8e0b58dfe132777b35786444..16623b926c1c6eb50d116e7b109c03672fa9f9ab 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="integration.grid.container"> <block class="Magento\Integration\Block\Adminhtml\Integration\Grid" name="integration.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml index aa065fb1b8a54d9e2bf014597a1844f8f95d6391..310e194d57c02daeac1b896aced4705c716368ba 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="Magento_Integration::integration.css"/> </head> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml index 1a7a5a6f04a07aee52c69f3bdabd66f0735e68a7..82ffd3d25250e5946de706b4030da0574cdbdf40 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="Magento_Integration::integration.css"/> </head> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml index 689156c76b771970ee8dd58c59c03ff1ea25b9de..1ea7fb3f421bd7badce01b40e266de2177db01b1 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Backend\Block\Template" name="integration.activate.permissions" template="Magento_Integration::integration/activate/permissions.phtml"> <block class="Magento\Integration\Block\Adminhtml\Integration\Activate\Permissions\Tabs" name="integration.activate.permissions.tabs" as="tabs"/> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml index 27bd30b20231c5082281114eaeb43b3b9e12f469..9a7ef6eb8cff24998fdbad08a477d270c7f69a89 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Integration\Block\Adminhtml\Integration\Tokens" name="integration_token_popup"/> </container> diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml index c3973927ef249bb8392c750e8b29da8870a1d017..91227d43a0c93daa452aac73def381eaa4c6fc48 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Backend\Block\Template" name="integration_tokenexchange_popup" template="Magento_Integration::integration/tokens_exchange.phtml"/> </container> diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 3673a1dd30314cda73bd2a215be04e404e533ef4..ff05d46afd5d635b8810efc12a456982ef873c17 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml index 5d0df7e4f0c738853ffc08f24ca8065e10ffca9e..54f9679596045450b67d424ea1d3f459491ff694 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="All One-Column Layout Pages" design_abstraction="page_layout"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="All One-Column Layout Pages" design_abstraction="page_layout"> <move element="catalog.leftnav" destination="content.top" after="-" /> </page> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml index cca2f785f0bd20351d8168b85269828f41ae5b9f..eb3114fb730baec7c4ae1278892f96d74039327e 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="All Two-Column Layout Pages (Left Column)" design_abstraction="page_layout"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="All Two-Column Layout Pages (Left Column)" design_abstraction="page_layout"> <move element="catalog.leftnav" destination="sidebar.main" before="-" /> </page> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml index 0d41915c8877e876001869cd57eb98b8c77fd736..f663cb76215461a16375f8f5b82d0252050facaa 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="All Two-Column Layout Pages (Right Column)" design_abstraction="page_layout"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="All Two-Column Layout Pages (Right Column)" design_abstraction="page_layout"> <move element="catalog.leftnav" destination="sidebar.main" before="-" /> </page> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml index b98930a4669452b216d3e7c1564c312eaec478c0..410e4c2b287a6eafa8000d5d5036d4f6ddfb298c 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="All Three-Column Layout Pages" design_abstraction="page_layout"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="All Three-Column Layout Pages" design_abstraction="page_layout"> <move element="catalog.leftnav" destination="sidebar.main" before="-" /> </page> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml index 026096a37add18af72aec3f22168b0f59ddb0976..545e86586b922eeb1268a9626e98011b03a831cf 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="class" value="page-with-filter"/> </body> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml index e1c51db81d0e38a2b0a22a5527f63597afc24a04..a4c9f762b650159644c50d9dfd2546531e684dd5 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="left"> <block class="Magento\LayeredNavigation\Block\Navigation\AdvancedSearch" name="advanced.search.leftnav" before="-" template="layer/view.phtml"> <block class="Magento\LayeredNavigation\Block\Navigation\State\AdvancedSearch" name="advanced.search.navigation.state" as="state" /> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml index eaabebd1eba38c27763658f484d3194256928073..f755468c9d9b489bb21864b4c980331db2f91ee9 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="sidebar.main"> <block class="Magento\LayeredNavigation\Block\Navigation\Search" name="catalogsearch.leftnav" before="-" template="layer/view.phtml"> <block class="Magento\LayeredNavigation\Block\Navigation\State\Search" name="catalogsearch.navigation.state" as="state" /> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml index f289e28ac50318cdf75aa5a5f037ad44bd0c9643..8a61895abf5663c5c403f7fa2ccb37c857f84b8b 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="All Empty Layout Pages" design_abstraction="page_layout"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="All Empty Layout Pages" design_abstraction="page_layout"> <move element="catalog.leftnav" destination="category.product.list.additional" before="-" /> </page> diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 0fa1ad00f7fe2aefb0aa26c1fabfe7f88dad3c96..7ded9107c41d27f5b83e1c8891e25b291c023fc2 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml index ceb709e78325426b124e63ec769f2484ccb26933..4af247fe6964caa47c85aebe2b5f66293efa3db2 100644 --- a/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml +++ b/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="personal_info"> <block class="Magento\Log\Block\Adminhtml\Customer\Edit\Tab\View\Status" name="view_customer_status" template="customer/status.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml b/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml index e54d025b6cfd2df905de55b09c0d94ffa422bc88..3c464b5b86d173eea4ee4c17735262e77d74d0f7 100644 --- a/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml +++ b/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Log\Block\Adminhtml\Online" name="adminhtml.block.log.online.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.log.online.grid" as="grid"> diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 95939c5e8bf7262319c8f0efe91c0cd0442c1ea9..d91ccbe3d14fb1d37212118756e5bbe4c5f0378c 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-bundle": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-configurable-product": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-downloadable": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-grouped-product": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-bundle": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-configurable-product": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-downloadable": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-grouped-product": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml index 38fd3db1aaf5aec409822d385012a9e8fca36ff1..412fd66c24938358b1136aa78fbaf8ec8569396f 100644 --- a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="render.product.prices"> <arguments> <argument name="default" xsi:type="array"> diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml index f7b9229ca4140a4c8e98d918cb8160d18fd4d8d9..6cd3469e0a495e694b9d2b76e8ab4c909cc70a9e 100644 --- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml +++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml @@ -66,27 +66,29 @@ if ($product->isSaleable()) { <?php endif; ?> <?php if ($priceType->isShowPriceOnGesture()): ?> - <?php $priceElementId = $priceElementIdPrefix . $productId . $this->getIdSuffix(); ?> + <?php + $priceElementId = $priceElementIdPrefix . $productId . $this->getIdSuffix(); + $popupId = 'msrp-popup-' . $productId . $this->getRandomString(20); + $data = ['addToCart' => [ + 'popupId' => '#' . $popupId, + 'productName' => $product->getName(), + 'realPrice' => $this->getRealPriceHtml(), + 'msrpPrice' => $msrpPrice, + 'priceElementId' => $priceElementId, + 'closeButtonId' => '#map-popup-close', + 'popupCartButtonId' => '#map-popup-button', + 'addToCartUrl' => $addToCartUrl, + ]]; + if ($this->getRequest()->getFullActionName() === 'catalog_product_view') { + $data['addToCartButton'] = '#product_addtocart_form [type=submit]'; + } else { + $data['cartForm'] = '#product_addtocart_form_from_popup'; + } + ?> <span id="<?php echo $this->getPriceId() ? $this->getPriceId() : $priceElementId ?>" style="display:none"></span> - <?php $popupId = 'msrp-popup-' . $productId . $this->getRandomString(20); ?> <a href="#" id="<?php echo($popupId);?>" - data-mage-init='{"addToCart":{ - <?php if ($this->getRequest()->getFullActionName() === 'catalog_product_view'): ?> - "addToCartButton": "#product_addtocart_form [type=submit]", - <?php else: ?> - "cartForm": "#product_addtocart_form_from_popup", - <?php endif; ?> - "popupId": "#<?php echo $popupId; ?>", - "productName": "<?php echo $product->getName() ?>", - "realPrice": <?php echo $this->jsonEncode($this->getRealPriceHtml()) ?>, - "msrpPrice": <?php echo $this->jsonEncode($msrpPrice) ?>, - "priceElementId":"<?php echo $priceElementId ?>", - "closeButtonId": "#map-popup-close", - "popupCartButtonId": "#map-popup-button", - "addToCartUrl": "<?php echo $addToCartUrl; ?>"}}' - > - <?php echo __('Click for price'); ?> + data-mage-init="<?=$this->escapeHtml($this->helper('Magento\Core\Helper\Data')->jsonEncode($data))?>"><?php echo __('Click for price'); ?> </a> <?php else: ?> <span class="msrp message"> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml index f33925824881b873e754f6e52a27f07826580c2f..42d5c75c23c9c9c7114711dac24240e715aa6d7c 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml index 81e2fc704466d8078d75a3bc3e235a8d7301de1a..fb3f982b1480bbe608db38f7270129c132760c68 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml index 6e35697c407bcb096295b3ee7f6957543e5e0c50..2a3ed5938446a0a993ff95fbc9ccb9a320fd9b3e 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> <!--<update handle="MAP_price_msrp_item"/>--> <referenceBlock name="product.price.final"> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml index 05a07365711b66ea06e84c33e5e5da764152cf20..b32eb2095e5bfcfe8826ea764e6045fef8af332f 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.info.downloadable.options"> <arguments> <argument name="display_msrp_help_message" xsi:type="string">1</argument> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml index 316bbb5180c23bdac617e8544fe287c8bc8eeba3..7a9b18310ebc2ca32fdf9cbcbed1ddf125218c6c 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml index 316bbb5180c23bdac617e8544fe287c8bc8eeba3..7a9b18310ebc2ca32fdf9cbcbed1ddf125218c6c 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml index 88d9cc02049ba80e47ae7638ff90168422b6baee..6e217b14c0baf22ce1d4af91e9e959d551cfb738 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> <referenceContainer name="checkout.cart.totals.container"> <block name="checkout.cart.totals.msrp" before="checkout.cart.totals" class="Magento\Msrp\Block\Total" template="cart/totals.phtml"> diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml index 316bbb5180c23bdac617e8544fe287c8bc8eeba3..7a9b18310ebc2ca32fdf9cbcbed1ddf125218c6c 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml index 316bbb5180c23bdac617e8544fe287c8bc8eeba3..7a9b18310ebc2ca32fdf9cbcbed1ddf125218c6c 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/default.xml b/app/code/Magento/Msrp/view/frontend/layout/default.xml index 4c627d7a49bb1a0ba00339d32c86d326fb7dacd4..5dc7606b9e4cc7d9a0c8c64d644d55dcbf5d25de 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/default.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="minicart.subtotal.container"> <block name="minicart.subtotal.msrp" before="minicart.subtotal" class="Magento\Msrp\Block\Total" template="cart/subtotal.phtml"> <arguments> diff --git a/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml b/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml index e10bcac54339932090aecec93d0b8d46d580178d..387ebce9dff5477b5797b14c9447caaaafd7c2d7 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Msrp\Block\Popup" template="Magento_Msrp::popup.phtml" name="product.tooltip"> <block class="Magento\Catalog\Block\ShortcutButtons\InCatalog\PositionAfter" name="map.shortcut.buttons"/> diff --git a/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml b/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml index 0681cfb064e72f0302c4454a568acd34313cfa7c..2d12ad2c42d65c119567e7c64ed20520f52950ac 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> <!--<update handle="MAP_price_msrp_item"/>--> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml index ebcf1cfc7a250deb6c585b2703e96f981c75196d..875a8e0f5d4873f87a01b8bb953330d8313e8be9 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.price.link"> <arguments> <argument name="display_msrp_help_message" xsi:type="string">1</argument> diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml index 5aefce39725602d371f90c8aa6bf074da0c1c8bb..c5bcdcee81f2b9f806313108f0e564fe16030841 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> <!--<update handle="MAP_price_msrp_wishlist_item"/>--> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml index 5aefce39725602d371f90c8aa6bf074da0c1c8bb..c5bcdcee81f2b9f806313108f0e564fe16030841 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> <!--<update handle="MAP_price_msrp_wishlist_item"/>--> </page> diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml index 5aefce39725602d371f90c8aa6bf074da0c1c8bb..c5bcdcee81f2b9f806313108f0e564fe16030841 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="msrp_popup"/> <!--<update handle="MAP_price_msrp_wishlist_item"/>--> </page> diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index f6261105eacb5e9595bc17e13643a576a1b75c95..e7883f77d3aa322756c3a627207e39141170465e 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -48,20 +48,28 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems */ protected $_taxHelper; + /** + * @var PriceCurrencyInterface + */ + protected $priceCurrency; + /** * @param \Magento\Framework\View\Element\Template\Context $context * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping * @param \Magento\Tax\Helper\Data $taxHelper + * @param PriceCurrencyInterface $priceCurrency * @param array $data */ public function __construct( \Magento\Framework\View\Element\Template\Context $context, \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping, \Magento\Tax\Helper\Data $taxHelper, + PriceCurrencyInterface $priceCurrency, array $data = array() ) { $this->_taxHelper = $taxHelper; $this->_multishipping = $multishipping; + $this->priceCurrency = $priceCurrency; parent::__construct($context, $data); $this->_isScopePrivate = true; } @@ -174,10 +182,17 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems /** * @param float $price * @return mixed + * + * @codeCoverageIgnore */ public function formatPrice($price) { - return $this->pirceCurrency->format($price, true, PriceCurrencyInterface::DEFAULT_PRECISION, $this->getQuote()->getStore()); + return $this->priceCurrency->format( + $price, + true, + PriceCurrencyInterface::DEFAULT_PRECISION, + $this->getQuote()->getStore() + ); } /** diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 8c854c979c5356b30417349974c85670c1b93653..d06967fb250f59fe338588c3f3e2428e3068e3d3 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml index 50e74df2f9fa07ae3ac36422247c6769078898ef..03ae94aa6ec0303144e2aebed80c1a67cd978c86 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="checkout.cart.methods"> <block class="Magento\Multishipping\Block\Checkout\Link" name="checkout.cart.methods.multishipping" template="checkout/link.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml index 6abf7b7f2f6175a8ee4f3bc7688aa2b290a49a7b..18c7d65ef502456d8479d381291669f1c48c44d1 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Multishipping Checkout" design_abstraction="custom"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout" design_abstraction="custom"> <referenceContainer name="sidebar.main"> <block class="Magento\Multishipping\Block\Checkout\State" name="checkout_state" template="checkout/state.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml index e97b6bbf2e7e6aff3a6cc60f2ed060104c9041ee..d8187323bdd6550ec78bcd7f385970a39bcd7320 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="multishipping_checkout_customer_address"/> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml index 601d21c083d0888e164c575b27f87d2a276f522e..7be0dc65ed0112ade7eafebe9d44a8e80f4ec562 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="multishipping_checkout_customer_address"/> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml index 705c077fdecd66004f4ceb02bd1eb572788dfa6e..6b4e23f0fb9514b687f6a801fa49210d2cf0ec19 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="multishipping_checkout_customer_address"/> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml index 4289c2e1abfd84d72f242a31c69f06249ab744b1..1acdd242f1f7d8aae3c954a394de14bd3e201fa9 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="multishipping_checkout_customer_address"/> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml index e4f0890d2a5293cbc10391255e479f90815634f4..e8aa583a078b7e2bbf0a4e3885cc89e3ae57646f 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="multishipping_checkout_customer_address"/> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml index 7220afd0a8cebac2b0f8410b73aeebb4eafc2c39..b3471c835c5aeeb8672b671c2c2fdbc6dfa68d88 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Multishipping Checkout Shipping Address Selection" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout Shipping Address Selection" design_abstraction="custom"> <update handle="multishipping_checkout"/> <referenceContainer name="content"> <block class="Magento\Multishipping\Block\Checkout\Address\Select" name="checkout_address_select" template="checkout/address/select.phtml" cacheable="false"/> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml index e26fe95a2d51c29028c65274a03b8d0edaf35d80..479dadbb5b210e79e8b8be3182b7246359355b74 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <referenceBlock name="page.main.title"> <action method="setPageTitle"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml index e8ded06430fb1b4e0601eb3ee26c66895b84ad48..c8b2aab23f1364205cf6c44d088deb0b5bbd3c0b 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="checkout_cart_item_renderers" /> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml index 5e604097767f2f2d7434afeb5b8a55d72d255eda..c8758d5e7fe215744dd8f757e2cc2275c0aaee07 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <referenceBlock name="page.main.title"> <action method="setPageTitle"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml index 9ab1f86bc9f5e2b9188837faf0e4c9d49ca7859d..62246576f0ed0b4fbadeb2b0e607852dd1d57dc1 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Multishipping Checkout Customer Address Edit Form" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout Customer Address Edit Form" design_abstraction="custom"> <referenceContainer name="content"> <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml index d62a7ab8466581a871959f2fbf1f6a74fcdfb774..37a53f1a41b130406446f1a1e1ef69b23787995f 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account_login"/> </page> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml index 9c9008fef6e98461eb02bcdbf4663ed931260a20..ffb18b54235561ada59d94df8c65ff1143514f5d 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="checkout_cart_item_renderers" /> <referenceBlock name="page.main.title"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml index 7377af7ad44b3fcb3ee263c0566c1bae83eb044c..a214c13248a0459baa4f84a878374fe20b7d5f8a 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account_create"/> </page> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml index 52d9c0a4847d33797cf30176f6a44e90ed164e13..766b3c130db75b8925a7fdb759537b638fd78b56 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml @@ -23,12 +23,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <update handle="checkout_cart_item_renderers" /> <referenceBlock name="page.main.title"> <action method="setPageTitle"> - <argument translate="true" name="title" xsi:type="string">Shipping Information</argument> + <argument translate="true" name="title" xsi:type="string">Select Shipping Method</argument> </action> </referenceBlock> <referenceContainer name="content"> diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml index 6f333ab37490efe3ecef4c863095b792c1332ff7..de3b3eefb5b211b286dcbad71402ff4f3f7c7988 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="multishipping_checkout"/> <referenceBlock name="page.main.title"> <action method="setPageTitle"> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml index 53bdd2b212f18bb9384ef9e28e512878352ffd7f..8b5888d061ea6b6373df572deb81871b804fbe1a 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml @@ -24,33 +24,35 @@ /** @var \Magento\Multishipping\Block\Checkout\Address\Select $this */ ?> -<div class="multicheckout block change billing"> - <div class="content"> +<div class="multicheckout"> + <div class="block block-billing"> <?php foreach ($this->getAddressCollection() as $_address): ?> - <div class="box billing"> - <address> - <?php echo $this->getAddressAsHtml($_address) ?> - <?php if($this->isAddressDefaultBilling($_address)): ?> - <br /><strong><?php echo __('Default Billing') ?></strong> - <?php endif; ?> - <?php if($this->isAddressDefaultShipping($_address)): ?> - <br /><strong><?php echo __('Default Shipping') ?></strong> - <?php endif; ?> - </address> - <div class="actions"> + <div class="box box-billing-address"> + <div class="box-content"> + <address> + <?php echo $this->getAddressAsHtml($_address) ?> + <?php if($this->isAddressDefaultBilling($_address)): ?> + <br /><strong><?php echo __('Default Billing') ?></strong> + <?php endif; ?> + <?php if($this->isAddressDefaultShipping($_address)): ?> + <br /><strong><?php echo __('Default Shipping') ?></strong> + <?php endif; ?> + </address> + </div> + <div class="box-actions"> <a href="<?php echo $this->getEditAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Edit Address') ?></span></a> <a href="<?php echo $this->getSetAddressUrl($_address) ?>" class="action select"><span><?php echo __('Select Address') ?></span></a> </div> </div> <?php endforeach; ?> </div> -</div> -<div class="actions-toolbar"> - <div class="primary"> - <button type="button" class="action add primary" role="add-address" title="<?php echo __('Add New Address') ?>"><span><?php echo __('Add New Address') ?></span></button> - </div> - <div class="secondary"> - <a href="<?php echo $this->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Billing Information') ?></span></a> + <div class="actions-toolbar"> + <div class="primary"> + <button type="button" class="action add primary" role="add-address" title="<?php echo __('Add New Address') ?>"><span><?php echo __('Add New Address') ?></span></button> + </div> + <div class="secondary"> + <a href="<?php echo $this->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Billing Information') ?></span></a> + </div> </div> </div> <script type="text/javascript"> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml index e619ce52635ae346c4797732d200ba74aa1fddf2..a794983aa282290d083c828eb19726a4d7a4868c 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml @@ -32,7 +32,6 @@ <form id="checkout_multishipping_form" data-mage-init='{"multiShipping":{}, "validation":{}}' action="<?php echo $this->getPostActionUrl() ?>" method="post" class="multicheckout address form"> <div class="title"> <strong><?php echo __('Please select a shipping address for applicable items.') ?></strong> - <button type="button" title="<?php echo __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?php echo __('Enter a New Address') ?></span></button> </div> <input type="hidden" name="continue" value="0" id="can_continue_flag"/> <input type="hidden" name="new_address" value="0" id="add_new_address_flag"/> @@ -44,20 +43,20 @@ <th class="col product"><?php echo __('Product') ?></th> <th class="col qty"><?php echo __('Qty') ?></th> <th class="col address"><?php echo __('Send To') ?></th> - <th class="col delete"> </th> + <th class="col actions"> </th> </tr> </thead> <tbody> <?php foreach ($this->getItems() as $_index => $_item): ?> <?php if ($_item->getQuoteItem()) : ?> <tr> - <td class="col product"><?php echo $this->getItemHtml($_item->getQuoteItem()) ?></td> - <td class="col qty"> + <td class="col product" data-th="<?php echo $this->escapeHtml(__('Product'));?>"><?php echo $this->getItemHtml($_item->getQuoteItem()) ?></td> + <td class="col qty" data-th="<?php echo $this->escapeHtml(__('Qty'));?>"> <div class="control qty"> <input type="number" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/> </div> </td> - <td class="col address"> + <td class="col address" data-th="<?php echo $this->escapeHtml(__('Send To'));?>"> <?php if ($_item->getProduct()->getIsVirtual()): ?> <div class="applicable"><?php echo __('Shipping selection is not applicable.'); ?></div> <?php else: ?> @@ -66,7 +65,7 @@ </div> <?php endif; ?> </td> - <td class="col delete"> + <td class="col actions" data-th=""> <a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="action delete"> <span><?php echo __('Remove item') ?></span> </a> @@ -80,9 +79,10 @@ <div class="actions-toolbar"> <div class="primary"> <button type="submit" title="<?php echo __('Continue to Shipping Information') ?>" class="action primary continue<?php if ($this->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?php echo __('Continue to Shipping Information') ?></span></button> - <button type="submit" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty & Addresses') ?></span></button> </div> <div class="secondary"> + <button type="submit" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty & Addresses') ?></span></button> + <button type="button" title="<?php echo __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?php echo __('Enter a New Address') ?></span></button> <a href="<?php echo $this->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Shopping Cart') ?></span></a> </div> </div> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml index 792b47b1ece4552b843ad803f696b08e98cb7061..43876ba26e0010551c526e37333896cc08a1617c 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml @@ -30,42 +30,48 @@ */ ?> <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="multishipping-billing-form" class="form multicheckout billing"> - <div class="block billing"> - <div class="box address"> - <strong class="subtitle"> - <span><?php echo __('Billing Address') ?></span> - <a href="<?php echo $this->getSelectAddressUrl() ?>" class="action"><span><?php echo __('Change') ?></span></a> - </strong> - <?php $_address = $this->getAddress() ?> - <address><?php echo $_address->format('html') ?></address> - </div> - <div class="box method"> - <strong class="subtitle"><span><?php echo __('Payment Method') ?></span></strong> - <?php echo $this->getChildHtml('payment_methods_before') ?> - <?php /* Payment methods forms list */ ?> - <dl class="sp-methods items methods payment" id="payment-methods"> - <?php - $_methods = $this->getMethods(); - $_methodsCount = count($_methods); - ?> - <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?> - <dt class="item title"> - <?php if ($_methodsCount > 1): ?> - <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if ($this->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio"/> - <?php else : ?> - <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/> - <?php endif; ?> - <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label> - </dt> - <?php if ($html = $this->getChildHtml('payment.method.' . $_code)) : ?> - <dd class="item content"> - <?php echo $html; ?> - </dd> - <?php endif; ?> - <?php endforeach; ?> - </dl> - <?php echo $this->getChildHtml('payment_methods_after') ?> - <?php echo $this->getChildHtml('checkout_billing_items') ?> + <div class="block block-billing"> + <div class="block-content"> + <div class="box box-billing-address"> + <strong class="box-title"> + <span><?php echo __('Billing Address') ?></span> + <a href="<?php echo $this->getSelectAddressUrl() ?>" class="action"><span><?php echo __('Change') ?></span></a> + </strong> + <div class="box-content"> + <?php $_address = $this->getAddress() ?> + <address><?php echo $_address->format('html') ?></address> + </div> + </div> + <div class="box box-billing-method"> + <strong class="box-title"><span><?php echo __('Payment Method') ?></span></strong> + <div class="box-content"> + <?php echo $this->getChildHtml('payment_methods_before') ?> + <?php /* Payment methods forms list */ ?> + <dl class="items methods-payment" id="payment-methods"> + <?php + $_methods = $this->getMethods(); + $_methodsCount = count($_methods); + ?> + <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?> + <dt class="item-title"> + <?php if ($_methodsCount > 1): ?> + <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if ($this->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio"/> + <?php else : ?> + <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/> + <?php endif; ?> + <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label> + </dt> + <?php if ($html = $this->getChildHtml('payment.method.' . $_code)) : ?> + <dd class="item-content"> + <?php echo $html; ?> + </dd> + <?php endif; ?> + <?php endforeach; ?> + </dl> + <?php echo $this->getChildHtml('payment_methods_after') ?> + <?php echo $this->getChildHtml('checkout_billing_items') ?> + </div> + </div> </div> </div> <div class="actions-toolbar"> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml index 2eb778b7a6243c0905a61e32b77913ee53ea7120..4a0c41bae0b87db48a135de608e9877650fd2c23 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml @@ -23,29 +23,31 @@ */ ?> <?php if ($this->getQuote()->hasVirtualItems()): ?> -<div class="block other"> - <div class="title"><strong><?php echo __('Other items in your order') ?></strong></div> - <div class="content"> - <strong class="subtitle"> - <span><?php echo __('Items') ?></span> - <a href="<?php echo $this->getVirtualProductEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></></a> - </strong> - <table class="items data table" id="unavailable-shipping-table"> - <thead> - <tr> - <th class="col item"><?php echo __('Product Name') ?></th> - <th class="col qty"><?php echo __('Qty') ?></th> - </tr> - </thead> - <tbody> - <?php foreach ($this->getVirtualQuoteItems() as $_item): ?> - <tr> - <td class="col item"><?php echo $this->getItemHtml($_item) ?></td> - <td class="col qty"><?php echo $_item->getQty() ?></td> - </tr> - <?php endforeach; ?> - </tbody> - </table> +<div class="block block-other"> + <div class="block-title"> + <strong><?php echo __('Other items in your order') ?></strong> + <a href="<?php echo $this->getVirtualProductEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a> + </div> + <div class="block-content"> + <p><?php echo __('Shipping is not applicable.') ?></p> + <div class="table-wrapper"> + <table class="items data table" id="unavailable-shipping-table"> + <thead> + <tr> + <th class="col item"><?php echo __('Product Name') ?></th> + <th class="col qty"><?php echo __('Qty') ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($this->getVirtualQuoteItems() as $_item): ?> + <tr> + <td class="col item" data-th="<?php echo $this->escapeHtml(__('Product Name'));?>"><?php echo $this->getItemHtml($_item) ?></td> + <td class="col qty" data-th="<?php echo $this->escapeHtml(__('Qty'));?>"><?php echo $_item->getQty() ?></td> + </tr> + <?php endforeach; ?> + </tbody> + </table> + </div> </div> </div> <?php endif; ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml index fb7d79860de54dc485136120a4c087dd6dc74a9c..25a38acf6b4c5cb97c82c6ebad4e7cca9c937335 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml @@ -22,10 +22,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -<div class="product details"> - <strong class="product name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong> +<div class="product details product-item-details"> + <strong class="product name product-item-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong> <?php if ($_options = $this->getOptionList()): ?> - <dl class="item options"> + <dl class="item-options"> <?php foreach ($_options as $_option) : ?> <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?> <dt><?php echo $this->escapeHtml($_option['label']) ?></dt> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml index 1637e679a152dcdc7507b1176d7aa880ad943835..49f433cf6e56239b61052fc05675b5e50dc8cdc2 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml @@ -22,27 +22,29 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}}' class="form multicheckout overview"> +<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}}' class="form multicheckout order-review"> <?php echo $this->getBlockHtml('formkey'); ?> - <div class="block billing"> - <div class="title"><strong><?php echo __('Billing Information') ?></strong></div> - <div class="content"> - <div class="box address"> + <div class="block block-billing"> + <div class="block-title"><strong><?php echo __('Billing Information') ?></strong></div> + <div class="block-content"> + <div class="box box-billing-address"> <?php $_address=$this->getBillingAddress() ?> - <strong class="subtitle"> + <strong class="box-title"> <span><?php echo __('Billing Address') ?></span> <a href="<?php echo $this->getEditBillingAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a> </strong> - <address> - <?php echo $_address->format('html') ?> - </address> + <div class="box-content"> + <address> + <?php echo $_address->format('html') ?> + </address> + </div> </div> - <div class="box method"> - <strong class="subtitle"> + <div class="box box-billing-method"> + <strong class="box-title"> <span><?php echo __('Payment Method') ?></span> <a href="<?php echo $this->getEditBillingUrl() ?>" class="action edit"><span><?php echo __('Change') ?></span></a> </strong> - <div class="content"> + <div class="box-content"> <input type="hidden" name="payment[cc_number]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcNumber())?>" /> <input type="hidden" name="payment[cc_cid]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcCid())?>" /> <?php echo $this->getPaymentHtml() ?> @@ -50,113 +52,117 @@ </div> </div> </div> - <div class="block shipping"> - <div class="title"><strong><?php echo __('Shipping Information') ?></strong></div> + <div class="block block-shipping"> + <div class="block-title"><strong><?php echo __('Shipping Information') ?></strong></div> <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?> <?php foreach ($this->getShippingAddresses() as $_index => $_address): ?> - <div class="content"> - <div class="title"> - <strong><?php echo __('Address %1 of %2', ($_index+1), $this->getShippingAddressCount()) ?></strong> - </div> - <div class="box address"> - <strong class="subtitle"> - <span><?php echo __('Shipping To') ?></span> - <a href="<?php echo $this->getEditShippingAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a> - </strong> - <address> - <?php echo $_address->format('html') ?> - </address> - </div> - <div class="box box-order-shipping-method"> - <strong class="box-title"> - <span><?php echo __('Shipping Method') ?></span> - <a href="<?php echo $this->getEditShippingUrl() ?>" class="action edit"><span><?php echo __('Change') ?></span></a> - </strong> - <?php if($_rate=$this->getShippingAddressRate($_address)): ?> + <div class="block-content"> + <div class="title"> + <strong><?php echo __('Address %1 <span>of %2</span>', ($_index+1), $this->getShippingAddressCount()) ?></strong> + </div> + <div class="box box-shipping-address"> + <strong class="box-title"> + <span><?php echo __('Shipping To') ?></span> + <a href="<?php echo $this->getEditShippingAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a> + </strong> <div class="box-content"> - <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?> (<?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>) - <?php $_excl = $this->getShippingPriceExclTax($_address); ?> - <?php $_incl = $this->getShippingPriceInclTax($_address); ?> + <address> + <?php echo $_address->format('html') ?> + </address> + </div> + </div> + <div class="box box-shipping-method"> + <strong class="box-title"> + <span><?php echo __('Shipping Method') ?></span> + <a href="<?php echo $this->getEditShippingUrl() ?>" class="action edit"><span><?php echo __('Change') ?></span></a> + </strong> + <?php if($_rate=$this->getShippingAddressRate($_address)): ?> + <div class="box-content"> + <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?> (<?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>) + <?php $_excl = $this->getShippingPriceExclTax($_address); ?> + <?php $_incl = $this->getShippingPriceInclTax($_address); ?> - <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - <span class="price-including-tax" data-label="<?php echo __('Incl. Tax'); ?>"> - <?php endif; ?> - <?php echo $_incl; ?> - <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - </span> - <?php endif; ?> - <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - <span class="price-excluding-tax" data-label="<?php echo __('Excl. Tax'); ?>"><?php echo $_excl; ?></span> - <?php endif; ?> + <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> + <span class="price-including-tax" data-label="<?php echo __('Incl. Tax'); ?>"> + <?php endif; ?> + <?php echo $_incl; ?> + <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> + </span> + <?php endif; ?> + <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> + <span class="price-excluding-tax" data-label="<?php echo __('Excl. Tax'); ?>"><?php echo $_excl; ?></span> + <?php endif; ?> + </div> + <?php endif; ?> + </div> + <div class="box box-items"> + <div class="box-content"> + <div class="table-wrapper"> + <table class="items data table order review" id="overview-table-<?php echo $_address->getId() ?>"> + <thead> + <tr> + <th class="col item"><?php echo __('Item') ?> + <a href="<?php echo $this->getAddressesEditUrl() ?>" class="action edit"><span><?php echo __('Edit') ?></span></a> + </th> + <th class="col price"><?php echo __('Price') ?></th> + <th class="col qty"><?php echo __('Qty') ?></th> + <th class="col subtotal"><?php echo __('Subtotal') ?></th> + </tr> + </thead> + <tfoot> + <?php echo $this->renderTotals($this->getShippingAddressTotals($_address)); ?> + </tfoot> + <tbody> + <?php foreach ($this->getShippingAddressItems($_address) as $_item): ?> + <?php echo $this->getRowItemHtml($_item); ?> + <?php endforeach; ?> + </tbody> + </table> + </div> </div> - <?php endif; ?> + </div> </div> - <div class="box items"> - <strong class="subtitle"> - <span><?php echo __('Items') ?></span> - <a href="<?php echo $this->getAddressesEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a> - </strong> - <table class="items data table order review" id="overview-table-<?php echo $_address->getId() ?>"> + <?php endforeach; ?> + </div> + + <?php if ($this->getQuote()->hasVirtualItems()): ?> + <div class="block block-other"> + <div class="block-title"><strong><?php echo __('Other items in your order') ?></strong></div> + <div class="block-content"> + <strong class="subtitle"> + <span><?php echo __('Items') ?></span> + <a href="<?php echo $this->getVirtualProductEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a> + </strong> + <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?> + <div class="table-wrapper"> + <table class="items data table order review" id="virtual-overview-table"> <thead> - <tr> - <th class="col item"><?php echo __('Product Name') ?></th> - <th class="col price"><?php echo __('Price') ?></th> - <th class="col qty"><?php echo __('Qty') ?></th> - <th class="col subtotal"><?php echo __('Subtotal') ?></th> - </tr> + <tr> + <th class="col item"><?php echo __('Product Name') ?></th> + <th class="col price"><?php echo __('Price') ?></th> + <th class="col qty"><?php echo __('Qty') ?></th> + <th class="col subtotal"><?php echo __('Subtotal') ?></th> + </tr> </thead> <tfoot> - <?php echo $this->renderTotals($this->getShippingAddressTotals($_address)); ?> + <?php echo $this->renderTotals($this->getBillinAddressTotals()); ?> </tfoot> <tbody> - <?php foreach ($this->getShippingAddressItems($_address) as $_item): ?> + <?php foreach ($this->getVirtualItems() as $_item): ?> <?php echo $this->getRowItemHtml($_item); ?> <?php endforeach; ?> </tbody> </table> </div> </div> - <?php if($this->getShippingAddressCount()!=$_index+1): ?> - <?php endif; ?> - <?php endforeach; ?> - </div> - - <?php if ($this->getQuote()->hasVirtualItems()): ?> - <div class="block other"> - <div class="title"><strong><?php echo __('Other items in your order') ?></strong></div> - <div class="content"> - <strong class="subtitle"> - <span><?php echo __('Items') ?></span> - <a href="<?php echo $this->getVirtualProductEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a> - </strong> - <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?> - <table class="items data table order review" id="virtual-overview-table"> - <thead> - <tr> - <th class="col item"><?php echo __('Product Name') ?></th> - <th class="col price"><?php echo __('Price') ?></th> - <th class="col qty"><?php echo __('Qty') ?></th> - <th class="col subtotal"><?php echo __('Subtotal') ?></th> - </tr> - </thead> - <tfoot> - <?php echo $this->renderTotals($this->getBillinAddressTotals()); ?> - </tfoot> - <tbody> - <?php foreach ($this->getVirtualItems() as $_item): ?> - <?php echo $this->getRowItemHtml($_item); ?> - <?php endforeach; ?> - </tbody> - </table> - </div> </div> <?php endif; ?> <?php echo $this->getChildHtml('items_after'); ?> - <div id="checkout-review-submit" class="checkout review"> + <div id="checkout-review-submit" class="checkout-review"> <?php echo $this->getChildHtml('agreements') ?> - <div class="totals grand"> + <div class="grand totals"> <strong class="mark"><?php echo __('Grand Total:') ?></strong> <strong class="amount"><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()) ?></strong> </div> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml index 7d971445cf6c5861c48d6fea38557a40744d6087..6be0fde3de127228a717e69dde2e083b8a6d4d90 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml @@ -52,7 +52,6 @@ <?php /* // Excluding Tax */ ?> </td> - <td class="col qty" data-th="<?php echo $this->escapeHtml(__('Qty'));?>"><?php echo $_item->getQty()*1 ?></td> <td class="col subtotal" data-th="<?php echo $this->escapeHtml(__('Subtotal'));?>"> <?php /* Including Tax Subtotal */ ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml index bbc00042218053da6fcbaa76b24369a6fc92bbfb..32f81f575cc28a813ad1ecc506d65702ab1139d1 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml @@ -30,21 +30,20 @@ */ ?> <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="shipping_method_form" class="form multicheckout shipping"> - <div class="title"> - <strong><?php echo __('Select Shipping Method') ?></strong> - </div> <?php foreach ($this->getAddresses() as $_index => $_address): ?> - <div class="block shipping"> - <div class="title"><strong><?php echo __('Address %1 of %2', ($_index+1), $this->getAddressCount()) ?></strong></div> - <div class="content"> - <div class="box address"> - <strong class="subtitle"> + <div class="block block-shipping"> + <div class="block-title"><strong><?php echo __('Address %1 <span>of %2</span>', ($_index+1), $this->getAddressCount()) ?></strong></div> + <div class="block-content"> + <div class="box box-shipping-address"> + <strong class="box-title"> <span><?php echo __('Shipping To') ?></span> <a href="<?php echo $this->getAddressEditUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a> </strong> - <address><?php echo $_address->format('html') ?></address> + <div class="box-content"> + <address><?php echo $_address->format('html') ?></address> + </div> </div> - <div class="box box-order-shipping-method"> + <div class="box box-shipping-method"> <strong class="box-title"> <span><?php echo __('Shipping Method') ?></span> </strong> @@ -52,68 +51,70 @@ <?php if (!($_shippingRateGroups = $this->getShippingRates($_address))): ?> <p><?php echo __('Sorry, no quotes are available for this order at this time.') ?></p> <?php else: ?> - <dl class="sp-methods items methods"> + <dl class="items methods-shipping"> <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?> <dt class="item-title"><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt> - <dd class="item-content options"> + <dd class="item-content"> <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?> - <div class="field choice"> - <?php if ($_rate->getErrorMessage()): ?> - <strong><?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></strong> - <?php else: ?> - <?php if ($_sole) : ?> - <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" class="radio solo method" checked="checked"/> - <?php else: ?> - <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" /> - <?php endif; ?> - <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?> - <?php $_excl = $this->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?> - <?php $_incl = $this->getShippingPrice($_address, $_rate->getPrice(), true); ?> - <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - <span class="price-including-tax" data-label="<?php echo __('Incl. Tax'); ?>"> - <?php endif; ?> - <?php echo $_incl; ?> - <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - </span> - <?php endif; ?> - <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - <span class="price-excluding-tax" data-label="<?php echo __('Excl. Tax'); ?>"><?php echo $_excl; ?></span> - <?php endif; ?> - </label> - <?php endif ?> - </div> + <div class="field choice"> + <?php if ($_rate->getErrorMessage()): ?> + <strong><?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></strong> + <?php else: ?> + <?php if ($_sole) : ?> + <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" class="radio solo method" checked="checked"/> + <?php else: ?> + <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" /> + <?php endif; ?> + <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?> + <?php $_excl = $this->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?> + <?php $_incl = $this->getShippingPrice($_address, $_rate->getPrice(), true); ?> + <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> + <span class="price-including-tax" data-label="<?php echo __('Incl. Tax'); ?>"> + <?php endif; ?> + <?php echo $_incl; ?> + <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> + </span> + <?php endif; ?> + <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> + <span class="price-excluding-tax" data-label="<?php echo __('Excl. Tax'); ?>"><?php echo $_excl; ?></span> + <?php endif; ?> + </label> + <?php endif ?> + </div> <?php endforeach; ?> </dd> <?php endforeach; ?> </dl> <?php endif; ?> + <?php echo $this->getItemsBoxTextAfter($_address); ?> </div> </div> - <div class="box items"> - <strong class="subtitle"> + <div class="box box-items"> + <strong class="box-title"> <span><?php echo __('Items') ?></span> <a href="<?php echo $this->getItemsEditUrl($_address) ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a> </strong> - <div class="table-wrapper"> - <table class="items data table" id="shipping-table-<?php echo $_address->getId() ?>"> - <caption class="table caption"><?php echo __('Items') ?></caption> - <thead> + <div class="box-content"> + <div class="table-wrapper"> + <table class="items data table" id="shipping-table-<?php echo $_address->getId() ?>"> + <caption class="table caption"><?php echo __('Items') ?></caption> + <thead> <tr> <th class="col item"><?php echo __('Product Name') ?></th> <th class="col qty"><?php echo __('Qty') ?></th> </tr> - </thead> - <tbody> - <?php foreach ($this->getAddressItems($_address) as $_item): ?> - <tr> - <td class="col item"><?php echo $this->getItemHtml($_item->getQuoteItem()) ?></td> - <td class="col qty"><?php echo $_item->getQty() ?></td> - </tr> - <?php endforeach; ?> - </tbody> - </table> + </thead> + <tbody> + <?php foreach ($this->getAddressItems($_address) as $_item): ?> + <tr> + <td class="col item" data-th="<?php echo $this->escapeHtml(__('Product Name'));?>"><?php echo $this->getItemHtml($_item->getQuoteItem()) ?></td> + <td class="col qty" data-th="<?php echo $this->escapeHtml(__('Qty'));?>"><?php echo $_item->getQty() ?></td> + </tr> + <?php endforeach; ?> + </tbody> + </table> + </div> </div> - <?php echo $this->getItemsBoxTextAfter($_address); ?> </div> </div> </div> diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index 1fa8e57e7a7341052e800da182e58114d1e3f87a..d062da3b65357e6409af83f1d0ac06e26ad8ffaf 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-email": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-email": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml index b86e14840097bf1e62107983a51fc68969ec645d..40c0719855ca2b5149e56a133bdb92a9a7a7cc52 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.newsletter.problem.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.newslettrer.problem.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml index c4297aff301c8f593564475947e5de136b95cd00..0174850869b19833aa501ebbb5a73ac291f960da 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="newsletter_problem_block"/> <container name="root"> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml index de7daa85e0384e8ccd2b24193a3d7074bf8c2f15..2848a297bff886b0158f43c05f5cc7243dcc4b2e 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="newsletter_problem_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml index dd7cf98b9f3767ad5b462eb99c6f9e39db0b2629..a1e2c94672271e86f518dd2db7c0be8b57940a8d 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml index 370d59ca86110dcbbba3812a21d2e2b5769a66d6..86dc8bde269e4d08a265826ae1a9d030812e234a 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="newsletter_queue_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml index 225ac460c0f1f0930e6b1f53046167d1c70ace67..54aacfec6e1156eb70a1622b248eef4da57aa8bf 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.newsletter.queue.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.newsletter.queue.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml index 5a356a766437d80ecb1937f1f11e2c0804b1c5fe..f3788862ccd7e5d7572dbaea1b80fe22ee60adc7 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="newsletter_queue_grid_block"/> <referenceContainer name="content"> <block class="Magento\Backend\Block\Template" template="Magento_Newsletter::queue/list.phtml" name="adminhtml.newsletter.queue.grid.container"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml index 197b1ebde82a179580779a6026becbb10318bf10..1e069ffb69ec6e93748a17022a86b02043bb92ff 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="id" value="html-body"/> <attribute name="class" value="preview-window"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml index f5b3fe213489a10341f5747a567748d5af83e054..99e491a70ba39d220a40285b531df1c797b44bf0 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Framework\View\Element\Template" name="page.block" template="Magento_Newsletter::queue/preview.phtml"> <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview" name="content" as="content"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml index eadf004719b1f330e572fb343a0f60e7abdfcede..2682a0d9d449fc70c04260ed5b6c1660fcd7f9bf 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.newsletter.subscriber.container"> <block class="Magento\Newsletter\Block\Adminhtml\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml index db9f60c888c2ceaf73ad0340247fcab57a408cd5..336a9fd0439cdd0bf95035b4982b9de2e0036e9c 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="newsletter_subscriber_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml index db9f60c888c2ceaf73ad0340247fcab57a408cd5..336a9fd0439cdd0bf95035b4982b9de2e0036e9c 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="newsletter_subscriber_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml index 7ff6ccdf469415876d3f01fce5122d25ba6dff96..86b2eec3447c17eb83708d65a0ca9040cc2dff3c 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="newsletter_subscriber_block"/> <container name="root"> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml index a0bbd9ce1854154b50a03c51ef0a5c98f7cbbf47..0dc3e9547480815707849a3f82b70175c999e1ee 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="newsletter_subscriber_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml index bf235b36dbbd7740d0097cd9a96effffb71f1b4b..b3f1a249f4b70efa8ad3556ad7181b1ac3ddde6b 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml index 197b1ebde82a179580779a6026becbb10318bf10..1e069ffb69ec6e93748a17022a86b02043bb92ff 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="id" value="html-body"/> <attribute name="class" value="preview-window"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml index 8d3a40de42d1b0b080cb8554eaab3ad87c31ada5..92a9d93dca3dbb2bda09cbba9f2151b6b7ffe331 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Framework\View\Element\Template" name="page.block" template="Magento_Newsletter::template/preview.phtml"> <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="content" as="content"/> diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml index cbc9acbbce191c71821d7ad293797cb5f332de01..1a3ceedcc4c59c9aab17b2075944a5a13b805348 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml +++ b/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Framework\View\Element\Template" name="page.block" template="Magento_Newsletter::template/preview.phtml"> <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="content" as="content"/> diff --git a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml index dbd46e0e9043eb1f0dbd07bad4d888f5f7cc2162..4d6c92e79fa5a0dd083c970678342e99108b3c63 100644 --- a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_account_navigation"> <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-newsletter-subscriptions-link"> <arguments> diff --git a/app/code/Magento/Newsletter/view/frontend/layout/default.xml b/app/code/Magento/Newsletter/view/frontend/layout/default.xml index 5a98ad81f825eef9d53516b49680aa681f4c42df..445bc811daa1067a04f4884168d676fefc6367d2 100644 --- a/app/code/Magento/Newsletter/view/frontend/layout/default.xml +++ b/app/code/Magento/Newsletter/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="newsletter_head_components" template="Magento_Newsletter::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml b/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml index f10a78cb1d051c0641c7af03bbb2246e87340eeb..1a7095f9563fefa2811c2090949a49e4be888014 100644 --- a/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml +++ b/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Customer\Block\Newsletter" name="customer_newsletter"> diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index b318a197759623f976fc990a1c4bebc627e45382..ce8b09fbd545c9f9037485a63e3652508a37b540 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-payment": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-payment": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 837b044618a38ef2351cc2db4e64d4bcfc4f99b2..732359a8e368ad24269e3a20cdda5801dbf06704 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-sales-rule": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-sales-rule": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Ogone/composer.json b/app/code/Magento/Ogone/composer.json index 1460b4737226621cfe95c68325a52e84c5077232..a6ae552931a217f7499009cbdb78a84ca84b560c 100644 --- a/app/code/Magento/Ogone/composer.json +++ b/app/code/Magento/Ogone/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml index b6fae13856e8bc26ead69e8f003af10b2735a070..c39d0a8e4063becb64cfc36ea71d6b5c076f6ecd 100644 --- a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml +++ b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="catalog.topnav"/> <referenceContainer name="header-wrapper"> <remove name="top.links"/> diff --git a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml index 95f6829c6bc5554e20ab21c2f975d72601e9bb76..415c897605f2ffccbbd664ea9b21b51993804122 100644 --- a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml +++ b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Ogone\Block\Placeform" name="ogone_placeform" template="placeform.phtml" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index 637740ce1bd9218ca2945e260076c95983721743..08ca19c42d7f2bf60563b68b85c32c06b6ba122e 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/PageCache/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/PageCache/view/adminhtml/layout/adminhtml_system_config_edit.xml index 0396ab1c394d75b3ad7a5ff563d84575cc9bc57a..133002c70d0048698561738a6b45fb9df11013a1 100644 --- a/app/code/Magento/PageCache/view/adminhtml/layout/adminhtml_system_config_edit.xml +++ b/app/code/Magento/PageCache/view/adminhtml/layout/adminhtml_system_config_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\PageCache\Block\System\Config\Form\Field\Export" template="Magento_PageCache::page_cache_validation.phtml"/> </referenceContainer> diff --git a/app/code/Magento/PageCache/view/frontend/layout/default.xml b/app/code/Magento/PageCache/view/frontend/layout/default.xml index 62bc801e271c79a9d3cee68f6e7e4743ededfc23..84a4ff5111220f390fd343b353571d5a6f42d4f4 100644 --- a/app/code/Magento/PageCache/view/frontend/layout/default.xml +++ b/app/code/Magento/PageCache/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="pagecache_page_head_components" template="Magento_PageCache::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/PayPalRecurringPayment/composer.json b/app/code/Magento/PayPalRecurringPayment/composer.json index a461470fa5bef528ecb744d59734bd6ce84af003..d746f5ebe7d687f4bd7a1f52def0aaf04658e699 100644 --- a/app/code/Magento/PayPalRecurringPayment/composer.json +++ b/app/code/Magento/PayPalRecurringPayment/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-paypal": "0.1.0-alpha98", - "magento/module-recurring-payment": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-paypal": "0.1.0-alpha99", + "magento/module-recurring-payment": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index d94ee2ccce6be787732f6ff49bef7fed66a386d3..f4f2c074bae6827aec921ef23d8c6c94c80337c3 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-centinel": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-centinel": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json index 46d3f8695df83f75eba445d06b5bd29430852637..a5f7b98113d7af437fad45f663cd4d2eb07365da 100644 --- a/app/code/Magento/Paypal/composer.json +++ b/app/code/Magento/Paypal/composer.json @@ -3,25 +3,25 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-centinel": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-centinel": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml index 581a00639e870eb5052912aedfce12406b94eac0..8d942d2b3fa4285551074f6acf12f8375300d386 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_paypal_reports_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.paypal.report.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="paypal.report.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml index 5f054039c7e802e615c41e56fe326c2ae60fa831..0620b86fccc60bc2f2d14c03030e911fe5cf2a16 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="Magento_Paypal::styles.css"/> </head> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Paypal/view/adminhtml/layout/customer_index_edit.xml index e790808802b800fa9951e6fd7f60dcc107ab0b20..1dd347c3286a21e00b41b7d3564729d45077432d 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/customer_index_edit.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/customer_index_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_edit_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">customer_edit_tab_agreements</argument> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_customergrid.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_customergrid.xml index 6afd86fac23d248abf15973cfaef7c4df41213bf..774c5ae7f05baf0c07af1d4a9b121092345760b5 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_customergrid.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_customergrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Adminhtml\Customer\Edit\Tab\Agreement" name="customer.billing.agreement.grid"/> </container> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_grid.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_grid.xml index 3e0ae6e824ef4886e2993f37f78284fb68100b89..f12494be4926279329d3af597523fbc5503722cb 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_grid.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Adminhtml\Billing\Agreement\Grid" name="paypal.billing.agreement.grid"/> </container> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_index.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_index.xml index 8a2ee8b28a2acfd461e2e00453b29bc1b36538d4..607c49ada295998f564af8a3967b60169d4416be 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_index.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Paypal\Block\Adminhtml\Billing\Agreement" name="paypal.billing.agreement.grid.container"/> </referenceContainer> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml index 9a9e3052dfd94fdf3e6afab196eb7a431e426895..704a1747996cce93eb12d4c058e8d2a79bac1e54 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_ordersgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="sales_order_grid_block"/> <referenceBlock name="sales.order.grid"> <arguments> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml index 401efcaeaa7e790455138fdc6ad21150b999d7af..0148681b5095452b81254f963a108c17f15bd5ad 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_billing_agreement_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_grid_block"/> <referenceBlock name="sales.order.grid"> <arguments> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_grid.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_grid.xml index 75bc2386e639b26ce393d398c77225d6acd852ac..5ed8dd78db356f862813a7336972a78ae00801f1 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_grid.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_paypal_reports_block"/> <container name="root"> diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_index.xml b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_index.xml index bee42e0aff40bb0612ee8b117cbf6675709f42ae..d71070eeba31d6f22aea6d1e11640556604920eb 100644 --- a/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_index.xml +++ b/app/code/Magento/Paypal/view/adminhtml/layout/paypal_paypal_reports_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_paypal_reports_block"/> <referenceContainer name="content"> <block class="Magento\Paypal\Block\Adminhtml\Settlement\Report" name="adminhtml.paypal.report.grid.container"/> diff --git a/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml index b081bc810d18fb6c29ba523e0f2863f1ecc610a6..40e720a397eb42113d6f7e5afe2488d3182b9317 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/catalog_category_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="sidebar.additional"> <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/> <block class="Magento\Paypal\Block\Bml\Banners" name="bml.right.logo" template="bml.phtml"> diff --git a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml index 5275a1b3861c2962af080f94f74fa1c79909c208..e85dd9a605dd4868ddc0219156b851efc382aef6 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="top.container"> <block class="Magento\Paypal\Block\Bml\Banners" name="bml.center.logo" template="bml.phtml"> <arguments> diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml index fd68fcd052b42bd61e7fb1fd986fd73b5123c6a2..15bfad81b1e0133faee2c5663a860bc445599df3 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="top.container"> <block class="Magento\Paypal\Block\Bml\Banners" name="bml.center.logo" template="bml.phtml"> <arguments> diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_index.xml index d26e00e04626ad9473f7f424fe7f7d64063b01c6..8aa8424e65f721d00014945e4b7445abc230d5de 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="paypal_opcheckout_head_components" template="Magento_Paypal::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_review.xml index 2ba93fd32e2e47b561e442e0506515721ae7e94b..9f0f2c774d4422f09332e21e25920c0825debe5a 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="checkout.onepage.review.info.items.after"> <block class="Magento\Paypal\Block\Iframe" name="paypal.iframe" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_success.xml index 260de1c596808172f3b94be68a748c47347119ab..235cb3df7778b59d9aae6038b496cb9a6c1a6a68 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_onepage_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="order.success.additional.info"> <block class="Magento\Paypal\Block\Checkout\Onepage\Success\BillingAgreement" name="onepage.success.billing_agreement" template="checkout/onepage/success/billing_agreement.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml b/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml index a2d00f543cf9afc4f11114bd1549e5c4e22aa5c0..2edb5c1624872992df068f2708a9dccb636db82e 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/cms_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="sidebar.additional"> <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/> <block class="Magento\Paypal\Block\Bml\Banners" name="bml.right.logo" template="bml.phtml"> diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml index de0a08d5207734e9948caeec57b7ba4987a3ee6a..a31cd9369a3cc0bd2cd243161d030dcc48bba336 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Billing Agreements</title> </head> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_index.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_index.xml index 8fe9573edf030e30a930b7b04afab93a3ccb020a..902cf4d8ba56e5d13ae1f9235aa3e872e9f8b801 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_index.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Paypal\Block\Billing\Agreements" name="customer.account.billing.agreement" template="billing/agreements.phtml" cacheable="false"/> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_view.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_view.xml index 0bddee088124d3ca66a3c508c8568ad4c61e1485..d25fa81b0979efdb38f8b352b2779381f3a6705a 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_view.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_billing_agreement_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Paypal\Block\Billing\Agreement\View" name="customer.account.billing.agreement" template="billing/agreement/view.phtml" cacheable="false"/> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml index 83b2fb5413f6942422523a42d03c95e82fdd0e57..cd1279e90e148f5b3fd8c4942313590e756f8149 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_onepage_review_item_renderers" /> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="paypal_express_review_checkout_head_components" template="Magento_Checkout::js/components.phtml"/> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml index e4740ac126303350129eb295f2670ab8946bcb08..acc3e8756341d7c3951eb58309e806dde3ce62cb 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="checkout_onepage_review_item_renderers"/> <container name="root"> <block class="Magento\Paypal\Block\Express\Review\Details" name="page.block" template="express/review/details.phtml"> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml index 4441962588194436d2d19cbbb7c2994d772122c5..25029e9b97f6740e258d36bd418b2e5064498952 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Hosted\Pro\Iframe" name="hosted.pro.iframe" template="hss/redirect.phtml"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml index 7e7860bd6a56d4ed4458fd45fc0e70b498c4e005..9c06cbb6369bdf6ff20675f02d2e0e94859110fc 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/redirect.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml index 4a18d5daf1251968a6a5b061c087b04fdc4bc7b5..17954133d8157f9181475b4e0a1ef1cc285c6c2e 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/form.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml index 7e7860bd6a56d4ed4458fd45fc0e70b498c4e005..9c06cbb6369bdf6ff20675f02d2e0e94859110fc 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/redirect.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml index 1f6f8aa1b56f3d9e870c5ecebf83acdcebfc5f90..e5139414bccedfc3253c21686045bce61f506454 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/redirect.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml index c66c26429348e1f3568d21b31066bab9be65a9d8..e38d00b37eae84c1a6cf0d194e1e9a0ab76ef94e 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/form.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml index 1f6f8aa1b56f3d9e870c5ecebf83acdcebfc5f90..e5139414bccedfc3253c21686045bce61f506454 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/redirect.phtml" cacheable="false"/> </container> diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml index a9275be1469b9428ba7ebf51c75fb2a72ff9e655..cb4e83e182835c09dc14b5d422b7276cf5f23eca 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="checkout_onepage_review_item_renderers" /> <referenceContainer name="content"> <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml index 59a9c85f31d6e9b3eb40bf1121df4d8807bb14a3..d2529d7e0b106e3b438634467335710d55d09c3c 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Paypal\Block\Standard\Redirect" name="standard.redirect" cacheable="false"/> </container> diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index 378bcf76865b6fc345f9d15d62b819dca8a396e1..7285eeb62d555c2fb6bae45cf9c532cc35de3ff8 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_index.xml index 216fa1db633adb4bb8abf9b89ffe044d81fac444..0197df7ef9942fb2d755542c99655ac1ce031969 100644 --- a/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.login.additional.info"> <block class="Magento\Persistent\Block\Form\Remember" name="persistent.remember.me" template="remember_me.phtml" before="-"/> </referenceContainer> diff --git a/app/code/Magento/Persistent/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Persistent/view/frontend/layout/customer_account_create.xml index c2770a1b39b2863523ed734f348c8b292983a116..c89a294d03c52e5bf3a5f74ac1ec14f179567eaa 100644 --- a/app/code/Magento/Persistent/view/frontend/layout/customer_account_create.xml +++ b/app/code/Magento/Persistent/view/frontend/layout/customer_account_create.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Persistent\Block\Form\Remember" name="persistent.remember.me" template="remember_me.phtml" before="-"/> </referenceContainer> diff --git a/app/code/Magento/Persistent/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Persistent/view/frontend/layout/customer_account_login.xml index c2770a1b39b2863523ed734f348c8b292983a116..c89a294d03c52e5bf3a5f74ac1ec14f179567eaa 100644 --- a/app/code/Magento/Persistent/view/frontend/layout/customer_account_login.xml +++ b/app/code/Magento/Persistent/view/frontend/layout/customer_account_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.additional.info"> <block class="Magento\Persistent\Block\Form\Remember" name="persistent.remember.me" template="remember_me.phtml" before="-"/> </referenceContainer> diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index 785422097cfd493d60d7c9973a882ca3444d4b82..70f4aea631ddb1fbfc7b1fc44e19bf4c46cc8b67 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ProductAlert/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/ProductAlert/view/frontend/layout/catalog_product_view.xml index 0cd435cd89be4a2e785843423c91a89d1e3293c2..ed49a6f388f20d363f15ad2cf78f365e12cde7cb 100644 --- a/app/code/Magento/ProductAlert/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/ProductAlert/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <referenceBlock name="product.info"> <referenceContainer name="alert.urls"> diff --git a/app/code/Magento/RecurringPayment/composer.json b/app/code/Magento/RecurringPayment/composer.json index 94442e13902359145cd974d92ef58c34f8354f3b..5759c57186e4e4498450330e3054e15edbb3fb51 100644 --- a/app/code/Magento/RecurringPayment/composer.json +++ b/app/code/Magento/RecurringPayment/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/RecurringPayment/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/RecurringPayment/view/adminhtml/layout/customer_index_edit.xml index 30bc3f15ae4a2bf0ef3aeee9b90e41df5100715c..6d6e11bfe25a30173e3d79c9cf3366b2400e0615 100644 --- a/app/code/Magento/RecurringPayment/view/adminhtml/layout/customer_index_edit.xml +++ b/app/code/Magento/RecurringPayment/view/adminhtml/layout/customer_index_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_edit_tabs"> <action method="addTab"> <argument name="name" xsi:type="string">customer_edit_tab_recurring_payment</argument> diff --git a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_customergrid.xml b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_customergrid.xml index 4e693b02cb4eaf41e30d6569e517cabefc03f39d..ced2c81f83d9d9ff406f2258e04c53a56a8d34a1 100644 --- a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_customergrid.xml +++ b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_customergrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\RecurringPayment\Block\Adminhtml\Customer\Edit\Tab\RecurringPayment" name="customer.recurring.payment.grid"/> </container> diff --git a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_grid.xml b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_grid.xml index 70d47338f53c5575ae3a82409553918fe10a37b7..dafccf48d826fdb40c7da0b5bb52df025037c0d7 100644 --- a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_grid.xml +++ b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\RecurringPayment\Block\Adminhtml\Payment\Grid" name="sales.recurring.adminhtml.payment.grid"/> </container> diff --git a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_index.xml b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_index.xml index 2d75a258e1722c8213fdd6bc8cdae29ce99e9680..d5df221fc1d83f16b9c3af7a73e288210fc87198 100644 --- a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_index.xml +++ b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\RecurringPayment\Block\Adminhtml\Payment" name="sales.recurring.payment.grid.container"/> </referenceContainer> diff --git a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_orders.xml b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_orders.xml index 5566213f84cbee994f2044394b462d6ae8861bb1..03493075048d202df2ccc04e2421c514a6d12a5b 100644 --- a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_orders.xml +++ b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_orders.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\RecurringPayment\Block\Adminhtml\Payment\View\Tab\Orders" name="sales.recurring.payment.tab.orders"/> </container> diff --git a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_view.xml b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_view.xml index 3da069ee65aa7de5b4b7ee2f3dc05cf3c9532c8a..ced7a8926d2bb346573815682efc784dfd809775 100644 --- a/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_view.xml +++ b/app/code/Magento/RecurringPayment/view/adminhtml/layout/sales_recurringpayment_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\RecurringPayment\Block\Adminhtml\Payment\View" name="sales.recurring.payment.view" template="Magento_Backend::widget/view/container.phtml"> <action method="setDestElementId"> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/catalog_product_view.xml index 62de3f31373343e63d4a5748a1a30ac6ca444c93..9037e2751a0112fcf7277fd182b6dbaaf9625a2d 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product.info.main"> <block class="Magento\RecurringPayment\Block\Catalog\Product\View\Payment" name="product.info.additional.recurring.schedule" as="recurring_info" template="catalog/product/view/payment/schedule.phtml" group="detailed_info"> <action method="setTitle"> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/checkout_onepage_success.xml index 652717795f487eaaad6f5d38bd2b51a91d874f23..a9265e0f550762487d75f676ee828f395cc0b3b8 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/checkout_onepage_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="order.success.additional.info"> <block class="Magento\RecurringPayment\Block\Checkout\Onepage\Success" name="onepage-success-recurring-payment" template="checkout/onepage/success.phtml"/> </referenceContainer> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/customer_account.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/customer_account.xml index a9cf4ab55aab611de2426b74253861adfcfe2943..987e9bca14e34e6c40f2e669357b9ecfead3d47c 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_account_navigation"> <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-recurring-payments-link" after="customer-account-navigation-orders-link"> <arguments> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_index.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_index.xml index 4567ba63e354c4d946be7511538e9213465e071b..f9a20db41861381a87ea88d2b92b795ce9fe795b 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_index.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <head> <title>Recurring Payments</title> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_orders.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_orders.xml index 7b4abd63963d31cbf8d3f0af4bf8e2d1bca8e3ff..e7f6dcc101404b64df3fdb21d3d18208bf6f297d 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_orders.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_orders.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <update handle="sales_recurringpayment_view__tabs"/> <referenceBlock name="sales.recurring.payment.view.tab.orders"> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view.xml index 7d17eec619bcf831d046fc8226b5dc01cb1704db..55975d5e8eb2d0cd4726bc7fe8b66f2fe1abeb20 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <update handle="sales_recurringpayment_view__tabs"/> <referenceBlock name="sales.recurring.payment.view.tab.payment"> diff --git a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view__tabs.xml b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view__tabs.xml index 920302605221ccc3a7b37f6e8a5ac9ead5d68abe..4b69a859b4ded30e164f09bdc26945574de8833c 100644 --- a/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view__tabs.xml +++ b/app/code/Magento/RecurringPayment/view/frontend/layout/sales_recurringpayment_view__tabs.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Recurring Profile View Tabs" design_abstraction="custom"> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Recurring Profile View Tabs" design_abstraction="custom"> <referenceContainer name="content"> <block class="Magento\RecurringPayment\Block\Payment\View\Data" name="sales.recurring.payment.view" template="recurring/payment/view.phtml"> <action method="setShouldPrepareInfoTabs"> diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php index b2e85c8631efb1dee739a8da5f59c013058cdb3c..9f7abaf7c4fc53be3d59d6ec09071f4ea9b6fc42 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php @@ -45,22 +45,33 @@ class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product */ public function execute() { - $this->_title->add(__('Product Views Report')); + try { + $this->_title->add(__('Product Views Report')); - $this->_showLastExecutionTime(Flag::REPORT_PRODUCT_VIEWED_FLAG_CODE, 'viewed'); + $this->_showLastExecutionTime(Flag::REPORT_PRODUCT_VIEWED_FLAG_CODE, 'viewed'); - $this->_initAction()->_setActiveMenu( - 'Magento_Reports::report_products_viewed' - )->_addBreadcrumb( - __('Products Most Viewed Report'), - __('Products Most Viewed Report') - ); + $this->_initAction()->_setActiveMenu( + 'Magento_Reports::report_products_viewed' + )->_addBreadcrumb( + __('Products Most Viewed Report'), + __('Products Most Viewed Report') + ); - $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_product_viewed.grid'); - $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form'); + $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_product_viewed.grid'); + $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form'); - $this->_initReportAction(array($gridBlock, $filterFormBlock)); + $this->_initReportAction(array($gridBlock, $filterFormBlock)); - $this->_view->renderLayout(); + $this->_view->renderLayout(); + } catch (\Magento\Framework\Model\Exception $e) { + $this->messageManager->addError($e->getMessage()); + } catch (\Exception $e) { + $this->messageManager->addError( + __('An error occurred while showing the product views report. Please review the log and try again.') + ); + $this->_objectManager->get('Magento\Framework\Logger')->logException($e); + $this->_redirect('reports/*/viewed/'); + return; + } } } diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 0cdedfb4e612b519767e75affc51bdcf7c779f89..84843815438d60d54bd7d68bf70d2dbb16170fa5 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-log": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-review": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-downloadable": "0.1.0-alpha98", - "magento/module-sales-rule": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-log": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-review": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-downloadable": "0.1.0-alpha99", + "magento/module-sales-rule": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml index 4b2ae4b791fafcd910ab07dfbc96959b94231789..b9b1f1eec7ad87e3b3e3763f9c3508dcd8d0fddd 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="reports_index_search_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="report.search.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml index 4b2ae4b791fafcd910ab07dfbc96959b94231789..b9b1f1eec7ad87e3b3e3763f9c3508dcd8d0fddd 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="reports_index_search_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="report.search.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml index 4809307199a7816dcda8a145e8f612190adc3e70..ca9c14e82de61faee1820e506227a17e886d109b 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_index_search_block"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Search" name="report.search.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml index ee855a368bb91d7be20cb487c3ad38bb60ee1d12..e90d4cf4d31144f4cff4242bb6d124d74e71cbf5 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml @@ -23,12 +23,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="report.search.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.report.search.grid" as="grid"> <arguments> <argument name="id" xsi:type="string">searchReportGrid</argument> - <argument name="dataSource" xsi:type="object">Magento\CatalogSearch\Model\Resource\Query\Collection</argument> + <argument name="dataSource" xsi:type="object">Magento\Search\Model\Resource\Query\Collection</argument> <argument name="default_sort" xsi:type="string">query_id</argument> <argument name="default_dir" xsi:type="string">DESC</argument> </arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml index 7cd864aa67492b590a96747025ce3d498b6d8002..dc5c3300bba727e2940c476479467f355f05830b 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_accounts_grid"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Customer\Accounts" name="adminhtml.report.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml index e396043bc7303f5f83f247c42286d024052b9bc0..7a6615b043ebb99f299ff3772c010f84b9620fbe 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_grid"/> <referenceBlock name="adminhtml.report.grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml index daf398d41e4f90487a603faf3046e8376568a318..aa603eb031ff3c99ad4758563230294f0c5668f2 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_accounts_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml index daf398d41e4f90487a603faf3046e8376568a318..aa603eb031ff3c99ad4758563230294f0c5668f2 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_accounts_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml index 23b16f18621c3422710c9582f0226184b5bb6dc0..3f1505d423fe6d90e2e4a05be7d1b6b516dc7627 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_orders_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml index 23b16f18621c3422710c9582f0226184b5bb6dc0..3f1505d423fe6d90e2e4a05be7d1b6b516dc7627 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_orders_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml index c984c9cdd212ae1cef8827bc73b7a88f1b762613..6959239f251318941c61b6892a2bf1b2838d0b2a 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_totals_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml index c984c9cdd212ae1cef8827bc73b7a88f1b762613..6959239f251318941c61b6892a2bf1b2838d0b2a 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_totals_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml index 0446005c97800012fbce10b51337e1e9928f8436..305ee1396cceba3b8e2ada0983121be1d859e27d 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_orders_grid"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Customer\Orders" name="adminhtml.report.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml index ad7d7780df294f79ecbc5397cf1179ef42ab27db..c5026a3b0a78545b9ee1bc98fcfb9af45e5821f0 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_grid"/> <referenceBlock name="adminhtml.report.grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml index 5b8bec6b2078005931eef9aa5970c396685627cc..4e82fd2f2e6c13a4a96de26f4201c7ea4205d3e5 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_totals_grid"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Customer\Totals" name="adminhtml.report.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml index d748afe6cc669bc033b46c90bb5fe4ae075be294..a89a6863c422757e149eaeae652a001100232667 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_customer_orders_grid"/> <referenceBlock name="adminhtml.report.grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml index 10f8d341c0d1985197e7ee73e8b3cba00b772085..239da5a69d54affd3c5afe53245402fae363b1bf 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" name="adminhtml.report.grid.store_switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_downloads.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_downloads.xml index 4fb51aac1c46749ac715f0d212c6fafa010b7b8b..6b356004ad84a1e1dc52ee56104df65522194e76 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_downloads.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_downloads.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" name="adminhtml.report.product.downloads.store_switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml index 210d10e406af5a9f7edc43810442cd0284970621..9ead95eb9f0d95ce7753a56a685284ad8e286692 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_product_lowstock_grid"/> <container name="adminhtml.block.report.product.lowstock.grid.container" label="Export CSV"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml index 6297553824e1fadb7ded5948a0892ee79cc00c8b..0016d74d32a435ff6d5b5b8cf34d3603271de435 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_product_lowstock_grid"/> <container name="adminhtml.block.report.product.lowstock.grid.container" label="Excel XML"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml index 00a53213553186ed84663d754a31b57a3306d5f1..e754cd343398d563a3b7b704a20d4cbbe9191416 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_product_sold_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml index 00a53213553186ed84663d754a31b57a3306d5f1..e754cd343398d563a3b7b704a20d4cbbe9191416 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_product_sold_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml index cf2c1c16910bc8f88569008c14d7d9941b50124d..4be8f7f0e19d6fcaaa562baf7f16dc0c05f1aeb0 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_product_lowstock_grid"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml index ab009dbd3a644c59d4a8471f95e14825a67e0488..0070f3f8501d739357cb60f7b293b2ff1c0516ad 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.report.grid.container"> <block class="Magento\Reports\Block\Adminhtml\Product\Lowstock\Grid" name="adminhtml.block.report.product.lowstock.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml index de9d487f0d1185cd55410576af324c449296dc3d..701fccd6e601333956be8ccd1663f67cb003cd7f 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_product_sold_grid"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Product\Sold" name="adminhtml.report.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml index f959453dec4db9fa2ff5d287982bd092012439fc..6ac7501480306bfaf8a1ad877c9ad404006f3a40 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_grid"/> <referenceBlock name="adminhtml.report.grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml index 0fb5046c497b1877b6e5b220613123e47450c657..7d2e2139325a09ca1f0c9ac97235f13c2c204cac 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="messages"> <action method="addNotice"> <argument translate="true" name="message" xsi:type="string">This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.</argument> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml index f4f364ea3cc451203232e0e91969a84cedbcdb32..55e31436ba500a236cd4942b742a5443fe772b94 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_review_customer_grid"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Review\Customer" name="adminhtml.report.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml index 92abed67f4f67f0f273a52b151148a80610077ff..a3afdbd8d36766afd1fe577a0b9afb76a8ac4a34 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.report.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.report.review.customer.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml index eac70f2c68346ca2e706f1c2a615b97501cd9bdd..d92fd1ebd4006801afae1f9e42db95a26cc6fcb0 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_review_customer_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml index eac70f2c68346ca2e706f1c2a615b97501cd9bdd..d92fd1ebd4006801afae1f9e42db95a26cc6fcb0 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_review_customer_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml index c8ac374660f13fc3c02d149c2d2704c9aa4614bd..9ca4c5771fac9404e69a36dc45b53475232ca6c5 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_review_product_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml index c8ac374660f13fc3c02d149c2d2704c9aa4614bd..9ca4c5771fac9404e69a36dc45b53475232ca6c5 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_review_product_grid"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml index 2d0abd64dd92d6d2bdd078894fe85a42eb737852..9b51a73f9e5adc5db44c8effff81dc77411f4706 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_report_review_product_grid"/> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Review\Product" name="adminhtml.report.grid.container"/> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml index 85abca3e176dc2d2a961ef04f30effd55ac16ad9..0522db93b7bf3adf9e73601ad2ae8fb5fd0afd8d 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.report.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.report.review.product.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml index b4da497a60360be62a2cefd1115b413691308fc9..1f3b1eabc00f040030b508bdfa955e40ccf79820 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml index beb6833c23cba7ba34db92d65c92b642fb55dc22..da801e281e333c044dc1342719fec9aeb86c7dd5 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml index 4e2f1a3e7fb7368564e2d07a23503610df5498bf..3e96be9df1d34b10577f62f07a4fe4e84c724c32 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml index cc2e2e17f4cc5d5d185001bcbb5252a482fd0502..179d9dc85e48f67cba47fe73b0ccf88bfac260ce 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml index 452adeb868dbae68a698fbc13c1326ca63f02b76..8d97f26cbe32d49813c2402b3491aef5cfcd0be3 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml index 23d9eb29f1d46d39ffd283db257e1bae661469e0..1d55b720b2d563f2277b1aa4ece5cffc02ae7cc0 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml index 79e23c070ca8fdadc5d60a0a11568d2e50d77a99..bb63b5cf935fdf4cbcb0d14faa2cd4b355cb31db 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="reports_sales"/> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_shopcart_abandoned.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_shopcart_abandoned.xml index 64dd3413f19c428bdf825839794da9fff48c0a95..e7feefe8c11305ae651e7d189881cbfd4e7d85f1 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_shopcart_abandoned.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_shopcart_abandoned.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="page.main.actions"> <block class="Magento\Backend\Block\Store\Switcher" name="adminhtml.report.shopcart.abandoned.store_switcher"> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml index 0baff97e59d4e7d41e99073a84b1c5f868cb0072..c6c3bb35954b366c7b0015aba3f0d619d4333cf5 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Reports\Block\Adminhtml\Refresh\Statistics" name="adminhtml.block.report.refresh.statistics"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.report.refresh.statistics.grid" as="grid"> diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml index 6bd5efedc1f4505939cdc424b7702fba04833548..7b6b8ddf3894bd155959346c27c83a8f8964b0a4 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="messages"> <action method="addNotice"> <argument translate="true" name="message" xsi:type="string">This report uses timezone configuration data. Be sure to refresh lifetime statistics any time you change store timezone.</argument> diff --git a/app/code/Magento/Reports/view/frontend/layout/default.xml b/app/code/Magento/Reports/view/frontend/layout/default.xml index 79f92ecebdb256efa0f52a08e61dd8102d5dfc32..2aa1f60d49ffd7d2e78dd949405aa7dbdd4b19af 100644 --- a/app/code/Magento/Reports/view/frontend/layout/default.xml +++ b/app/code/Magento/Reports/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="reports_page_head_components" template="Magento_Reports::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Reports/view/frontend/layout/print.xml b/app/code/Magento/Reports/view/frontend/layout/print.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Reports/view/frontend/layout/print.xml +++ b/app/code/Magento/Reports/view/frontend/layout/print.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 23ec053254d7b8e6544a8ade058c10b93932df04..0703faaeb9735c7e69c30a6b5d5e2bb3f368a71a 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index 5449d3aa435eba1bc8351adf774beb9f4e9dc7a3..5247ac2187254e5e0fdc0d14517956ae264ee3d1 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-newsletter": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-newsletter": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Review/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/Review/view/adminhtml/layout/catalog_product_new.xml index 36378d9ed14baf3245cad03420ebdbb0d37a8603..340c8d0b9c64a74d31ec74f6bad16b61e7ea8bb6 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="product_tabs"> <block class="Magento\Review\Block\Adminhtml\Product\Edit\Tab" name="product.reviews"> <arguments> diff --git a/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml b/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml index 04bd379949df7176b44353930b10002dc34bafd4..6fc27111000c21a7ec73407c5d9bfd91cfd69698 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/rating_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.rating.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.rating.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Review/view/adminhtml/layout/review_product_edit.xml b/app/code/Magento/Review/view/adminhtml/layout/review_product_edit.xml index a58ff00ea392042757b7d04cc5add3e48b2774d0..afdabd0db8830b334acfc86fdb337b832fd9306b 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/review_product_edit.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/review_product_edit.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="review_product_new"/> </page> diff --git a/app/code/Magento/Review/view/adminhtml/layout/review_product_index.xml b/app/code/Magento/Review/view/adminhtml/layout/review_product_index.xml index be6d69b0ef0ce67ce6a30180688a9dbbf84565da..4614418075f07d0f286c45a79974884555bcb6a5 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/review_product_index.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/review_product_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="adminhtml.grid"> <block class="Magento\Framework\View\Element\Text\ListText" name="grid.bottom.links"> <block class="Magento\Review\Block\Adminhtml\Rss\Grid\Link" name="grid.rss.link"/> diff --git a/app/code/Magento/Review/view/adminhtml/layout/review_product_reviews_grid.xml b/app/code/Magento/Review/view/adminhtml/layout/review_product_reviews_grid.xml index 2eef53e96d99e9676b9729040c240f003b2d3a44..2494a512667f75444f5a5292bb2c922de25abd08 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/review_product_reviews_grid.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/review_product_reviews_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Review\Block\Adminhtml\Product\Edit\Tab\Reviews" name="admin.product.reviews"/> </container> diff --git a/app/code/Magento/Review/view/adminhtml/layout/review_rating_edit.xml b/app/code/Magento/Review/view/adminhtml/layout/review_rating_edit.xml index f9047a94eb1855065e88f4c3b1d231548bb7bf72..fe009caa54182c8899c823653fd89e8e84a3fddb 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/review_rating_edit.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/review_rating_edit.xml @@ -24,4 +24,4 @@ */ --> <page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Review/view/adminhtml/layout/review_rating_index.xml b/app/code/Magento/Review/view/adminhtml/layout/review_rating_index.xml index e318f0de8e44261aaef97422ad603ac12cede147..31f990a2b6feb51f34b8de9ddb3fe9f518d90746 100644 --- a/app/code/Magento/Review/view/adminhtml/layout/review_rating_index.xml +++ b/app/code/Magento/Review/view/adminhtml/layout/review_rating_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="rating_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml index f223c332d1f7f9cc9de8dcea8273b610081961a8..895bc1772a29e2f9f06c91c6cbe88845efccf066 100644 --- a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml"> <arguments> diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml index 307ae41cc9027d8a4ebfa4bc3f12853ca06cf78f..cf21794e5988189a8e9a9677801290c7b416dd05 100644 --- a/app/code/Magento/Review/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Review/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_account_navigation"> <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-product-reviews-link"> <arguments> diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml index 9f47214355fa734fde6914e5c89e599472723b0a..14582a24328490c7ad93d51cf46e58e1001180b6 100644 --- a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml +++ b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml index 7a53d2dbe2507b7d1440485e895d2f9631ba7923..c712ef6af7e68621da76224546718da4328ca7af 100644 --- a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml +++ b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="customer/list.phtml" cacheable="false"/> diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml index cfbd782fe0b2d2809c4230a21386937e902c44cc..e17c26ffaad9c0f900ffa25353218693c4ab7c10 100644 --- a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml +++ b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false"/> diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml index b4eab5dd5044ec8110c1c0c870197fab414c75e0..7004ac73eeabb96bde4bb153829a17059fc2da3a 100644 --- a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml +++ b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view"/> <referenceContainer name="product.info.main"> <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto"/> diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml index 75e637d2b2efbfc86e2d7e8e113fa4e80270f88c..8278083db914eaadab5dbd61ec455fc174dacebd 100644 --- a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml +++ b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="product/view/list.phtml"/> <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar"> diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml index 249533fba57c3ec0ecd99a5158ef33d236cad97f..e5692d1b51247c3860acc77461a7ee7d5a0811d4 100644 --- a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml +++ b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Review\Block\View" name="review_view"/> </referenceContainer> diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index 0583eb66b6a49539510dbcafd860034651efb92c..1ec8a2abd052e62911a8b50f267fb938d9e502b5 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Rss/view/frontend/layout/default.xml b/app/code/Magento/Rss/view/frontend/layout/default.xml index 518aa72b134bbe04e584beda4be13859a80fd820..fd04231a16d9024e23e6ca4d0de42668c57e94e3 100644 --- a/app/code/Magento/Rss/view/frontend/layout/default.xml +++ b/app/code/Magento/Rss/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="footer_links"> <block class="Magento\Framework\View\Element\Html\Link\Current" name="rss-link" ifconfig="rss/config/active"> <arguments> diff --git a/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml b/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml index a0f91e6bc78b25ebe6a1e922596db2974da421a9..f6540bcc6cf67d37b103c15a5f04cbc15ae0ff77 100644 --- a/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml +++ b/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-right" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="2columns-right" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="page.main.title"> <action method="setPageTitle"> <argument name="title" translate="true" xsi:type="string">RSS Feeds</argument> diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index 7d9fa0e7d97f47f5c3e4aec66907151ec13c9b09..6bb269688fa6a09c96a5e820f281ffa3935b66d5 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php index a462679088f198c87c4578a4a1b5d7976546844b..2f1a4d33da81e63fc7f50886adb425b6d26173cb 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php @@ -25,6 +25,7 @@ namespace Magento\Sales\Block\Adminhtml\Order\View; use Magento\Customer\Service\V1\CustomerMetadataServiceInterface; use Magento\Eav\Model\AttributeDataFactory; +use Magento\Framework\Exception\NoSuchEntityException; /** * Order history block @@ -124,8 +125,12 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder { if ($this->getOrder()) { $customerGroupId = $this->getOrder()->getCustomerGroupId(); - if (!is_null($customerGroupId)) { - return $this->_groupService->getGroup($customerGroupId)->getCode(); + try { + if (!is_null($customerGroupId)) { + return $this->_groupService->getGroup($customerGroupId)->getCode(); + } + } catch (NoSuchEntityException $e) { + return ''; } } return ''; diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php index 6287f080a61bfbf6c27d0f3b1d7c4b0e11ae560e..2fdf5c29c159b12226ddf9f3bcf15443f343f02e 100644 --- a/app/code/Magento/Sales/Model/Order.php +++ b/app/code/Magento/Sales/Model/Order.php @@ -488,9 +488,11 @@ class Order extends \Magento\Sales\Model\AbstractModel implements EntityInterfac protected $_productVisibility; /** - * @var \Magento\Tax\Model\Calculation + * Tax helper + * + * @var \Magento\Tax\Helper\Data */ - protected $_taxCalculation; + protected $_taxHelper; /** * @var \Magento\Sales\Model\Service\OrderFactory @@ -507,11 +509,6 @@ class Order extends \Magento\Sales\Model\AbstractModel implements EntityInterfac */ protected $_orderHistoryFactory; - /** - * @var \Magento\Tax\Model\Resource\Sales\Order\Tax\CollectionFactory - */ - protected $_orderTaxCollectionFactory; - /** * @var Resource\Order\Address\CollectionFactory */ @@ -562,12 +559,11 @@ class Order extends \Magento\Sales\Model\AbstractModel implements EntityInterfac * @param \Magento\Catalog\Model\ProductFactory $productFactory * @param Resource\Order\Item\CollectionFactory $orderItemCollectionFactory * @param \Magento\Catalog\Model\Product\Visibility $productVisibility - * @param \Magento\Tax\Model\Calculation $taxCalculation + * @param \Magento\Tax\Helper\Data $taxHelper * @param Service\OrderFactory $serviceOrderFactory * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory * @param \Magento\Eav\Model\Config $eavConfig * @param Order\Status\HistoryFactory $orderHistoryFactory - * @param \Magento\Tax\Model\Resource\Sales\Order\Tax\CollectionFactory $orderTaxCollectionFactory * @param Resource\Order\Address\CollectionFactory $addressCollectionFactory * @param Resource\Order\Payment\CollectionFactory $paymentCollectionFactory * @param Resource\Order\Status\History\CollectionFactory $historyCollectionFactory @@ -590,12 +586,11 @@ class Order extends \Magento\Sales\Model\AbstractModel implements EntityInterfac \Magento\Catalog\Model\ProductFactory $productFactory, \Magento\Sales\Model\Resource\Order\Item\CollectionFactory $orderItemCollectionFactory, \Magento\Catalog\Model\Product\Visibility $productVisibility, - \Magento\Tax\Model\Calculation $taxCalculation, + \Magento\Tax\Helper\Data $taxHelper, \Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory, \Magento\Directory\Model\CurrencyFactory $currencyFactory, \Magento\Eav\Model\Config $eavConfig, \Magento\Sales\Model\Order\Status\HistoryFactory $orderHistoryFactory, - \Magento\Tax\Model\Resource\Sales\Order\Tax\CollectionFactory $orderTaxCollectionFactory, \Magento\Sales\Model\Resource\Order\Address\CollectionFactory $addressCollectionFactory, \Magento\Sales\Model\Resource\Order\Payment\CollectionFactory $paymentCollectionFactory, \Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory $historyCollectionFactory, @@ -614,12 +609,11 @@ class Order extends \Magento\Sales\Model\AbstractModel implements EntityInterfac $this->_orderItemCollectionFactory = $orderItemCollectionFactory; $this->_productVisibility = $productVisibility; - $this->_taxCalculation = $taxCalculation; + $this->_taxHelper = $taxHelper; $this->_serviceOrderFactory = $serviceOrderFactory; $this->_currencyFactory = $currencyFactory; $this->_eavConfig = $eavConfig; $this->_orderHistoryFactory = $orderHistoryFactory; - $this->_orderTaxCollectionFactory = $orderTaxCollectionFactory; $this->_addressCollectionFactory = $addressCollectionFactory; $this->_paymentCollectionFactory = $paymentCollectionFactory; $this->_historyCollectionFactory = $historyCollectionFactory; @@ -2195,8 +2189,7 @@ class Order extends \Magento\Sales\Model\AbstractModel implements EntityInterfac */ public function getFullTaxInfo() { - $rates = $this->_orderTaxCollectionFactory->create()->loadByOrder($this)->toArray(); - return $this->_taxCalculation->reproduceProcess($rates['items']); + return $this->_taxHelper->getCalculatedTaxes($this); } /** diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php index 1b8ff49df01381ef4cf01c69e29bcdab7cebf084..4b34e0c6624870208e5ae472aae8a869646dc893 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php @@ -769,6 +769,21 @@ class Creditmemo extends \Magento\Sales\Model\AbstractModel implements EntityInt return $this; } + /** + * Checking if the creditmemo is last + * + * @return bool + */ + public function isLast() + { + foreach ($this->getAllItems() as $item) { + if (!$item->isLast()) { + return false; + } + } + return true; + } + /** * Adds comment to credit memo with additional possibility to send it to customer via email * and show it in customer account diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php index 81021e01749a4acd81204a618fd50a33eff3a108..6e514207bdc6fb818d112dddf1c89b93a1698d83 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php @@ -282,7 +282,7 @@ class Item extends \Magento\Framework\Model\AbstractModel $rowTotalInclTax = $orderItem->getRowTotalInclTax(); $baseRowTotalInclTax = $orderItem->getBaseRowTotalInclTax(); - if (!$this->isLast() && $orderItemQtyInvoiced > 0) { + if (!$this->isLast() && $orderItemQtyInvoiced > 0 && $this->getQty() > 0) { $availableQty = $orderItemQtyInvoiced - $orderItem->getQtyRefunded(); $rowTotal = $creditmemo->roundPrice($rowTotal / $availableQty * $this->getQty()); $baseRowTotal = $creditmemo->roundPrice($baseRowTotal / $availableQty * $this->getQty(), 'base'); @@ -310,9 +310,7 @@ class Item extends \Magento\Framework\Model\AbstractModel public function isLast() { $orderItem = $this->getOrderItem(); - if ((string)(double)$this->getQty() == (string)(double)$orderItem->getQtyToRefund() && - !$orderItem->getQtyToInvoice() - ) { + if ((string)(double)$this->getQty() == (string)(double)$orderItem->getQtyToRefund()) { return true; } return false; diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php index dc0586ab4d7508081746e66ebe9dba821805518d..1ef77a38a856601f0508f4d6b12ad25e48abea5a 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php @@ -46,7 +46,7 @@ class Tax extends AbstractTotal /** @var $item \Magento\Sales\Model\Order\Creditmemo\Item */ foreach ($creditmemo->getAllItems() as $item) { $orderItem = $item->getOrderItem(); - if ($orderItem->isDummy()) { + if ($orderItem->isDummy() || $item->getQty() <= 0) { continue; } $orderItemTax = (double)$orderItem->getTaxInvoiced(); @@ -60,8 +60,8 @@ class Tax extends AbstractTotal $tax = $orderItemTax - $orderItem->getTaxRefunded(); $baseTax = $baseOrderItemTax - $orderItem->getTaxRefunded(); - $hiddenTax = $orderItem->getHiddenTaxAmount() - $orderItem->getHiddenTaxRefunded(); - $baseHiddenTax = $orderItem->getBaseHiddenTaxAmount() - $orderItem->getBaseHiddenTaxRefunded(); + $hiddenTax = $orderItem->getHiddenTaxInvoiced() - $orderItem->getHiddenTaxRefunded(); + $baseHiddenTax = $orderItem->getBaseHiddenTaxInvoiced() - $orderItem->getBaseHiddenTaxRefunded(); if (!$item->isLast()) { $availableQty = $orderItemQty - $orderItem->getQtyRefunded(); $tax = $creditmemo->roundPrice($tax / $availableQty * $item->getQty()); @@ -139,22 +139,33 @@ class Tax extends AbstractTotal $baseTotalHiddenTax += $baseShippingHiddenTaxAmount; } - $allowedTax = $order->getTaxAmount() - $order->getTaxRefunded(); - $allowedBaseTax = $order->getBaseTaxAmount() - $order->getBaseTaxRefunded(); - $allowedHiddenTax = $order->getHiddenTaxAmount() + + $allowedTax = $order->getTaxInvoiced() - $order->getTaxRefunded() - $creditmemo->getTaxAmount(); + $allowedBaseTax = $order->getBaseTaxInvoiced() - $order->getBaseTaxRefunded() - $creditmemo->getBaseTaxAmount(); + $allowedHiddenTax = $order->getHiddenTaxInvoiced() + $order->getShippingHiddenTaxAmount() - $order->getHiddenTaxRefunded() - - $order->getShippingHiddenTaxRefunded(); - $allowedBaseHiddenTax = $order->getBaseHiddenTaxAmount() + + $order->getShippingHiddenTaxRefunded() - + $creditmemo->getHiddenTaxAmount() - + $creditmemo->getShippingHiddenTaxAmount(); + $allowedBaseHiddenTax = $order->getBaseHiddenTaxInvoiced() + $order->getBaseShippingHiddenTaxAmnt() - $order->getBaseHiddenTaxRefunded() - - $order->getBaseShippingHiddenTaxRefunded(); + $order->getBaseShippingHiddenTaxRefunded() - + $creditmemo->getBaseShippingHiddenTaxAmnt() - + $creditmemo->getBaseHiddenTaxAmount(); - $totalTax = min($allowedTax, $totalTax); - $baseTotalTax = min($allowedBaseTax, $baseTotalTax); - $totalHiddenTax = min($allowedHiddenTax, $totalHiddenTax); - $baseTotalHiddenTax = min($allowedBaseHiddenTax, $baseTotalHiddenTax); + if ($creditmemo->isLast()) { + $totalTax = $allowedTax; + $baseTotalTax = $allowedBaseTax; + $totalHiddenTax = $allowedHiddenTax; + $baseTotalHiddenTax = $allowedBaseHiddenTax; + } else { + $totalTax = min($allowedTax, $totalTax); + $baseTotalTax = min($allowedBaseTax, $baseTotalTax); + $totalHiddenTax = min($allowedHiddenTax, $totalHiddenTax); + $baseTotalHiddenTax = min($allowedBaseHiddenTax, $baseTotalHiddenTax); + } $creditmemo->setTaxAmount($creditmemo->getTaxAmount() + $totalTax); $creditmemo->setBaseTaxAmount($creditmemo->getBaseTaxAmount() + $baseTotalTax); diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php index fb66db73153b9465c88291838bb24b4e2e6390e1..602d157e65c6b4bfff7472f491d5007170933aa4 100644 --- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php +++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php @@ -46,7 +46,7 @@ class Tax extends AbstractTotal $orderItemQty = $orderItem->getQtyOrdered(); if (($orderItem->getTaxAmount() || $orderItem->getHiddenTaxAmount()) && $orderItemQty) { - if ($item->getOrderItem()->isDummy()) { + if ($item->getOrderItem()->isDummy() || $item->getQty() <= 0) { continue; } diff --git a/app/code/Magento/Sales/Model/Resource/Order/Customer/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Customer/Collection.php index 36a493258ea5b94aff348ae3c0c92aaaa42987ab..9f05d0aeec6a5cdaf7086a93265e02c246b8fea5 100644 --- a/app/code/Magento/Sales/Model/Resource/Order/Customer/Collection.php +++ b/app/code/Magento/Sales/Model/Resource/Order/Customer/Collection.php @@ -74,6 +74,13 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection 'store_id=store_id', null, 'left' + )->joinField( + 'website_name', + 'store_website', + 'name', + 'website_id=website_id', + null, + 'left' ); return $this; } diff --git a/app/code/Magento/Sales/Model/Service/Quote.php b/app/code/Magento/Sales/Model/Service/Quote.php index 2555c195b189c85ef5ee659f254abb22a5938610..495e428a9100c5e4fe5f5193a3abb633f8091833 100644 --- a/app/code/Magento/Sales/Model/Service/Quote.php +++ b/app/code/Magento/Sales/Model/Service/Quote.php @@ -275,21 +275,16 @@ class Quote $order->setQuote($quote); $transaction->addObject($order); - $transaction->addCommitCallback(array($order, 'place')); - $transaction->addCommitCallback(array($order, 'save')); /** * We can use configuration data for declare new order status */ - $this->_eventManager->dispatch( - 'checkout_type_onepage_save_order', - array('order' => $order, 'quote' => $quote) - ); $this->_eventManager->dispatch( 'sales_model_service_quote_submit_before', array('order' => $order, 'quote' => $quote) ); try { + $order->place(); $transaction->save(); $this->_inactivateQuote(); $this->_eventManager->dispatch( diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index c0d7676c85fb060102da75376ad99485fae27fc1..6e17eeb82eee26eded128dd7edcee8d14186293a 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -3,31 +3,31 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-authorization": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-sales-rule": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-gift-message": "0.1.0-alpha98", - "magento/module-reports": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-email": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-sales-rule": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-gift-message": "0.1.0-alpha99", + "magento/module-reports": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-email": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportcsv.xml index 680639c51f46c4160b9e5559f98a96a6a108254b..97df1557a777d02dfcd857f10a57532fd6da1c5b 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportcsv.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_creditmemo_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_creditmemo.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportexcel.xml index 680639c51f46c4160b9e5559f98a96a6a108254b..97df1557a777d02dfcd857f10a57532fd6da1c5b 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportexcel.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_exportexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_creditmemo_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_creditmemo.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid.xml index c952125d72e01e1fc0dba34a4af6ed4e7696ae36..03b18a0d205e9869d670f7ea6930d747d3f6dfab 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="sales_creditmemo_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid_block.xml index aaf8c01d6183c45d66fe69ecb7b2bdab8b2298a4..a859535ddc50288116803929a45a024d991fbaac 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_creditmemo.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.creditmemo.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_index.xml index e365efa7e0d5b5dad09c0b632a9d1f47fc01abef..6f113e377800579ab4d744f53dcfa392e2db5172 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_creditmemo_grid_block"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Creditmemo" name="sales_creditmemo.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_item_price.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_item_price.xml index f123922450f0310d101b41f37d04149d347b0f01..ebe4a2fa39b5cfbe89dd8d85c64879244ae8b9a5 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_item_price.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_creditmemo_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_items"> <block class="Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml index 90f397c960daaf2390b84bf64b22a8d00c7ed25f..d20e5722abbe3575f8c6b8996379194821e491b1 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_invoice_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_invoice.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml index 90f397c960daaf2390b84bf64b22a8d00c7ed25f..d20e5722abbe3575f8c6b8996379194821e491b1 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_invoice_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_invoice.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml index 5dcc732e4523d5b0c69d6201885eb51dd5e97605..d45a2a1705a76131f922bcbd9bf11048b020ba16 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="sales_invoice_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml index 09c824383bed1c51b05ff30e32b4ad694032a6f1..f5c421be0bcc1ff0d696a5e2b73903fb57812a49 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_invoice.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.invoice.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml index 10ff07c364af75f7a8e8932decfc7d0131ffe14c..fa36747ffef88e3044ce3551b8b3d5be92de1a76 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_invoice_grid_block"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Invoice" name="sales_invoice.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_item_price.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_item_price.xml index cfb6efa58b2112fbd4704d11c1d98d074765bc1f..fa958be9975d7acb5d88746e6ba5fe60e134977c 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_item_price.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_items"> <block class="Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml index 5e225879357b5667a6dd4da6cd3f4cf36dbf6ddf..68dc8d372461e512ff32556005e9a935e7e1ad1f 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Sales\Block\Adminhtml\Order\View\History" name="order_history" template="order/view/history.phtml"/> </container> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml index 91883f95c841fc9f4301940dc4de809978769940..ab43361e26a08deb3f0754e0c1932162a44cf331 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Address" name="sales_order_address.form.container"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml index fd3bab8b729adbc144ec8ce4412047b9e0907547..8d2a90ae8118fb8a3259efe04df160ff6b865bd6 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.customer.grid.container" as="grid"> <arguments> @@ -97,6 +97,13 @@ <argument name="align" xsi:type="string">center</argument> </arguments> </block> + <block class="Magento\Backend\Block\Widget\Grid\Column" as="website_name"> + <arguments> + <argument name="header" xsi:type="string" translate="true">Website</argument> + <argument name="index" xsi:type="string">website_name</argument> + <argument name="align" xsi:type="string">center</argument> + </arguments> + </block> </block> </block> </referenceBlock> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml index 9bb9a23d8f9c800187efc06137619c725e9ba1ca..39799b73f23de94491079b5ada11a865840b4100 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_create_customer_block"/> <update handle="sales_order_create_item_price"/> <referenceBlock name="page-title"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_item_price.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_item_price.xml index 3d424396f0984ea131fca572022b5e6cb4733159..3d0966da8ca066b115a3b75a07017dbffde7dc5d 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_item_price.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid" name="item_unit_price" template="order/create/items/price/unit.phtml"/> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid" name="item_row_total" template="order/create/items/price/row.phtml"/> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid" name="item_row_total_with_discount" template="order/create/items/price/total.phtml"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml index 10f894c740022eecb1d89e38bc9d9297deefaed6..052c31241386f4be1c18b83fab5351fc176eb0a8 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="order/create/form/address.phtml" name="billing_address"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml index b484bfc867e0fd5b710600d1b5b0db42b9256ea8..8691e19bcbd298727887782f088f5f4f12f6ad86 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method" template="order/create/abstract.phtml" name="billing_method"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method\Form" template="order/create/billing/method/form.phtml" name="order.create.billing.method.form" as="form"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml index 4e381a28429143ef8330288326f046427ccc5405..2e7b5d12041e32c164ecff8a919134c936458bc9 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Comment" template="order/create/comment.phtml" name="comment"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml index c75dbd2ff5dac5016bd83630320bc8be1000643f..b1fb1176a12b8181f46332f1d7dd7e82eaeaf7f0 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="sales_order_create_customer_block"/> <referenceContainer name="content"> <block class="Magento\Backend\Block\Widget\Grid\Container" name="customer.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml index a1f6934d5e643ac0ec4d29581f6e04215408f422..d3706597096c05c49e926d3c2c0e9754282f0253 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_create_item_price"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Data" template="order/create/data.phtml" name="data"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml index ad721cb0f5607601139633bb928f816d6294f42d..3a169219beced485f84a94364b83edc349b26e55 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="order/create/form/account.phtml" name="form_account"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml index c1b604afd6b5a9d5733df72d36b35a8c0b63b6ac..fa9415e9ba20df2439ffb091bfd9e6b76a86df67 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage" template="order/create/giftmessage.phtml" name="giftmessage"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml index 8d7b6a2ad11fed05c96ee4216b90e4d718623f61..48b5bd116bfec1f6bb20c62dd2b7ff4c35fb6e55 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Header" name="header"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml index bdd1f9a524c03753e58c1dd260956e3fb9e519fe..23cf50374db07f140df5f789cea5f9580683847b 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_create_item_price"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items" template="order/create/items.phtml" name="items"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml index 3a22ba83a656328eb09a6cbdb37c2ca0db25f02e..f700432cf48902b698e49619a68b1543fb3e1b4b 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="backend.page"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Load" name="content"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml index e99738806392a296e55c75846b2e1d9fc64a005e..10c9e163adf000a1d4f1fc7ab99688647a46ea8b 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Messages" name="message"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml index ef040f3540a01a06ec1d819bdf1628f3bc4d45e8..589e42fb30a1204e43785c0d2e26fe1f008ffbb9 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter" template="order/create/abstract.phtml" name="newsletter"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter\Form" template="order/create/newsletter/form.phtml" name="order.create.newsletter.form" as="form"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml index 85eab90f15ac7ffe3577bc68d167c7bb989bfb89..8fe6191774e909d12165a97197354d247f43760b 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="backend.page"> <container name="content" label="Content"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml index f9ea909e0d58eecb5fa99d26b5dd2ce2f6933875..f77db323bebc5222a2db93b87f265c813d47066a 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search" template="order/create/abstract.phtml" name="search"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid" name="search.grid" as="grid"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml index dfc10eed87f3e5fb3a1f722ff040f32f228a5835..a6a2e9092594e7b8399553bfdf3bdbdc6e3af673 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid" name="serach.grid" as="grid"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml index 9e29f4978756ad0fbbf2fd0373f77c5abbdb8edc..c255ffb0a4674137bf30de252c4c4c78cb886aeb 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="order/create/form/address.phtml" name="shipping_address"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml index 4ca346515365eb1d273f7c8810b53091fc8856ec..21ef9600692544e2889965354ccd842b2b1ee771 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="order/create/abstract.phtml" name="shipping_method"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml index c5bc9591abbe8fcc02a02cab4a9e18193ebb4f67..932bfc33cfbb3c8aaef34cf82c22bb458af2b68d 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="order/create/sidebar.phtml" name="sidebar"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="order/create/sidebar/items.phtml" name="cart"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml index a43916972055e8b6f7b8477bb367fbb1f3506e1f..24e5bebccc07a22983c92038096c74fd86b3da30 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="order/create/sidebar/items.phtml" name="sidebar_cart"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml index 1341d44ac62438d3d426e5d41fc5dfce4f3f4d77..fee756b231dde5dd1983c1684c39f7773fb4a282 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Compared" template="order/create/sidebar/items.phtml" name="sidebar_compared"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml index eac65c41b6bcf4d7c717c64d7602e31ba9565a9b..1c1a178d71a8d6a1cf3c9416054a9e1959d55d04 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pcompared" template="order/create/sidebar/items.phtml" name="sidebar_pcompared"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml index c58110807a4d1f31e0aeee75b9111cc7b278282c..d1bc84add55ebf26aae799b6f89d8b8cfdce914e 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="order/create/sidebar/items.phtml" name="sidebar_pviewed"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml index 1759e5e4ab2324c2bf107df28b79d3ea1cbe8415..9010c882f6f2a737c6b1b06b7be9af4dcee19609 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="order/create/sidebar/items.phtml" name="sidebar_reorder"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml index 048f1ea552789abbdcf9459931aec62d8f1b2884..f0d16c0c11528e75c534baec5baac925864f3055 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Viewed" template="order/create/sidebar/items.phtml" name="sidebar_viewed"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml index 64d265763671ed39e56fc4d7344375e6cd3733e4..a1653f38fcb9eb62f7700e2b460bb108a1d99f40 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="order/create/sidebar/items.phtml" name="sidebar_wishlist"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml index 5edd76d44af9dd1dc6a646a77bd87bcc4d1bf90c..44dd904d98c9b75a5f13bc99d5fd24f5d81678b3 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Create\Totals" template="order/create/totals.phtml" name="totals"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml index 469582438a5be4a3c556ef69e8ca20a369c40935..cfc91568db92189af1c66699b1161f1621dc613d 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Comments" name="creditmemo_comments"> <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml"/> </block> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml index bb4ec6f4933a5dec78893bb7d1e6bb66734084a2..f17a700c95054ed9bd6aced519a40ecaaef437af 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_order_creditmemo.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.order_creditmemo.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml index 3d65741190e8ecc3556725f700eb477d638b51c6..9cf3e6b6cfbd6544cd3f6886fdef36414d6b1eab 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_item_price"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create" name="sales_creditmemo_create"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index 30a90f8e8ca8a8dcbaa1f90f5aeb70025750d2cf..794ad82076e253fbdb705bda6852d41ded612c75 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_item_price"/> <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="order/creditmemo/create/items.phtml"> <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/creditmemo/create/items/renderer/default.phtml"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml index c9b7484363c3886b88593725cbc7cb76749e0a7d..6bcba10263b6ae3024dccda5ee8d0b03e75ead8e 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_creditmemo_item_price"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View" name="sales_creditmemo_view"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemos.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemos.xml index 3359bb0ad71e6ef47d32d5b01ffe0eb2563b68de..ca2054659ff3add16afb4252db377fa0e028270f 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemos.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemos.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="sales_order_creditmemo_grid_block"/> <container name="root"> <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Creditmemos" name="sales_order_creditmemo.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml index ca66e4cc0d4efef7407d2d5db675d7fd978acf19..2d23bfc62c38150df16ba69ff28d2b8a7a19a6f7 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_create_index"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml index 546e13e38e7e82084f68308c0294ad912d6e1607..63cf82fa7816bed37933eb7b5c996a4647dd428c 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_order.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml index 546e13e38e7e82084f68308c0294ad912d6e1607..63cf82fa7816bed37933eb7b5c996a4647dd428c 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_order.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml index 805b9e1242d561a9e7b18b417eb397fa48a4b4b9..4592a8fdc1d7bc7443ca8a185c00088c1e3aacd0 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="sales_order_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml index 165fd71b57dda11527256d67f9f9400d0e168861..a8a79e04ab63e183558d4ed5f90385af6c7d15f8 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_order.grid.container"> <block class="Magento\Sales\Block\Adminhtml\Order\Grid" name="sales.order.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml index 806ad02294000844d55aa26bb1826484c123a7dd..d28eb1d00575ee8840b9976a9d5de87d184b16d5 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_grid_block"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order" name="sales_order.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml index c48d728c39dbe3e88bf2371edd2826a75cec4efc..76c474b9f0557ec5285c0c68daeae4305ae2679a 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Comments" name="invoice_comments"> <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml"/> </block> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml index cccad024a6aace177c5713d49ae71340af1afdad..c2224749b332253b69114fd5fa0d34d5d7570f8f 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_order_invoice.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.order_invoice.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml index 16e79c7da622109c19246da4133a6f43ca2cb017..10017a11c298ae38e03ea7a40987d5d852473f94 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_item_price"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create" name="sales_invoice_create"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml index b09ec778cf5b1663ca7072867b13227747ad356a..fd84471a5ec8222c4958dea6db9d5b395c428927 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_item_price"/> <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Items" name="order_items" template="order/invoice/create/items.phtml"> <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/invoice/create/items/renderer/default.phtml"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml index ffd58e6da959c7ee010590fcad9e05bcc99f2983..3ab8c039d096d8ea5446b6941847f312add39a2a 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_invoice_item_price"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View" name="sales_invoice_view"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoices.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoices.xml index 3163c5c83f7ae408022ea544e0dd59adf7a52aca..5b03d67a0f80f2252e76e12b2f0b154642bcc5b7 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoices.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="sales_order_invoice_grid_block"/> <container name="root"> <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Invoices" name="sales_order_invoice.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_item_price.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_item_price.xml index d313fd7d0c9fdfb5ba87af4b3a2f24ec504f5efc..25eafab7353216f8236435d757081bac00511213 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_item_price.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml index 252c9e83b40ece772652ca181840fdc6d2028418..086bc8ec9a2766a1356671e27f378a0c140b4c3d 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_order_shipment.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.order_shipment.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipments.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipments.xml index 66f35f52f8b3b71af7b54a691c050e241a5301e1..fa02fc3566c31f5a1053a95bf5e420a91b0beb96 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipments.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipments.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="sales_order_shipment_grid_block"/> <container name="root"> <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Shipments" name="sales_order_shipment.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml index 59f253d5dd882cc37de8f79558b1817a58f4e2bf..c617a35b6bb82f0099ad7fe4390d5d6ab704fa78 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Status\Assign" name="sales_order_status.assign.container"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml index c75f3a9363aa1dd59187fd3b5c57552cc5610b6c..cea5cfed4f3bf475bbfc42869dea3c1a0d359b96 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Status\Edit" name="sales_order_status.edit.container"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml index b7402bfb6085c0b9121c78cece3a9b1bb3629e6a..48a1b528860c720d84d1a98268ab98c1cdf2d215 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Status" name="sales_order_status.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales_order_status.grid" as="grid"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_new.xml index 9f719b7a2d0478c7daf295c654182c149c425b78..bc93126cf515c337cd2f8af9841dbadbb4b78d67 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_new.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Order\Status\NewStatus" name="sales_order_status.new.container"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml index f29494a991b1ad163c4d15bbc134229c8991f638..df7a671c4d197fc208b969ca0fd2db6de438b8ae 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="sales_order_transactions_grid_block"/> <container name="root"> <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions" name="sales_transactions.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml index d91bdc57c91de972beb1f16db6bb15e6b40a35d3..d6530b05a73fbf49850b7dbe27488ed791c56a6d 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_transactions_grid_block"/> <referenceBlock name="sales.transactions.grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml index 0eb9462c8a67f6a51bb88ff455b195ac2cd71f03..e216116caaad60d46ea4a24617c9241dbe144c30 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_Sales::js/bootstrap/order-create-index.js"/> </head> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml index 25c231a0cdeefd42407c01184acb3ab5e989d7ca..0047f983c8fec33cae05ec11452219fbbd2a4432 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_shipment_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_shipment.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml index dcdcee11a33db7ea04c3a0cbd568a061c64ea3f9..049b645916627addc02691dba2679bf7079b3b67 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" > +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" > <update handle="sales_shipment_grid_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_shipment.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml index 74a55fc08906ac56b43a5504221c8c3d92c8ef5d..e2c0f329ecb6a2218799e633a51bb85373ca7ac4 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_shipment.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.shipment.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml index 1a63c0a5564d0d146817229170c568255987c2ef..868a49176633be8f4719e36a7061cbdaee425ede 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_shipment_grid_block"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Shipment" name="sales_shipment.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml index a1cb655d70dca382cd02ec910d08b7a9ae5beb85..f795b20fdc1b8d22be13db0bfede1be896ef400f 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transaction_child_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_transactions_grid_block"/> <referenceBlock name="sales.transactions.grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml index 577c0617ebc8ebcc9d1a9a24382df8cd96ad46fe..bfd899975d0fa69b8e67c962628f7e39712ef327 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="sales_transactions_grid_block"/> <container name="root"> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml index 81f8d2abdf8fd2366805cd120ecce630bd8ac08e..ba50a4c051c1678c1228fab756ed325e7ab74f39 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales_transactions.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="sales.transactions.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml index ce7ba3768334d5021f4955d83dae50f4c49e7b61..8d34e2c4b2a7f8143d92edc19471a2a9a146b688 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_transactions_grid_block"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Transactions" name="sales_transactions.grid.container"/> diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml index fc6eff51a1dd0c87e41db8eb5d65f1a139f8b35f..7bce3e58008edc5bd573c7d1d5edbd6fa7b766b6 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_transaction_child_block"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Adminhtml\Transactions\Detail" name="sales_transactions.detail" template="transactions/detail.phtml"> diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js index c76a1f7dc0e999ce795b50febffb51af63f0ba27..7176123cc8560484a2087fbbea778e8fadbeb1bf 100644 --- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js +++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js @@ -1172,49 +1172,84 @@ AdminOrder.prototype = { parameters: params, onSuccess: function(response) { var message = ''; - var groupChangeRequired = false; + var groupActionRequired = null; try { response = response.responseText.evalJSON(); - if (true === response.valid) { - message = parameters.vatValidMessage; - if (currentCustomerGroupId != response.group) { - message = parameters.vatValidAndGroupChangeMessage; - groupChangeRequired = true; + if (null === response.group) { + if (true === response.valid) { + message = parameters.vatValidMessage; + } else if (true === response.success) { + message = parameters.vatInvalidMessage.replace(/%s/, params.vat); + } else { + message = parameters.vatValidationFailedMessage; } - } else if (response.success) { - message = parameters.vatInvalidMessage.replace(/%s/, params.vat); - groupChangeRequired = true; } else { - message = parameters.vatValidationFailedMessage; - groupChangeRequired = true; + if (true === response.valid) { + message = parameters.vatValidAndGroupValidMessage; + if (0 === response.group) { + message = parameters.vatValidAndGroupInvalidMessage; + groupActionRequired = 'inform'; + } else if (currentCustomerGroupId != response.group) { + message = parameters.vatValidAndGroupChangeMessage; + groupActionRequired = 'change'; + } + } else if (response.success) { + message = parameters.vatInvalidMessage.replace(/%s/, params.vat); + groupActionRequired = 'inform'; + } else { + message = parameters.vatValidationFailedMessage; + groupActionRequired = 'inform'; + } } - } catch (e) { - message = parameters.vatErrorMessage; + message = parameters.vatValidationFailedMessage; } - if (!groupChangeRequired) { + if (null === groupActionRequired) { alert(message); } else { - this.processCustomerGroupChange(parameters.groupIdHtmlId, message, response.group); + this.processCustomerGroupChange( + parameters.groupIdHtmlId, + message, + parameters.vatCustomerGroupMessage, + parameters.vatGroupErrorMessage, + response.group, + groupActionRequired + ); } }.bind(this) }); }, - processCustomerGroupChange: function(groupIdHtmlId, message, groupId) + processCustomerGroupChange: function(groupIdHtmlId, message, customerGroupMessage, errorMessage, groupId, action) { - var currentCustomerGroupId = $(groupIdHtmlId).value; - var currentCustomerGroupTitle = $$('#' + groupIdHtmlId + ' > option[value=' + currentCustomerGroupId + ']')[0].text; - var customerGroupOption = $$('#' + groupIdHtmlId + ' > option[value=' + groupId + ']')[0]; - var confirmText = message.replace(/%s/, customerGroupOption.text); - confirmText = confirmText.replace(/%s/, currentCustomerGroupTitle); - if (confirm(confirmText)) { - $$('#' + groupIdHtmlId + ' option').each(function(o) { - o.selected = o.readAttribute('value') == groupId; - }); - this.accountGroupChange(); + var groupMessage = ''; + try { + var currentCustomerGroupId = $(groupIdHtmlId).value; + var currentCustomerGroupTitle = + $$('#' + groupIdHtmlId + ' > option[value=' + currentCustomerGroupId + ']')[0].text; + var customerGroupOption = $$('#' + groupIdHtmlId + ' > option[value=' + groupId + ']')[0]; + groupMessage = customerGroupMessage.replace(/%s/, customerGroupOption.text); + } catch (e) { + groupMessage = errorMessage; + if (action === 'change') { + message = ''; + action = 'inform'; + } + } + + if (action === 'change') { + var confirmText = message.replace(/%s/, customerGroupOption.text); + confirmText = confirmText.replace(/%s/, currentCustomerGroupTitle); + if (confirm(confirmText)) { + $$('#' + groupIdHtmlId + ' option').each(function (o) { + o.selected = o.readAttribute('value') == groupId; + }); + this.accountGroupChange(); + } + } else if (action === 'inform') { + alert(message + '\n' + groupMessage); } } }; diff --git a/app/code/Magento/Sales/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Sales/view/frontend/layout/checkout_onepage_index.xml index d82515052ca84bed813e23208e94f462e00991e2..8c8566c3bc682818fbe6e09429c97bda77c2d673 100644 --- a/app/code/Magento/Sales/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Sales/view/frontend/layout/checkout_onepage_index.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="sale.reorder.sidebar"/> </page> diff --git a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml index 63941f4a4a5d096a0971b5e1c8dc71e2eb19611a..433f4781ee3f40a29011c4fa96466dfbbf9b316e 100644 --- a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_account_navigation"> <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-orders-link"> <arguments> diff --git a/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml index 5fc75d10a62f82faaa2000ab4342a28742c31db5..24d02124f74adfe093e10a73fa8315f05180219d 100644 --- a/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml +++ b/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\Recent" name="customer_account_dashboard_top" after="customer_account_dashboard_hello" template="order/recent.phtml" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/frontend/layout/default.xml b/app/code/Magento/Sales/view/frontend/layout/default.xml index 79b911a43ea39d9226976e16f854c87109a8e9c1..53aae5949a9cae45495d875b74182357f670750e 100644 --- a/app/code/Magento/Sales/view/frontend/layout/default.xml +++ b/app/code/Magento/Sales/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="sales_page_head_components" template="Magento_Sales::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_item_price.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_item_price.xml index e4393bdedcb46695c8d5a25adc7867e08adcbe17..f74e85bd88c00de60e3bf070b51cc205eb325878 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_item_price.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="items"> <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" name="item_price" template="email/items/price/row.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml index 5fa9abb1f6920e965306430c077f97b97c61ecb1..36acc11f47383feab334db0203461d2a43255138 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> <update handle="sales_email_order_creditmemo_renderers" /> <update handle="sales_email_item_price" /> <block class="Magento\Sales\Block\Order\Email\Creditmemo\Items" name="items" template="email/creditmemo/items.phtml"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml index 67954e4de6d1240846f5642bc676bd3f6a8a0cb8..6fe9b9cd7caa11e5c66ebae3aab7b1f101f32689 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> <referenceBlock name="sales.email.order.creditmemo.renderers"> <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/creditmemo/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml index f3f3358669e6243b5f6bb374f511cd1cbc3d7e07..c745088e18e7e0b5cb63ff3d3d378a04930c6314 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Invoice Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Invoice Items List" design_abstraction="custom"> <update handle="sales_email_order_invoice_renderers" /> <update handle="sales_email_item_price" /> <block class="Magento\Sales\Block\Order\Email\Invoice\Items" name="items" template="email/invoice/items.phtml"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml index bfb71c3d186b77be4759a34a6b5aad24e1628cbb..d44b6636845272029d883eee4b542dcec09e3f94 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> <referenceBlock name="sales.email.order.invoice.renderers"> <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/invoice/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml index 7b04f192cbb7df786e9ea14584c420a757ee40de..ae237018830df45dfc731284a601cf2074b534e6 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Order Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Order Items List" design_abstraction="custom"> <update handle="sales_email_order_renderers" /> <update handle="sales_email_item_price" /> <block class="Magento\Sales\Block\Order\Email\Items" name="items" template="email/items.phtml" cacheable="false"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml index 1db2ed4edaa61b43b57ad03ef55905095816fb7b..fca3a41a3b2432e014543e2e1eb08430c0ec6947 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_renderers.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> <referenceBlock name="sales.email.order.renderers"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml index 098e5be82004559e0b6c637e72081c81b451c491..6441cb728ca951f1ec3f9c9fc008609255ed16b9 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Shipment Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Shipment Items List" design_abstraction="custom"> <update handle="sales_email_order_shipment_renderers" /> <block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="items" template="email/shipment/items.phtml"> <block class="Magento\Framework\View\Element\RendererList" name="sales.email.order.shipment.renderers" as="renderer.list" /> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml index 0e2808597afb697aa4bc52a4f9eafc31f7af9b21..dedf34fc3101f1829edd082a47bb91461fd07151 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Email Creditmemo Items List" design_abstraction="custom"> <referenceBlock name="sales.email.order.shipment.renderers"> <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/shipment/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml index 96e1113168a4dd792a082dd48636e2c8750c495d..72589c5d5b83c2af2f6ac19e505b8f7ccfb443ab 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_creditmemo_renderers" /> <update handle="sales_order_item_price" /> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml index 72bdf3043058b35d139b2cfb22218cd2dc2963d0..4c27d4f54884d6afb6fa5ac968c10b638fa29402 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Widget\Guest\Form" name="guest.form" template="guest/form.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml index e650152f108fa782a4224a053bce35b6e1a4dece..08863cf31645d653a9e1d349b59f673f7b0f8bb9 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_invoice_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml index f077a8e1d63a6ed1e3931f6f403cddb778517f20..522604804b08e324ffed299c692f49f69805875e 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml index fb8835c15f0ee933841db5fe7bcbb444468e4a0e..0d8079a93af7232fb044ccdfd6c60a6d6226cb00 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printcreditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_creditmemo_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml index 2344eb29be2cb85082e751538e76aa2903c81e6e..41068ee3a22d98cb6cc0cb517149c5773cd2e4a2 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printinvoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_invoice_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml index d119842555fe1debade8a0433033de42547b0d16..0f4111acc21500d96d1af6bafde3e36492092995 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_shipment_renderers" /> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml index c429c91bb6055c832374c767bb50c2a5d6bd530d..e0ddc2552150807dd4e71cba75cc70c2118549aa 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\View" name="sales.order.view" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml index cb18545d9d6ea434e962d1b4c5d90f853e852a0a..9fdd536ee847fdb53144deae82066f8bc6e879cb 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info"> <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false"/> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml index 3e8dd9f3c34111add145e10a4f2366dbce70616a..2e9fe5933cb3ecf0e6fbef0b20034dbab91a07a0 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_item_renderers"/> <update handle="sales_order_item_price"/> <referenceContainer name="page.main.title"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml index 716d498341215ed6891664076113202625f27675..b94f3e87cd08ef235fcf1ef858971469f644c8d0 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_creditmemo_renderers" /> <update handle="customer_account"/> <update handle="sales_order_item_price"/> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml index f6b7de33a7eb7f76eb4285c6a0a634b1b8ffd7c6..2a8bf18e2b36823b72b68d15cca72ed708373291 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.creditmemo.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml index cc675fc4f719ae67ccd961b0d4167e14ab3d2e76..44e920981a1f8efc4ef10894900767ef94646c6f 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.info"> <block class="Magento\Framework\View\Element\Html\Links" as="links" name="sales.order.info.links"> <arguments> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml index f7b739e5e23db6e388830e5aecb0b17bab41c505..0505510fc2607fdcb720ea556f577afd0be7e46e 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\History" name="sales.order.history" cacheable="false"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml index 59ec675ea688e02fc1e92aeef5b4fe11471dbc4e..d75db1f7668b149bdd194e2dce495123b5e43a5a 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Framework\View\Element\Html\Links" as="links" name="sales.order.info.links" before="-"> <arguments> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml index f10a51b09d12f4b355050c18a91ea2ee71855d5f..0cdfbe42221d9911f407e604287d3d6d1e160d62 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <update handle="sales_order_invoice_renderers" /> <update handle="sales_order_item_price"/> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml index 78da98b1ae0f36056a3f52fa64938dcaeb360f5a..98f6b087a5866c1798867faaffdfa03c2890a866 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.invoice.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_item_price.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_item_price.xml index b3a3d1ce78e4d90990591816fcefb7eeb0cc7198..d2937594cd432b041bb1d3339f64727a6921209d 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_item_price.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" name="item_unit_price" template="items/price/unit.phtml"/> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" name="item_row_total" template="items/price/row.phtml"/> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" name="item_row_total_after_discount" template="items/price/total_after_discount.phtml"/> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml index daa2db64cb1af9d5951543f562e9fa58d57a1aaa..05dfa6fc45ccf0837cab2e5492412818f9f238b1 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.items.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml index ee9cab54d5bc855102ae6d5c0769553ad8c4c567..0afd5aad70a2108674bb75001f17455bbb664db9 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml index 2c1c3e473bfc5c5e91504e0cab79692890ac78a7..3600977f83f238b6acc7a02079f99972460977bd 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.creditmemo.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml index ce82abbef6fd627dbbf3ea356070135b7f27d1c4..93973115fe64487a580821f89941f9f75a77b060 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.invoice.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml index 845c5b6a7dde873525d49cdc0fdf52c755768901..2a29812528c51a88898542497b74995cc7f7c14f 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml index fa912d8bcbe728ce96c8ab5f1cd08fbf331f705c..9c80cd6b0828ce1f587c016beca39fe8a6c57e98 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.print.shipment.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml index 9c33b757320ee29308da697e11308548318b7afb..db93ead85e782155cdd623e24e6b72c9ba818604 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_creditmemo_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml index 5e4834b8d788ba60c350420a85eeaed7d6563abd..402d04b0a5ca9e0d6613ca0db8e75c376307e5a2 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_invoice_renderers" /> <update handle="sales_order_item_price"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml index 23d9201c0307e23cc9dffb9bffd71b03044f6ccc..34511268ffc14318be7438e48fe4d2dbdf3a7f18 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_print_shipment_renderers" /> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml"> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml index dfb9dbfda4aa488fcf0c8c4c3ccc3d61566e2a99..1b8d243dab6dbea3354b4b2e8b5b8d141b9b2a65 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Sales\Block\Order\View" name="sales.order.view" cacheable="false"/> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml index 53a6acf1a681e587e5a08cde4b5646a4fbc732a5..1dea95386fc707f826f02ab17f7d47f68de28d73 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="page.main.title"> <block class="Magento\Sales\Block\Order\Info" name="order.status" template="order/order_status.phtml" /> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment_renderers.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment_renderers.xml index b9298c05132ae975b38d6fcba8d68cdaa29ca94a..26f95697decc53a74b1211d337bcbc21cbcbc944 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment_renderers.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.shipment.renderers"> <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml index 3426274e70b0a51456847ead7c79b062e68d7a86..8508a406e960bbde8e75c01dbd385a0d73f6888f 100644 --- a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml +++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <update handle="sales_order_item_renderers"/> <update handle="sales_order_item_price"/> diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index bb8754a0464ad0e95cb1b1c4a7f977164a8af100..44d93a3205cb18f8611a52c78e6107273e5ab4ea 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-rule": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-reports": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-rule": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-reports": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_couponsgrid.xml b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_couponsgrid.xml index cfd15fa7cfaaac042b6895bc74785e1b3901f307..97291e4249b247fb70820ca0e447ec67e0273a4d 100644 --- a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_couponsgrid.xml +++ b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_couponsgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Grid" name="sales_rule_quote_edit_tab_coupons_grid"/> </container> diff --git a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml index cbab317e5590ca2b91ecb5746594f3201606a27b..5eb66a37ccb743bb4d0e1a8703764f77ea0607e0 100644 --- a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml +++ b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="left"> <block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tabs" name="promo_quote_edit_tabs"> <block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Main" name="promo_quote_edit_tab_main"/> diff --git a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml index 398f30af323cbefc65822711f0fe921966db2d04..3033f1a3e8c681a0b2389531c7cbc4e59794043b 100644 --- a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml +++ b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote" name="adminhtml.block.promo.quote.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.promo.quote.grid" as="grid"> diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php similarity index 84% rename from app/code/Magento/Backend/Block/Dashboard/Searches/Last.php rename to app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php index 0f2981a12c77381c8ecd97e3055427f023b4f747..22acfcd8798f991534b802ad108c439c254085f3 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php +++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php @@ -21,22 +21,20 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Backend\Block\Dashboard\Searches; +namespace Magento\Search\Block\Adminhtml\Dashboard; /** - * Adminhtml dashboard last search keywords block - * - * @author Magento Core Team <core@magentocommerce.com> + * Dashboard last search keywords block */ class Last extends \Magento\Backend\Block\Dashboard\Grid { /** - * @var \Magento\CatalogSearch\Model\Resource\Query\Collection + * @var \Magento\Search\Model\Resource\Query\Collection */ protected $_collection; /** - * @var \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory + * @var \Magento\Search\Model\Resource\Query\CollectionFactory */ protected $_queriesFactory; @@ -45,18 +43,21 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid */ protected $_moduleManager; + /** @var string */ + protected $_template = 'Magento_Backend::dashboard/grid.phtml'; + /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Helper\Data $backendHelper * @param \Magento\Framework\Module\Manager $moduleManager - * @param \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory + * @param \Magento\Search\Model\Resource\Query\CollectionFactory $queriesFactory * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Backend\Helper\Data $backendHelper, \Magento\Framework\Module\Manager $moduleManager, - \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory, + \Magento\Search\Model\Resource\Query\CollectionFactory $queriesFactory, array $data = array() ) { $this->_moduleManager = $moduleManager; @@ -78,9 +79,6 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid */ protected function _prepareCollection() { - if (!$this->_moduleManager->isEnabled('Magento_CatalogSearch')) { - return parent::_prepareCollection(); - } $this->_collection = $this->_queriesFactory->create(); $this->_collection->setRecentQueryFilter(); @@ -135,6 +133,6 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid */ public function getRowUrl($row) { - return $this->getUrl('catalog/search/edit', array('id' => $row->getId())); + return $this->getUrl('search/term/edit', array('id' => $row->getId())); } } diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php similarity index 84% rename from app/code/Magento/Backend/Block/Dashboard/Searches/Top.php rename to app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php index 2a2666ca9e977ad5f29e9b9dbda13f54a5208ee7..c5ea63acbb5f595ef379bbce90ca48488a53572b 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php +++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php @@ -21,22 +21,20 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Backend\Block\Dashboard\Searches; +namespace Magento\Search\Block\Adminhtml\Dashboard; /** - * Adminhtml dashboard last search keywords block - * - * @author Magento Core Team <core@magentocommerce.com> + * Dashboard last search keywords block */ class Top extends \Magento\Backend\Block\Dashboard\Grid { /** - * @var \Magento\CatalogSearch\Model\Resource\Query\Collection + * @var \Magento\Search\Model\Resource\Query\Collection */ protected $_collection; /** - * @var \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory + * @var \Magento\Search\Model\Resource\Query\CollectionFactory */ protected $_queriesFactory; @@ -45,18 +43,21 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid */ protected $_moduleManager; + /** @var string */ + protected $_template = 'Magento_Backend::dashboard/grid.phtml'; + /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Helper\Data $backendHelper * @param \Magento\Framework\Module\Manager $moduleManager - * @param \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory + * @param \Magento\Search\Model\Resource\Query\CollectionFactory $queriesFactory * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Backend\Helper\Data $backendHelper, \Magento\Framework\Module\Manager $moduleManager, - \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory, + \Magento\Search\Model\Resource\Query\CollectionFactory $queriesFactory, array $data = array() ) { $this->_moduleManager = $moduleManager; @@ -78,9 +79,6 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid */ protected function _prepareCollection() { - if (!$this->_moduleManager->isEnabled('Magento_CatalogSearch')) { - return parent::_prepareCollection(); - } $this->_collection = $this->_queriesFactory->create(); if ($this->getRequest()->getParam('store')) { @@ -136,6 +134,6 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid */ public function getRowUrl($row) { - return $this->getUrl('catalog/search/edit', array('id' => $row->getId())); + return $this->getUrl('search/term/edit', array('id' => $row->getId())); } } diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Search.php b/app/code/Magento/Search/Block/Adminhtml/Term.php similarity index 81% rename from app/code/Magento/Catalog/Block/Adminhtml/Search.php rename to app/code/Magento/Search/Block/Adminhtml/Term.php index 719446a6bba6ba6a0633baa31c45704bcdef4dd4..b6b079bb8e2f960546f013eb3c17c849c5067d13 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Search.php +++ b/app/code/Magento/Search/Block/Adminhtml/Term.php @@ -21,21 +21,16 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Block\Adminhtml; +namespace Magento\Search\Block\Adminhtml; -/** - * Catalog price rules - * - * @author Magento Core Team <core@magentocommerce.com> - */ -class Search extends \Magento\Backend\Block\Widget\Grid\Container +class Term extends \Magento\Backend\Block\Widget\Grid\Container { /** * @return void */ protected function _construct() { - $this->_controller = 'catalog_search'; + $this->_controller = 'term'; $this->_headerText = __('Search'); $this->_addButtonLabel = __('Add New Search Term'); parent::_construct(); diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php similarity index 93% rename from app/code/Magento/Catalog/Block/Adminhtml/Search/Edit.php rename to app/code/Magento/Search/Block/Adminhtml/Term/Edit.php index c2450add498f677e9402fa9f9d8af9397410eb01..5ebd68aa3470b19a10867bf5ebb7cb505b5f5c24 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit.php +++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php @@ -21,7 +21,8 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Block\Adminhtml\Search; +namespace Magento\Search\Block\Adminhtml\Term; + /** * Admin tag edit block @@ -55,8 +56,8 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container protected function _construct() { $this->_objectId = 'id'; - $this->_blockGroup = 'Magento_Catalog'; - $this->_controller = 'adminhtml_search'; + $this->_blockGroup = 'Magento_Search'; + $this->_controller = 'adminhtml_term'; parent::_construct(); diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit/Form.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php similarity index 96% rename from app/code/Magento/Catalog/Block/Adminhtml/Search/Edit/Form.php rename to app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php index 9aac895806b8330d1413da11cb5156845d7b1ae9..8e8a726e237974486462ba2e890149e1e98058a7 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit/Form.php +++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php @@ -25,9 +25,9 @@ /** * Adminhtml tag edit form * - * @author Magento Core Team <core@magentocommerce.com> */ -namespace Magento\Catalog\Block\Adminhtml\Search\Edit; +namespace Magento\Search\Block\Adminhtml\Term\Edit; + class Form extends \Magento\Backend\Block\Widget\Form\Generic { @@ -62,7 +62,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic protected function _construct() { parent::_construct(); - $this->setId('catalog_search_form'); + $this->setId('search_term_form'); $this->setTitle(__('Search Information')); } @@ -74,7 +74,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic protected function _prepareForm() { $model = $this->_coreRegistry->registry('current_catalog_search'); - /* @var $model \Magento\CatalogSearch\Model\Query */ + /* @var $model \Magento\Search\Model\Query */ /** @var \Magento\Framework\Data\Form $form */ $form = $this->_formFactory->create( diff --git a/lib/internal/Magento/Framework/Search/Bucket.php b/app/code/Magento/Search/Block/Recommendations.php similarity index 90% rename from lib/internal/Magento/Framework/Search/Bucket.php rename to app/code/Magento/Search/Block/Recommendations.php index 9481611035138b7f7ea2f7eee237f20e7bfa604f..026418815183ab4432a2058be3332f9573a434b6 100644 --- a/lib/internal/Magento/Framework/Search/Bucket.php +++ b/app/code/Magento/Search/Block/Recommendations.php @@ -21,11 +21,8 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Framework\Search; +namespace Magento\Search\Block; -/** - * Facet Bucket - */ -class Bucket extends AbstractKeyValuePair +class Recommendations extends SearchData { } diff --git a/app/code/Magento/Search/Block/SearchData.php b/app/code/Magento/Search/Block/SearchData.php new file mode 100644 index 0000000000000000000000000000000000000000..ccce1f3c05176781eeda5bbb361fd48afa4d4728 --- /dev/null +++ b/app/code/Magento/Search/Block/SearchData.php @@ -0,0 +1,105 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Block; + +use Magento\Framework\View\Element\Template; +use Magento\Search\Model\SearchDataProviderInterface; +use Magento\Search\Model\QueryInterface; +use Magento\Search\Model\QueryFactoryInterface; + +abstract class SearchData extends Template implements SearchDataInterface +{ + + /** + * @var QueryInterface + */ + private $query; + + /** + * @var string + */ + protected $title; + + /** + * @var SearchDataProviderInterface + */ + private $searchDataProvider; + + /** + * @var string + */ + protected $_template = 'search_data.phtml'; + + /** + * @param Template\Context $context + * @param SearchDataProviderInterface $searchDataProvider + * @param QueryFactoryInterface $queryFactory + * @param string $title + * @param array $data + */ + public function __construct( + Template\Context $context, + SearchDataProviderInterface $searchDataProvider, + QueryFactoryInterface $queryFactory, + $title, + array $data = array() + ) { + $this->searchDataProvider = $searchDataProvider; + $this->query = $queryFactory->get(); + $this->title = $title; + parent::__construct($context, $data); + } + + /** + * {@inheritdoc} + */ + public function getSearchData() + { + return $this->searchDataProvider->getSearchData($this->query); + } + + /** + * {@inheritdoc} + */ + public function isCountResultsEnabled() + { + return $this->searchDataProvider->isCountResultsEnabled(); + } + + /** + * {@inheritdoc} + */ + public function getLink($queryText) + { + return $this->getUrl('*/*/') . '?q=' . urlencode($queryText); + } + + /** + * {@inheritdoc} + */ + public function getTitle() + { + return $this->title; + } +} diff --git a/app/code/Magento/Search/Block/SearchDataInterface.php b/app/code/Magento/Search/Block/SearchDataInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..35713943fcb7436a68500f8f728f9e6830d100f2 --- /dev/null +++ b/app/code/Magento/Search/Block/SearchDataInterface.php @@ -0,0 +1,50 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Block; + +interface SearchDataInterface +{ + /** + * Retrieve search suggestions + * + * @return array + */ + public function getSearchData(); + + /** + * @return bool + */ + public function isCountResultsEnabled(); + + /** + * @param string $queryText + * @return string + */ + public function getLink($queryText); + + /** + * @return string + */ + public function getTitle(); +} diff --git a/app/code/Magento/Search/Block/Suggestions.php b/app/code/Magento/Search/Block/Suggestions.php new file mode 100644 index 0000000000000000000000000000000000000000..cbb7ee8a523fcab960e48302818094532355a8ff --- /dev/null +++ b/app/code/Magento/Search/Block/Suggestions.php @@ -0,0 +1,28 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Block; + +class Suggestions extends SearchData +{ +} diff --git a/app/code/Magento/CatalogSearch/Block/Term.php b/app/code/Magento/Search/Block/Term.php similarity index 95% rename from app/code/Magento/CatalogSearch/Block/Term.php rename to app/code/Magento/Search/Block/Term.php index 90af965fb28b9dd8518feda2cb98ba7dcd833ecd..2b1299c2ffddfb9e970fa97ec432aba7f19b2f3e 100644 --- a/app/code/Magento/CatalogSearch/Block/Term.php +++ b/app/code/Magento/Search/Block/Term.php @@ -23,13 +23,11 @@ */ /** - * Catalogsearch term block - * - * @author Magento Core Team <core@magentocommerce.com> + * Search term block */ -namespace Magento\CatalogSearch\Block; +namespace Magento\Search\Block; -use Magento\CatalogSearch\Model\Resource\Query\CollectionFactory; +use Magento\Search\Model\Resource\Query\CollectionFactory; use Magento\Framework\UrlFactory; use Magento\Framework\UrlInterface; use Magento\Framework\View\Element\Template; diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search.php b/app/code/Magento/Search/Controller/Adminhtml/Term.php similarity index 80% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search.php rename to app/code/Magento/Search/Controller/Adminhtml/Term.php index 446e3e8be879b2ea377601198643cff002fbd941..8250fb33bddf8ab91510df36b74619357baf39e6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term.php @@ -21,11 +21,11 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml; +namespace Magento\Search\Controller\Adminhtml; use Magento\Backend\App\Action; -class Search extends \Magento\Backend\App\Action +class Term extends \Magento\Backend\App\Action { /** * @return $this @@ -33,7 +33,7 @@ class Search extends \Magento\Backend\App\Action protected function _initAction() { $this->_view->loadLayout(); - $this->_setActiveMenu('Magento_CatalogSearch::catalog_search')->_addBreadcrumb(__('Search'), __('Search')); + $this->_setActiveMenu('Magento_Search::search_term')->_addBreadcrumb(__('Search'), __('Search')); return $this; } @@ -42,6 +42,6 @@ class Search extends \Magento\Backend\App\Action */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_CatalogSearch::search'); + return $this->_authorization->isAllowed('Magento_Search::search'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php similarity index 82% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search/Delete.php rename to app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php index e429066aa5f1d6b7547d7e2208808a254a161fac..1bec9443a92f34adc58021fd2aff2a91a4801b12 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Delete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php @@ -22,9 +22,9 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml\Search; +namespace Magento\Search\Controller\Adminhtml\Term; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Search +class Delete extends \Magento\Search\Controller\Adminhtml\Term { /** * @return void @@ -34,19 +34,19 @@ class Delete extends \Magento\Catalog\Controller\Adminhtml\Search $id = $this->getRequest()->getParam('id'); if ($id) { try { - $model = $this->_objectManager->create('Magento\CatalogSearch\Model\Query'); + $model = $this->_objectManager->create('Magento\Search\Model\Query'); $model->setId($id); $model->delete(); $this->messageManager->addSuccess(__('You deleted the search.')); - $this->_redirect('catalog/*/'); + $this->_redirect('search/*/'); return; } catch (\Exception $e) { $this->messageManager->addError($e->getMessage()); - $this->_redirect('catalog/*/edit', array('id' => $this->getRequest()->getParam('id'))); + $this->_redirect('search/*/edit', array('id' => $this->getRequest()->getParam('id'))); return; } } $this->messageManager->addError(__('We can\'t find a search term to delete.')); - $this->_redirect('catalog/*/'); + $this->_redirect('search/*/'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php similarity index 86% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search/Edit.php rename to app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php index 4df2a960cece3028672d21355cacdd2853a784cc..a6b53192d12542ccf6e889afd9ddf1807bbbc9a8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Edit.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php @@ -22,9 +22,11 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml\Search; +namespace Magento\Search\Controller\Adminhtml\Term; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Search +use Magento\Search\Controller\Adminhtml\Search; + +class Edit extends \Magento\Search\Controller\Adminhtml\Term { /** * Core registry @@ -51,13 +53,13 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Search $this->_title->add(__('Search Terms')); $id = $this->getRequest()->getParam('id'); - $model = $this->_objectManager->create('Magento\CatalogSearch\Model\Query'); + $model = $this->_objectManager->create('Magento\Search\Model\Query'); if ($id) { $model->load($id); if (!$model->getId()) { $this->messageManager->addError(__('This search no longer exists.')); - $this->_redirect('catalog/*'); + $this->_redirect('search/*'); return; } } @@ -75,10 +77,10 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Search $this->_title->add($id ? $model->getQueryText() : __('New Search')); $this->_view->getLayout()->getBlock( - 'adminhtml.catalog.search.edit' + 'adminhtml.search.term.edit' )->setData( 'action', - $this->getUrl('catalog/search/save') + $this->getUrl('search/term/save') ); $this->_addBreadcrumb($id ? __('Edit Search') : __('New Search'), $id ? __('Edit Search') : __('New Search')); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Index.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php similarity index 84% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search/Index.php rename to app/code/Magento/Search/Controller/Adminhtml/Term/Index.php index db4289cb4965b99e4b89ba1e9baed49b64416f11..b9e00b949edcb2202625094ab29fbb83ab625111 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Index.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php @@ -22,9 +22,9 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml\Search; +namespace Magento\Search\Controller\Adminhtml\Term; -class Index extends \Magento\Catalog\Controller\Adminhtml\Search +class Index extends \Magento\Search\Controller\Adminhtml\Term { /** * @return void @@ -33,7 +33,7 @@ class Index extends \Magento\Catalog\Controller\Adminhtml\Search { $this->_title->add(__('Search Terms')); - $this->_initAction()->_addBreadcrumb(__('Catalog'), __('Catalog')); + $this->_initAction()->_addBreadcrumb(__('Search'), __('Search')); $this->_view->renderLayout(); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php similarity index 86% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search/MassDelete.php rename to app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php index 77bef167bfc1fe95806a2905888a7ac18ed56317..0575a8e562f1077a34f286480519ddf208871ccb 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search/MassDelete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php @@ -22,9 +22,9 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml\Search; +namespace Magento\Search\Controller\Adminhtml\Term; -class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Search +class MassDelete extends \Magento\Search\Controller\Adminhtml\Term { /** * @return void @@ -33,11 +33,11 @@ class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Search { $searchIds = $this->getRequest()->getParam('search'); if (!is_array($searchIds)) { - $this->messageManager->addError(__('Please select catalog searches.')); + $this->messageManager->addError(__('Please select searches.')); } else { try { foreach ($searchIds as $searchId) { - $model = $this->_objectManager->create('Magento\CatalogSearch\Model\Query')->load($searchId); + $model = $this->_objectManager->create('Magento\Search\Model\Query')->load($searchId); $model->delete(); } $this->messageManager->addSuccess(__('Total of %1 record(s) were deleted', count($searchIds))); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php similarity index 89% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search/NewAction.php rename to app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php index 7ebbf03fb8e9b35db3716f3d5c55576ff7ea4308..8cc62a2f4861105ba2cd1ae3bb6f9613c1331914 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search/NewAction.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php @@ -22,9 +22,9 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml\Search; +namespace Magento\Search\Controller\Adminhtml\Term; -class NewAction extends \Magento\Catalog\Controller\Adminhtml\Search +class NewAction extends \Magento\Search\Controller\Adminhtml\Term { /** * @return void diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php similarity index 85% rename from app/code/Magento/Catalog/Controller/Adminhtml/Search/Save.php rename to app/code/Magento/Search/Controller/Adminhtml/Term/Save.php index 643d16607141b02b8affbf44c5a487eddc406ae9..2bbad0862f7e9e67422729e6ec3b06f25e9aa72c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Search/Save.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php @@ -22,9 +22,9 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Controller\Adminhtml\Search; +namespace Magento\Search\Controller\Adminhtml\Term; -class Save extends \Magento\Catalog\Controller\Adminhtml\Search +class Save extends \Magento\Search\Controller\Adminhtml\Term { /** * Save search query @@ -37,8 +37,8 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Search $data = $this->getRequest()->getPost(); $queryId = $this->getRequest()->getPost('query_id', null); if ($this->getRequest()->isPost() && $data) { - /* @var $model \Magento\CatalogSearch\Model\Query */ - $model = $this->_objectManager->create('Magento\CatalogSearch\Model\Query'); + /* @var $model \Magento\Search\Model\Query */ + $model = $this->_objectManager->create('Magento\Search\Model\Query'); // validate query $queryText = $this->getRequest()->getPost('query_text', false); @@ -62,6 +62,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Search $model->addData($data); $model->setIsProcessed(0); $model->save(); + $this->messageManager->addSuccess(__('You saved the search term.')); } catch (\Magento\Framework\Model\Exception $e) { $this->messageManager->addError($e->getMessage()); $hasError = true; @@ -73,9 +74,9 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Search if ($hasError) { $this->_getSession()->setPageData($data); - $this->_redirect('catalog/*/edit', array('id' => $queryId)); + $this->_redirect('search/*/edit', array('id' => $queryId)); } else { - $this->_redirect('catalog/*'); + $this->_redirect('search/*'); } } } diff --git a/app/code/Magento/CatalogSearch/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php similarity index 89% rename from app/code/Magento/CatalogSearch/Controller/Ajax/Suggest.php rename to app/code/Magento/Search/Controller/Ajax/Suggest.php index 26366c432f86f74870ee3259b693fb36f8325ef0..ccbc7fc182d2009f3e09b8b07eb00ec5d3e759c0 100644 --- a/app/code/Magento/CatalogSearch/Controller/Ajax/Suggest.php +++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php @@ -22,7 +22,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\CatalogSearch\Controller\Ajax; +namespace Magento\Search\Controller\Ajax; class Suggest extends \Magento\Framework\App\Action\Action { @@ -35,7 +35,7 @@ class Suggest extends \Magento\Framework\App\Action\Action $this->getResponse()->setRedirect($this->_url->getBaseUrl()); } - $suggestData = $this->_objectManager->get('Magento\CatalogSearch\Helper\Data')->getSuggestData(); + $suggestData = $this->_objectManager->get('Magento\Search\Helper\Data')->getSuggestData(); $this->getResponse()->representJson(json_encode($suggestData)); } } diff --git a/app/code/Magento/CatalogSearch/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php similarity index 97% rename from app/code/Magento/CatalogSearch/Controller/Term/Popular.php rename to app/code/Magento/Search/Controller/Term/Popular.php index 915ef9752fa20e03ab795e3cb344516fb3e48906..92293f2286d9cf8fdecf2752d5e5169b174a5950 100644 --- a/app/code/Magento/CatalogSearch/Controller/Term/Popular.php +++ b/app/code/Magento/Search/Controller/Term/Popular.php @@ -21,7 +21,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\CatalogSearch\Controller\Term; +namespace Magento\Search\Controller\Term; use Magento\Framework\App\Action\Context; use Magento\Framework\App\RequestInterface; diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php new file mode 100644 index 0000000000000000000000000000000000000000..ed56e7086524544570ff4ed4e74b4a43e8216a01 --- /dev/null +++ b/app/code/Magento/Search/Helper/Data.php @@ -0,0 +1,385 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Helper; + +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\App\Helper\AbstractHelper; +use Magento\Framework\App\Helper\Context; +use Magento\Framework\Escaper; +use Magento\Framework\Filter\FilterManager; +use Magento\Framework\Stdlib\String; +use Magento\Framework\StoreManagerInterface; +use Magento\Search\Model\Query as SearchQuery; +use Magento\Search\Model\QueryFactory; +use Magento\Search\Model\Resource\Query\Collection; + +/** + * Search helper + */ +class Data extends AbstractHelper +{ + const XML_PATH_CATALOG_SEARCH_TYPE = 'catalog/search/search_type'; + + const SEARCH_TYPE_LIKE = 1; + const SEARCH_TYPE_FULLTEXT = 2; + const SEARCH_TYPE_COMBINE = 3; + + /** + * @var array + */ + protected $_suggestData = null; + + /** + * Query object + * + * @var SearchQuery + */ + protected $_query; + + /** + * Query string + * + * @var string + */ + protected $_queryText; + + /** + * Note messages + * + * @var array + */ + protected $_messages = array(); + + /** + * Magento string lib + * + * @var String + */ + protected $string; + + /** + * Core store config + * + * @var ScopeConfigInterface + */ + protected $_scopeConfig; + + /** + * Query factory + * + * @var QueryFactory + */ + protected $_queryFactory; + + /** + * @var Escaper + */ + protected $_escaper; + + /** + * @var FilterManager + */ + protected $filter; + + /** + * @var \Magento\Framework\StoreManagerInterface + */ + protected $_storeManager; + + /** + * Construct + * + * @param Context $context + * @param String $string + * @param ScopeConfigInterface $scopeConfig + * @param QueryFactory $queryFactory + * @param Escaper $escaper + * @param FilterManager $filter + * @param StoreManagerInterface $storeManager + */ + public function __construct( + Context $context, + String $string, + ScopeConfigInterface $scopeConfig, + QueryFactory $queryFactory, + Escaper $escaper, + FilterManager $filter, + StoreManagerInterface $storeManager + ) { + $this->string = $string; + $this->_scopeConfig = $scopeConfig; + $this->_queryFactory = $queryFactory; + $this->_escaper = $escaper; + $this->filter = $filter; + $this->_storeManager = $storeManager; + parent::__construct($context); + } + + /** + * Is a minimum query length + * + * @return bool + */ + public function isMinQueryLength() + { + $minQueryLength = $this->getMinQueryLength(); + $thisQueryLength = $this->string->strlen($this->_queryFactory->get()->getQueryText()); + return !$thisQueryLength || $minQueryLength !== '' && $thisQueryLength < $minQueryLength; + } + + /** + * Retrieve HTML escaped search query + * + * @return string + */ + public function getEscapedQueryText() + { + return $this->_escaper->escapeHtml($this->_queryFactory->get()->getQueryText()); + } + + /** + * Retrieve suggest collection for query + * + * @return Collection + */ + public function getSuggestCollection() + { + return $this->_queryFactory->get()->getSuggestCollection(); + } + + /** + * Retrieve result page url and set "secure" param to avoid confirm + * message when we submit form from secure page to unsecure + * + * @param string $query + * @return string + */ + public function getResultUrl($query = null) + { + return $this->_getUrl( + 'catalogsearch/result', + array('_query' => array(QueryFactory::QUERY_VAR_NAME => $query), '_secure' => $this->_request->isSecure()) + ); + } + + /** + * Retrieve suggest url + * + * @return string + */ + public function getSuggestUrl() + { + return $this->_getUrl( + 'search/ajax/suggest', + array('_secure' => $this->_storeManager->getStore()->isCurrentlySecure()) + ); + } + + /** + * Retrieve search term url + * + * @return string + */ + public function getSearchTermUrl() + { + return $this->_getUrl('search/term/popular'); + } + + /** + * Retrieve minimum query length + * + * @param mixed $store + * @return int|string + */ + public function getMinQueryLength($store = null) + { + return $this->_scopeConfig->getValue( + SearchQuery::XML_PATH_MIN_QUERY_LENGTH, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $store + ); + } + + /** + * Retrieve maximum query length + * + * @param mixed $store + * @return int|string + */ + public function getMaxQueryLength($store = null) + { + return $this->_scopeConfig->getValue( + SearchQuery::XML_PATH_MAX_QUERY_LENGTH, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $store + ); + } + + /** + * Retrieve maximum query words count for like search + * + * @param mixed $store + * @return int + */ + public function getMaxQueryWords($store = null) + { + return $this->_scopeConfig->getValue( + SearchQuery::XML_PATH_MAX_QUERY_WORDS, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $store + ); + } + + /** + * Add Note message + * + * @param string $message + * @return $this + */ + public function addNoteMessage($message) + { + $this->_messages[] = $message; + return $this; + } + + /** + * Set Note messages + * + * @param array $messages + * @return $this + */ + public function setNoteMessages(array $messages) + { + $this->_messages = $messages; + return $this; + } + + /** + * Retrieve Current Note messages + * + * @return array + */ + public function getNoteMessages() + { + return $this->_messages; + } + + /** + * Check query of a warnings + * + * @param mixed $store + * @return $this + */ + public function checkNotes($store = null) + { + if ($this->_queryFactory->get()->isQueryTextExceeded()) { + $this->addNoteMessage( + __( + 'Your search query can\'t be longer than %1, so we had to shorten your query.', + $this->getMaxQueryLength() + ) + ); + } + + $searchType = $this->_scopeConfig->getValue( + self::XML_PATH_CATALOG_SEARCH_TYPE, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + if ($searchType == self::SEARCH_TYPE_COMBINE || $searchType == self::SEARCH_TYPE_LIKE) { + $wordsFull = $this->filter->splitWords($this->_queryFactory->get()->getQueryText(), array('uniqueOnly' => true)); + $wordsLike = $this->filter->splitWords( + $this->_queryFactory->get()->getQueryText(), + array('uniqueOnly' => true, 'wordsQty' => $this->getMaxQueryWords()) + ); + if (count($wordsFull) > count($wordsLike)) { + $wordsCut = array_map(array($this->_escaper, 'escapeHtml'), array_diff($wordsFull, $wordsLike)); + $this->addNoteMessage( + __( + 'Sorry, but the maximum word count is %1. We left out this part of your search: %2.', + $this->getMaxQueryWords(), + join(' ', $wordsCut) + ) + ); + } + } + return $this; + } + + /** + * Join index array to string by separator + * Support 2 level array gluing + * + * @param array $index + * @param string $separator + * @return string + */ + public function prepareIndexdata($index, $separator = ' ') + { + $_index = array(); + foreach ($index as $value) { + if (!is_array($value)) { + $_index[] = $value; + } else { + $_index = array_merge($_index, $value); + } + } + return join($separator, $_index); + } + + /** + * @return array + */ + public function getSuggestData() + { + if (!$this->_suggestData) { + $collection = $this->getSuggestCollection(); + $query = $this->_queryFactory->get()->getQueryText(); + $counter = 0; + $data = array(); + foreach ($collection as $item) { + $_data = array( + 'title' => $item->getQueryText(), + 'row_class' => ++$counter % 2 ? 'odd' : 'even', + 'num_of_results' => $item->getNumResults() + ); + + if ($item->getQueryText() == $query) { + array_unshift($data, $_data); + } else { + $data[] = $_data; + } + } + $this->_suggestData = $data; + } + return $this->_suggestData; + } + + /** + * @return string + */ + public function getQueryParamName() + { + return QueryFactory::QUERY_VAR_NAME; + } +} diff --git a/app/code/Magento/CatalogSearch/Model/Query.php b/app/code/Magento/Search/Model/Query.php similarity index 82% rename from app/code/Magento/CatalogSearch/Model/Query.php rename to app/code/Magento/Search/Model/Query.php index cdd362fcf72c255fd5b295d96c4b3121928eae52..a73a1f0b37daa111b7b34b72d3fb76c1398c99a4 100644 --- a/app/code/Magento/CatalogSearch/Model/Query.php +++ b/app/code/Magento/Search/Model/Query.php @@ -21,60 +21,59 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\CatalogSearch\Model; +namespace Magento\Search\Model; -use Magento\CatalogSearch\Model\Resource\Query\Collection as QueryCollection; -use Magento\CatalogSearch\Model\Resource\Query\CollectionFactory as QueryCollectionFactory; -use Magento\CatalogSearch\Model\Resource\Search\Collection; -use Magento\CatalogSearch\Model\Resource\Search\CollectionFactory; +use Magento\Search\Model\Resource\Query\Collection as QueryCollection; +use Magento\Search\Model\Resource\Query\CollectionFactory as QueryCollectionFactory; +use Magento\Search\Model\SearchCollectionInterface as Collection; +use Magento\Search\Model\SearchCollectionFactory as CollectionFactory; +use Magento\Eav\Model\Entity\Collection\AbstractCollection; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\Data\Collection\Db; use Magento\Framework\Model\AbstractModel; -use Magento\Framework\Model\Context; -use Magento\Framework\Registry; use Magento\Framework\Model\Resource\AbstractResource; -use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\Registry; use Magento\Framework\StoreManagerInterface; -use Magento\Framework\Data\Collection\Db; -use Magento\Eav\Model\Entity\Collection\AbstractCollection; /** - * Catalog search query model + * Search query model * - * @method \Magento\CatalogSearch\Model\Resource\Query _getResource() - * @method \Magento\CatalogSearch\Model\Resource\Query getResource() - * @method string getQueryText() - * @method \Magento\CatalogSearch\Model\Query setQueryText(string $value) + * @method Resource\Query _getResource() + * @method Resource\Query getResource() + * @method \Magento\Search\Model\Query setQueryText(string $value) * @method int getNumResults() - * @method \Magento\CatalogSearch\Model\Query setNumResults(int $value) + * @method \Magento\Search\Model\Query setNumResults(int $value) * @method int getPopularity() - * @method \Magento\CatalogSearch\Model\Query setPopularity(int $value) + * @method \Magento\Search\Model\Query setPopularity(int $value) * @method string getRedirect() - * @method \Magento\CatalogSearch\Model\Query setRedirect(string $value) + * @method \Magento\Search\Model\Query setRedirect(string $value) * @method string getSynonymFor() - * @method \Magento\CatalogSearch\Model\Query setSynonymFor(string $value) + * @method \Magento\Search\Model\Query setSynonymFor(string $value) * @method int getDisplayInTerms() - * @method \Magento\CatalogSearch\Model\Query setDisplayInTerms(int $value) + * @method \Magento\Search\Model\Query setDisplayInTerms(int $value) + * @method \Magento\Search\Model\Query setQueryNameExceeded(bool $value) * @method int getIsActive() - * @method \Magento\CatalogSearch\Model\Query setIsActive(int $value) + * @method \Magento\Search\Model\Query setIsActive(int $value) * @method int getIsProcessed() - * @method \Magento\CatalogSearch\Model\Query setIsProcessed(int $value) + * @method \Magento\Search\Model\Query setIsProcessed(int $value) * @method string getUpdatedAt() - * @method \Magento\CatalogSearch\Model\Query setUpdatedAt(string $value) + * @method \Magento\Search\Model\Query setUpdatedAt(string $value) */ -class Query extends AbstractModel +class Query extends AbstractModel implements QueryInterface { /** * Event prefix * * @var string */ - protected $_eventPrefix = 'catalogsearch_query'; + protected $_eventPrefix = 'search_query'; /** * Event object key name * * @var string */ - protected $_eventObject = 'catalogsearch_query'; + protected $_eventObject = 'search_query'; const CACHE_TAG = 'SEARCH_QUERY'; @@ -150,7 +149,7 @@ class Query extends AbstractModel */ protected function _construct() { - $this->_init('Magento\CatalogSearch\Model\Resource\Query'); + $this->_init('Magento\Search\Model\Resource\Query'); } /** @@ -166,6 +165,7 @@ class Query extends AbstractModel /** * Retrieve collection of search results * + * @deplecated * @return AbstractCollection */ public function getResultCollection() @@ -314,4 +314,20 @@ class Query extends AbstractModel $this->getStoreId() ); } + + /** + * @return string + */ + public function getQueryText() + { + return $this->getDataByKey('query_text'); + } + + /** + * @return bool + */ + public function isQueryTextExceeded() + { + return $this->getData('is_query_text_exceeded'); + } } diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..7a8c3d6136228f5d8af57b9540b640605c207f43 --- /dev/null +++ b/app/code/Magento/Search/Model/QueryFactory.php @@ -0,0 +1,160 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Model; + +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\App\Helper\Context; +use Magento\Framework\ObjectManager; +use Magento\Framework\Stdlib\String as StdlibString; +use Magento\Store\Model\ScopeInterface; + +class QueryFactory implements QueryFactoryInterface +{ + /** + * Query variable + */ + const QUERY_VAR_NAME = 'q'; + + /** + * @var \Magento\Framework\App\RequestInterface + */ + private $request; + + /** + * @var Query + */ + private $query; + + /** + * @var ObjectManager + */ + private $objectManager; + + /** + * @var StdlibString + */ + private $string; + + /** + * @var ScopeConfigInterface + */ + private $scopeConfig; + + /** + * @param Context $context + * @param ObjectManager $objectManager + * @param StdlibString $string + * @param ScopeConfigInterface $scopeConfig + */ + public function __construct( + Context $context, + ObjectManager $objectManager, + StdlibString $string, + ScopeConfigInterface $scopeConfig + ) { + $this->request = $context->getRequest(); + $this->objectManager = $objectManager; + $this->string = $string; + $this->scopeConfig = $scopeConfig; + } + + /** + * {@inheritdoc} + */ + public function get() + { + if (!$this->query) { + $this->query = $this->create(); + } + return $this->query; + } + + /** + * @return Query + */ + private function create() + { + $maxQueryLength = $this->getMaxQueryLength(); + $rawQueryText = $this->getRawQueryText(); + $preparedQueryText = $this->getPreparedQueryText($rawQueryText, $maxQueryLength); + /** @var \Magento\Search\Model\Query $query */ + $query = $this->objectManager->create('\Magento\Search\Model\Query')->loadByQuery($preparedQueryText); + if (!$query->getId()) { + $query->setQueryText($preparedQueryText); + } + $query->setIsQueryTextExceeded($this->isQueryTooLong($preparedQueryText, $maxQueryLength)); + return $query; + } + + /** + * Retrieve search query text + * + * @return string + */ + private function getRawQueryText() + { + $queryText = $this->request->getParam(self::QUERY_VAR_NAME); + return ($queryText === null || is_array($queryText)) + ? '' + : $this->string->cleanString(trim($queryText)); + } + + /** + * @param string $queryText + * @param int|string $maxQueryLength + * @return string + */ + private function getPreparedQueryText($queryText, $maxQueryLength) + { + if ($this->isQueryTooLong($queryText, $maxQueryLength)) { + $queryText = $this->string->substr($queryText, 0, $maxQueryLength); + } + return $queryText; + } + + /** + * Retrieve maximum query length + * + * @param mixed $store + * @return int|string + */ + private function getMaxQueryLength($store = null) + { + return $this->scopeConfig->getValue( + Query::XML_PATH_MAX_QUERY_LENGTH, + ScopeInterface::SCOPE_STORE, + $store + ); + } + + /** + * @param string $queryText + * @param int|string $maxQueryLength + * @return bool + */ + private function isQueryTooLong($queryText, $maxQueryLength) + { + return ($maxQueryLength !== '' && $this->string->strlen($queryText) > $maxQueryLength); + } +} diff --git a/app/code/Magento/Search/Model/QueryFactoryInterface.php b/app/code/Magento/Search/Model/QueryFactoryInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..6705585047383992929dd75c64c3abb4daa1971c --- /dev/null +++ b/app/code/Magento/Search/Model/QueryFactoryInterface.php @@ -0,0 +1,33 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Model; + +interface QueryFactoryInterface +{ + /** + * @return QueryInterface + */ + public function get(); +} diff --git a/app/code/Magento/Search/Model/QueryInterface.php b/app/code/Magento/Search/Model/QueryInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..a006bce7168784086c831d4a65e030e0c471ca94 --- /dev/null +++ b/app/code/Magento/Search/Model/QueryInterface.php @@ -0,0 +1,33 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Model; + +interface QueryInterface +{ + /** + * @return string + */ + public function getQueryText(); +} diff --git a/app/code/Magento/Search/Model/QueryResult.php b/app/code/Magento/Search/Model/QueryResult.php new file mode 100644 index 0000000000000000000000000000000000000000..2313bd9e3bcd43d54790f98c6d43253df3fe7625 --- /dev/null +++ b/app/code/Magento/Search/Model/QueryResult.php @@ -0,0 +1,64 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Model; + +class QueryResult +{ + + /** + * @var string + */ + private $queryText; + + /** + * @var int + */ + private $resultsCount; + + /** + * @param string $queryText + * @param string $resultsCount + */ + public function __construct($queryText, $resultsCount) + { + $this->queryText = $queryText; + $this->resultsCount = $resultsCount; + } + + /** + * @return string + */ + public function getQueryText() + { + return $this->queryText; + } + + /** + * @return int + */ + public function getResultsCount() + { + return $this->resultsCount; + } +} diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Helper.php b/app/code/Magento/Search/Model/Resource/Helper.php similarity index 96% rename from app/code/Magento/CatalogSearch/Model/Resource/Helper.php rename to app/code/Magento/Search/Model/Resource/Helper.php index db906a2c01f214e77f94c80d983cc6f8697afdb8..07ca65b8ad031b9e85733feb06f5726cdc1eacc2 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Helper.php +++ b/app/code/Magento/Search/Model/Resource/Helper.php @@ -21,10 +21,10 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\CatalogSearch\Model\Resource; +namespace Magento\Search\Model\Resource; /** - * CatalogSearch Mysql resource helper model + * Search Mysql resource helper model * * @author Magento Core Team <core@magentocommerce.com> */ @@ -34,7 +34,7 @@ class Helper extends \Magento\Eav\Model\Resource\Helper * @param \Magento\Framework\App\Resource $resource * @param string $modulePrefix */ - public function __construct(\Magento\Framework\App\Resource $resource, $modulePrefix = 'Magento_CatalogSearch') + public function __construct(\Magento\Framework\App\Resource $resource, $modulePrefix = 'Magento_Search') { parent::__construct($resource, $modulePrefix); } diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Query.php b/app/code/Magento/Search/Model/Resource/Query.php similarity index 95% rename from app/code/Magento/CatalogSearch/Model/Resource/Query.php rename to app/code/Magento/Search/Model/Resource/Query.php index 3710658ac9794256e32e1678e7e0c6817a37b2d4..23fdeba483e8c5b400633ec2c819c2ce7f8ba6ed 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Query.php +++ b/app/code/Magento/Search/Model/Resource/Query.php @@ -21,14 +21,13 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\CatalogSearch\Model\Resource; +namespace Magento\Search\Model\Resource; use Magento\Framework\Model\Resource\Db\AbstractDb; /** - * Catalog search query resource model + * Search query resource model * - * @author Magento Core Team <core@magentocommerce.com> */ class Query extends AbstractDb { @@ -66,7 +65,7 @@ class Query extends AbstractDb */ protected function _construct() { - $this->_init('catalogsearch_query', 'query_id'); + $this->_init('search_query', 'query_id'); } /** diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Query/Collection.php b/app/code/Magento/Search/Model/Resource/Query/Collection.php similarity index 88% rename from app/code/Magento/CatalogSearch/Model/Resource/Query/Collection.php rename to app/code/Magento/Search/Model/Resource/Query/Collection.php index 0922a799c3568f774c867bbaaff70e6966d6beba..81a7ea3a71df2dc482ffd622fe743b29b6621f52 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Query/Collection.php +++ b/app/code/Magento/Search/Model/Resource/Query/Collection.php @@ -21,14 +21,13 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\CatalogSearch\Model\Resource\Query; +namespace Magento\Search\Model\Resource\Query; use Magento\Store\Model\Store; /** - * Catalog search query collection + * Search query collection * - * @author Magento Core Team <core@magentocommerce.com> */ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection { @@ -47,9 +46,9 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac protected $_storeManager; /** - * Catalog search resource helper + * Search resource helper * - * @var \Magento\CatalogSearch\Model\Resource\Helper + * @var \Magento\Search\Model\Resource\Helper */ protected $_resourceHelper; @@ -59,17 +58,17 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Framework\StoreManagerInterface $storeManager - * @param \Magento\CatalogSearch\Model\Resource\Helper $resourceHelper + * @param \Magento\Search\Model\Resource\Helper $resourceHelper * @param \Zend_Db_Adapter_Abstract $connection * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource */ public function __construct( - \Magento\Core\Model\EntityFactory $entityFactory, + \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory, \Magento\Framework\Logger $logger, \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy, \Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Framework\StoreManagerInterface $storeManager, - \Magento\CatalogSearch\Model\Resource\Helper $resourceHelper, + \Magento\Search\Model\Resource\Helper $resourceHelper, $connection = null, \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null ) { @@ -85,7 +84,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac */ protected function _construct() { - $this->_init('Magento\CatalogSearch\Model\Query', 'Magento\CatalogSearch\Model\Resource\Query'); + $this->_init('Magento\Search\Model\Query', 'Magento\Search\Model\Resource\Query'); } /** @@ -127,7 +126,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac )->distinct( true )->from( - array('main_table' => $this->getTable('catalogsearch_query')), + array('main_table' => $this->getTable('search_query')), array('query' => $ifSynonymFor, 'num_results') )->where( 'num_results > 0 AND display_in_terms = 1 AND query_text LIKE ?', @@ -164,7 +163,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac )->distinct( true )->from( - array('main_table' => $this->getTable('catalogsearch_query')), + array('main_table' => $this->getTable('search_query')), array('name' => $ifSynonymFor, 'num_results', 'popularity') ); if ($storeIds) { diff --git a/app/code/Magento/Search/Model/SearchCollectionFactory.php b/app/code/Magento/Search/Model/SearchCollectionFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..e096637c7c074a83050528789d2612d89dc8696a --- /dev/null +++ b/app/code/Magento/Search/Model/SearchCollectionFactory.php @@ -0,0 +1,67 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Model; + +class SearchCollectionFactory +{ + /** + * Object Manager instance + * + * @var \Magento\Framework\ObjectManager + */ + protected $_objectManager = null; + + /** + * Instance name to create + * + * @var string + */ + protected $_instanceName = null; + + /** + * Factory constructor + * + * @param \Magento\Framework\ObjectManager $objectManager + * @param string $instanceName + */ + public function __construct( + \Magento\Framework\ObjectManager $objectManager, + $instanceName = 'Magento\Search\Model\SearchCollectionInterface' + ) { + $this->_objectManager = $objectManager; + $this->_instanceName = $instanceName; + } + + /** + * Create class instance with specified parameters + * + * @param array $data + * @return \Magento\Search\Model\SearchCollectionInterface + */ + public function create(array $data = array()) + { + return $this->_objectManager->create($this->_instanceName, $data); + } +} diff --git a/app/code/Magento/Search/Model/SearchCollectionInterface.php b/app/code/Magento/Search/Model/SearchCollectionInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..95df9747f64c504f274de3415f4c7cc1dc5fc2b0 --- /dev/null +++ b/app/code/Magento/Search/Model/SearchCollectionInterface.php @@ -0,0 +1,37 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Model; + + +interface SearchCollectionInterface extends \Traversable, \Countable +{ + /** + * Set term filter + * + * @param string $term + * @return self + */ + public function addSearchFilter($term); +} diff --git a/app/code/Magento/Search/Model/SearchDataProvider.php b/app/code/Magento/Search/Model/SearchDataProvider.php new file mode 100644 index 0000000000000000000000000000000000000000..da9598690e24eb0a7da035ac13cebca51864f58b --- /dev/null +++ b/app/code/Magento/Search/Model/SearchDataProvider.php @@ -0,0 +1,43 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Model; + +class SearchDataProvider implements SearchDataProviderInterface +{ + /** + * {@inheritdoc} + */ + public function getSearchData(QueryInterface $query, $limit = null, $additionalFilters = array()) + { + return []; + } + + /** + * {@inheritdoc} + */ + public function isCountResultsEnabled() + { + return false; + } +} diff --git a/app/code/Magento/Search/Model/SearchDataProviderInterface.php b/app/code/Magento/Search/Model/SearchDataProviderInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..39258c27291a4a091efb88d543be001a43f34ea8 --- /dev/null +++ b/app/code/Magento/Search/Model/SearchDataProviderInterface.php @@ -0,0 +1,40 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Search\Model; + +interface SearchDataProviderInterface +{ + /** + * @param QueryInterface $query + * @param int $limit + * @param array $additionalFilters + * @return \Magento\Search\Model\QueryResult[] + */ + public function getSearchData(QueryInterface $query, $limit = null, $additionalFilters = array()); + + /** + * @return bool + */ + public function isCountResultsEnabled(); +} diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json new file mode 100644 index 0000000000000000000000000000000000000000..13aaf747fde083c9a48ca265a9b0b28a0e096d2c --- /dev/null +++ b/app/code/Magento/Search/composer.json @@ -0,0 +1,22 @@ +{ + "name": "magento/module-search", + "description": "N/A", + "require": { + "php": "~5.4.11|~5.5.0", + "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/magento-composer-installer": "*" + }, + "type": "magento2-module", + "version": "0.1.0-alpha99", + "extra": { + "map": [ + [ + "*", + "Magento/Search" + ] + ] + } +} diff --git a/app/code/Magento/CatalogSearch/etc/acl.xml b/app/code/Magento/Search/etc/acl.xml similarity index 93% rename from app/code/Magento/CatalogSearch/etc/acl.xml rename to app/code/Magento/Search/etc/acl.xml index 9da0b4e2bd8195070c58004ae44e7fb9a6bc8ef1..20be416b0d30b6c5f5b9616419b3194ea5330280 100644 --- a/app/code/Magento/CatalogSearch/etc/acl.xml +++ b/app/code/Magento/Search/etc/acl.xml @@ -29,7 +29,7 @@ <resource id="Magento_Adminhtml::admin"> <resource id="Magento_Adminhtml::marketing"> <resource id="Magento_Adminhtml::marketing_seo"> - <resource id="Magento_CatalogSearch::search" title="Search Terms" sortOrder="10" /> + <resource id="Magento_Search::search" title="Search Terms" sortOrder="10" /> </resource> </resource> </resource> diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml b/app/code/Magento/Search/etc/adminhtml/menu.xml similarity index 82% rename from app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml rename to app/code/Magento/Search/etc/adminhtml/menu.xml index 3d214f4271e8a78718b2695149b9f90418570124..d9d6d58ed2f49102f71cc8816d26a357e86e1fb6 100644 --- a/app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml +++ b/app/code/Magento/Search/etc/adminhtml/menu.xml @@ -25,6 +25,6 @@ --> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Backend/etc/menu.xsd"> <menu> - <add id="Magento_CatalogSearch::catalog_search" title="Search Terms" module="Magento_CatalogSearch" sortOrder="10" parent="Magento_Backend::marketing_seo" action="catalog/search/" resource="Magento_CatalogSearch::search"/> + <add id="Magento_Search::search_term" title="Search Terms" module="Magento_Search" sortOrder="10" parent="Magento_Backend::marketing_seo" action="search/term/" resource="Magento_Search::search"/> </menu> </config> diff --git a/app/code/Magento/Catalog/etc/events.xml b/app/code/Magento/Search/etc/adminhtml/routes.xml similarity index 76% rename from app/code/Magento/Catalog/etc/events.xml rename to app/code/Magento/Search/etc/adminhtml/routes.xml index d3f897712ec2bc036c74771f77bcc92ab6ec2617..97dfb2dbf32c846e4ad5d9d24b05b27908189b10 100644 --- a/app/code/Magento/Catalog/etc/events.xml +++ b/app/code/Magento/Search/etc/adminhtml/routes.xml @@ -23,8 +23,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd"> - <event name="page_block_html_topmenu_gethtml_before"> - <observer name="catalog_add_topmenu_items" instance="Magento\Catalog\Model\Observer" method="addCatalogToTopmenuItems" /> - </event> -</config> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd"> + <router id="admin"> + <route id="search" frontName="search"> + <module name="Magento_Search" before="Magento_Adminhtml" /> + </route> + </router> +</config> \ No newline at end of file diff --git a/app/code/Magento/Search/etc/di.xml b/app/code/Magento/Search/etc/di.xml new file mode 100644 index 0000000000000000000000000000000000000000..e62186fc9d006904fa5e78dfa8a94733f98d24b4 --- /dev/null +++ b/app/code/Magento/Search/etc/di.xml @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd"> + <type name="Magento\Framework\Module\Setup\Migration"> + <arguments> + <argument name="compositeModules" xsi:type="array"> + <item name="search" xsi:type="string">Magento_Search</item> + </argument> + </arguments> + </type> + <type name="Magento\Search\Block\Recommendations"> + <arguments> + <argument name="searchDataProvider" xsi:type="object">Magento\Search\Model\SearchDataProvider</argument> + <argument name="title" xsi:type="string">Related search terms</argument> + </arguments> + </type> + <type name="Magento\Search\Block\Suggestions"> + <arguments> + <argument name="searchDataProvider" xsi:type="object">Magento\Search\Model\SearchDataProvider</argument> + <argument name="title" xsi:type="string">Did you mean</argument> + </arguments> + </type> + <preference for="Magento\Search\Model\QueryFactoryInterface" type="Magento\Search\Model\QueryFactory" /> + <preference for="Magento\Search\Model\QueryInterface" type="Magento\Search\Model\Query" /> +</config> diff --git a/app/code/Magento/Core/etc/layout_generic.xsd b/app/code/Magento/Search/etc/frontend/page_types.xml similarity index 79% rename from app/code/Magento/Core/etc/layout_generic.xsd rename to app/code/Magento/Search/etc/frontend/page_types.xml index 97d7c1e83828ba23946950095746d0c8e2a9b039..eceadfcc60b1c115e0401c093fe4cf6b7408473c 100644 --- a/app/code/Magento/Core/etc/layout_generic.xsd +++ b/app/code/Magento/Search/etc/frontend/page_types.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <!-- /** * Magento @@ -23,8 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:include schemaLocation="page.xsd"/> - - <xs:element name="layout" type="pageType"/> -</xs:schema> +<page_types xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Core/etc/page_types.xsd"> + <type id="search_term_popular" label="Popular Search Terms"/> +</page_types> diff --git a/app/code/Magento/Search/etc/frontend/routes.xml b/app/code/Magento/Search/etc/frontend/routes.xml new file mode 100644 index 0000000000000000000000000000000000000000..864d6d8de90891dffd4bd5252c02310844f80dae --- /dev/null +++ b/app/code/Magento/Search/etc/frontend/routes.xml @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd"> + <router id="standard"> + <route id="search" frontName="search"> + <module name="Magento_Search" /> + </route> + </router> +</config> \ No newline at end of file diff --git a/app/code/Magento/Search/etc/module.xml b/app/code/Magento/Search/etc/module.xml new file mode 100644 index 0000000000000000000000000000000000000000..1b9192004bfbd8cd3d72d289204ff53c4ccdc16d --- /dev/null +++ b/app/code/Magento/Search/etc/module.xml @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"> + <module name="Magento_Search" schema_version="1.6.0.0" active="true"> + <sequence> + <module name="Magento_Backend" /> + </sequence> + <depends> + <module name="Magento_Backend" /> + <module name="Magento_Eav" /> + <module name="Magento_Store" /> + </depends> + </module> +</config> diff --git a/app/code/Magento/Search/sql/search_setup/install-1.6.0.0.php b/app/code/Magento/Search/sql/search_setup/install-1.6.0.0.php new file mode 100644 index 0000000000000000000000000000000000000000..fa2668376037962983fa7d74ed5009e6cbdb3f33 --- /dev/null +++ b/app/code/Magento/Search/sql/search_setup/install-1.6.0.0.php @@ -0,0 +1,119 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$installer = $this; +/* @var $installer \Magento\Framework\Module\Setup */ + +$installer->startSetup(); + +/** + * Create table 'search_query' + */ +$table = $installer->getConnection() +->newTable($installer->getTable('search_query')) +->addColumn( + 'query_id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true), + 'Query ID' +)->addColumn( + 'query_text', + \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, + 255, + array(), + 'Query text' +)->addColumn( + 'num_results', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + array('unsigned' => true, 'nullable' => false, 'default' => '0'), + 'Num results' +)->addColumn( + 'popularity', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + array('unsigned' => true, 'nullable' => false, 'default' => '0'), + 'Popularity' +)->addColumn( + 'redirect', + \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, + 255, + array(), + 'Redirect' +)->addColumn( + 'synonym_for', + \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, + 255, + array(), + 'Synonym for' +)->addColumn( + 'store_id', + \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, + null, + array('unsigned' => true, 'nullable' => false, 'default' => '0'), + 'Store ID' +)->addColumn( + 'display_in_terms', + \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, + null, + array('nullable' => false, 'default' => '1'), + 'Display in terms' +)->addColumn( + 'is_active', + \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, + null, + array('default' => '1'), + 'Active status' +)->addColumn( + 'is_processed', + \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, + null, + array('default' => '0'), + 'Processed status' +)->addColumn( + 'updated_at', + \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, + null, + array('nullable' => false), + 'Updated at' +)->addIndex( + $installer->getIdxName('search_query', array('query_text', 'store_id', 'popularity')), + array('query_text', 'store_id', 'popularity') +)->addIndex( + $installer->getIdxName('search_query', 'store_id'), + 'store_id' +)->addForeignKey( + $installer->getFkName('search_query', 'store_id', 'store', 'store_id'), + 'store_id', + $installer->getTable('store'), + 'store_id', + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE +)->setComment( + 'Search query table' +); +$installer->getConnection()->createTable($table); + +$installer->endSetup(); diff --git a/app/code/Magento/Search/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Search/view/adminhtml/layout/adminhtml_dashboard_index.xml new file mode 100644 index 0000000000000000000000000000000000000000..9024dfecb5fc0d17a22c8cafb898ff608f0cf7b6 --- /dev/null +++ b/app/code/Magento/Search/view/adminhtml/layout/adminhtml_dashboard_index.xml @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <referenceBlock name="dashboard"> + <block class="Magento\Search\Block\Adminhtml\Dashboard\Last" as="lastSearches" /> + <block class="Magento\Search\Block\Adminhtml\Dashboard\Top" as="topSearches" /> + </referenceBlock> +</page> diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml b/app/code/Magento/Search/view/adminhtml/layout/search_term_edit.xml similarity index 83% rename from app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml rename to app/code/Magento/Search/view/adminhtml/layout/search_term_edit.xml index 984a6ca8820445a9d1b924b7f97390ab8b9abf44..11e932b30574507969a0e367b8bace94840edd44 100644 --- a/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml +++ b/app/code/Magento/Search/view/adminhtml/layout/search_term_edit.xml @@ -23,8 +23,8 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> - <block class="Magento\Catalog\Block\Adminhtml\Search\Edit" name="adminhtml.catalog.search.edit"/> + <block class="Magento\Search\Block\Adminhtml\Term\Edit" name="adminhtml.search.term.edit"/> </referenceContainer> </page> diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_grid_block.xml b/app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml similarity index 96% rename from app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_grid_block.xml rename to app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml index 9ff0faaf11f10afa3bc32e2a1bfad4ec7028bcd1..e96ecb33145a1e2e4156b09560759d957ae0ddfa 100644 --- a/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_grid_block.xml +++ b/app/code/Magento/Search/view/adminhtml/layout/search_term_grid_block.xml @@ -23,12 +23,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> - <referenceBlock name="adminhtml.catalog.search.grid.container"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <referenceBlock name="adminhtml.search.term.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.catalog.search.grid" as="grid"> <arguments> - <argument name="id" xsi:type="string">catalog_search_grid</argument> - <argument name="dataSource" xsi:type="object">Magento\CatalogSearch\Model\Resource\Query\Collection</argument> + <argument name="id" xsi:type="string">search_term_grid</argument> + <argument name="dataSource" xsi:type="object">Magento\Search\Model\Resource\Query\Collection</argument> <argument name="default_sort" xsi:type="string">name</argument> <argument name="default_dir" xsi:type="string">ASC</argument> <argument name="save_parameters_in_session" xsi:type="string">1</argument> diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_index.xml b/app/code/Magento/Search/view/adminhtml/layout/search_term_index.xml similarity index 80% rename from app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_index.xml rename to app/code/Magento/Search/view/adminhtml/layout/search_term_index.xml index 6661c5f2dd515fb04fdba32ac20aeb6a56fc7058..f9517381f4cb466e72308a1787eda72129c450ec 100644 --- a/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_index.xml +++ b/app/code/Magento/Search/view/adminhtml/layout/search_term_index.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> - <update handle="catalog_search_grid_block"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <update handle="search_term_grid_block"/> <referenceContainer name="content"> - <block class="Magento\Catalog\Block\Adminhtml\Search" name="adminhtml.catalog.search.grid.container"/> + <block class="Magento\Search\Block\Adminhtml\Term" name="adminhtml.search.term.grid.container"/> </referenceContainer> </page> diff --git a/app/code/Magento/Search/view/frontend/layout/default.xml b/app/code/Magento/Search/view/frontend/layout/default.xml new file mode 100644 index 0000000000000000000000000000000000000000..2c3a12bd32e19c46e96920c77d985a3495368e6e --- /dev/null +++ b/app/code/Magento/Search/view/frontend/layout/default.xml @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <referenceContainer name="header-wrapper"> + <block class="Magento\Framework\View\Element\Template" name="top.search" as="topSearch" template="Magento_Search::form.mini.phtml" /> + </referenceContainer> + <referenceBlock name="footer_links"> + <block class="Magento\Framework\View\Element\Html\Link\Current" ifconfig="catalog/seo/search_terms" name="search-term-popular-link"> + <arguments> + <argument name="label" xsi:type="string">Search Terms</argument> + <argument name="path" xsi:type="string">search/term/popular</argument> + </arguments> + </block> + </referenceBlock> +</page> diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml b/app/code/Magento/Search/view/frontend/layout/search_term_popular.xml similarity index 82% rename from app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml rename to app/code/Magento/Search/view/frontend/layout/search_term_popular.xml index 4f52660551d6b8fc7d4e2693ec88f37651637cab..bcb5f81002254cf29c8c1d3a958f58a920db7c22 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml +++ b/app/code/Magento/Search/view/frontend/layout/search_term_popular.xml @@ -23,11 +23,11 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Popular Search Terms</title> </head> <referenceContainer name="content"> - <block class="Magento\CatalogSearch\Block\Term" name="seo.searchterm" template="term.phtml" cacheable="false"/> + <block class="Magento\Search\Block\Term" name="seo.searchterm" template="term.phtml" cacheable="false"/> </referenceContainer> </page> diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml similarity index 82% rename from app/code/Magento/CatalogSearch/view/frontend/templates/form.mini.phtml rename to app/code/Magento/Search/view/frontend/templates/form.mini.phtml index cdf1ba1eb1848e5aee1ab5f2ec2d28c3d58f6170..0f7402876566882285498bca63672d27156b2ea0 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/templates/form.mini.phtml +++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml @@ -24,8 +24,8 @@ ?> <?php /** @var $this \Magento\Framework\View\Element\Template */ -/** @var $helper \Magento\CatalogSearch\Helper\Data */ -$helper = $this->helper('Magento\CatalogSearch\Helper\Data'); +/** @var $helper \Magento\Search\Helper\Data */ +$helper = $this->helper('Magento\Search\Helper\Data'); ?> <div class="block block-search"> <div class="block block-title"><strong><?php echo __('Search'); ?></strong></div> @@ -35,9 +35,9 @@ $helper = $this->helper('Magento\CatalogSearch\Helper\Data'); <label class="label" for="search"><span><?php echo __('Search'); ?></span></label> <div class="control"> <input id="search" - data-mage-init='{"catalogSearch":{ + data-mage-init='{"quickSearch":{ "formSelector":"#search_mini_form", - "url":"<?php echo $helper->getSuggestUrl() ?>", + "url":"<?php echo $this->getUrl('search/ajax/suggest'); ?>", "destinationSelector":"#search_autocomplete"} }' type="text" @@ -47,11 +47,7 @@ $helper = $this->helper('Magento\CatalogSearch\Helper\Data'); class="input-text" autocomplete="off"/> <div id="search_autocomplete" class="search-autocomplete"></div> - <div class="nested"> - <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>"> - <?php echo __('Advanced Search'); ?> - </a> - </div> + <?php echo $this->getChildHtml() ?> </div> </div> <div class="actions"> diff --git a/app/code/Magento/Search/view/frontend/templates/search_data.phtml b/app/code/Magento/Search/view/frontend/templates/search_data.phtml new file mode 100644 index 0000000000000000000000000000000000000000..8eaa4f693716fe174902865bc8b66bb9a1e26de2 --- /dev/null +++ b/app/code/Magento/Search/view/frontend/templates/search_data.phtml @@ -0,0 +1,46 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +?> +<?php +/** + * @var \Magento\Search\Block\SearchDataInterface $this + */ +?> +<?php +/** @var \Magento\Search\Model\QueryResult[] $data */ +$data = $this->getSearchData(); +if (count($data)):?> + <dl class="block"> + <dt class="title"><?php echo __($this->getTitle()); ?></dt> + <?php foreach ($data as $additionalInfo) : ?> + <dd class="item"> + <a href="<?php echo $this->getLink($additionalInfo->getQueryText()) ?>" + ><?php echo $additionalInfo->getQueryText() ?></a> + <?php if ($this->isCountResultsEnabled()): ?> + <span class="count"><?php echo $additionalInfo->getResultsCount() ?></span> + <?php endif; ?> + </dd> + <?php endforeach; ?> + </dl> +<?php endif; ?> diff --git a/app/code/Magento/CatalogSearch/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js similarity index 99% rename from app/code/Magento/CatalogSearch/view/frontend/web/form-mini.js rename to app/code/Magento/Search/view/frontend/web/form-mini.js index 21baed5f2d5f8e9915ad83c68dc64bccb16d5074..01e72a648ea57dd624e870ab00a89a569a6120e0 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/web/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/form-mini.js @@ -31,7 +31,7 @@ define([ ], function($){ "use strict"; - $.widget('mage.catalogSearch', { + $.widget('mage.quickSearch', { options: { autocomplete: 'off', minSearchLength: 2, diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index e9aefbc67e21746d66ce6d3c599720d2b0f033f7..48793913b4a2355c1740c39b99d8a4a0851356c0 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml index 84144e731cfed87b29cae1b8f8cfda90ff8be8bd..a1f2f2324a0bfe113d37b8f9b65f638c87978f15 100644 --- a/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml +++ b/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="page.main.title"> <action method="setPageTitle"> <argument name="title" translate="true" xsi:type="string">Email to a Friend</argument> diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 30e15a97db3e5fd62b1543fdc39579b8d611f6da..d70a507266866ecac1e34b8f21d0818d2b98455f 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-contact": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-contact": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "ext-gd": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addcomment.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addcomment.xml index 06a1a48a1780c154c57d08f19b05748295d38f8e..312847e37d417d82c1792855afbd73da7f2ab0b2 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addcomment.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addcomment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Shipping\Block\Adminhtml\View\Comments" name="shipment_comments"> <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml"/> </block> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addtrack.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addtrack.xml index f188fb67003ff1d530417cacef3a7be83de0d034..f2bed59059359b914b046fb42f03f386c29607c3 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addtrack.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addtrack.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Shipping\Block\Adminhtml\Order\Tracking\View" name="shipment_tracking" template="order/tracking/view.phtml"/> </page> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml index 83b1980020ebfc6d93b6edb003fd5d1190b3a50c..e572a752c1a00b2063c0533bc34d6bad5cd229fc 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Shipping\Block\Adminhtml\Create" name="sales_shipment_create"> <block class="Magento\Shipping\Block\Adminhtml\Create\Form" name="form" template="create/form.phtml"> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_removetrack.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_removetrack.xml index f188fb67003ff1d530417cacef3a7be83de0d034..f2bed59059359b914b046fb42f03f386c29607c3 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_removetrack.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_removetrack.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Shipping\Block\Adminhtml\Order\Tracking\View" name="shipment_tracking" template="order/tracking/view.phtml"/> </page> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml index f414ddb56f4438a5776a40f45d8d9ea4a7f4182e..1b2a64ad2bc28a1345093bb95826952184b855b5 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Shipping\Block\Adminhtml\View" name="sales_shipment_view"> <block class="Magento\Shipping\Block\Adminhtml\View\Form" name="form" template="view/form.phtml"> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_invoice_new.xml index f63e419e686a7ddea28cc06ab76e4ef6cf9d14aa..29dd4d49b894ba6c4405c33162bc86af7c59e739 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="form"> <block class="Magento\Shipping\Block\Adminhtml\Order\Tracking\Invoice" name="tracking" template="order/tracking.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_view.xml index 35dcbc4ecd97f50d93a7972bec5769c6f9f4783a..1aee36dd4b3af99e65425428da13b940739f7909 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/Shipping/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_tab_info"> <block class="Magento\Sales\Block\Adminhtml\Order\AbstractOrder" name="order_shipping_view" template="Magento_Shipping::order/view/info.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_reorder.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_reorder.xml index da76d9036b13f19dcd8a6ba19db69139074e9d1a..8539818ed1c3b890708dece70494e1b9030375c9 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_reorder.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_reorder.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.view"> <block class="Magento\Shipping\Block\Tracking\Link" name="tracking-info-link" template="tracking/link.phtml"> <arguments> @@ -31,4 +31,4 @@ </arguments> </block> </referenceBlock> -</page> \ No newline at end of file +</page> diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml index 39b0a18f9ff99c5c5472256317c6e2fd86f0ce1e..8f3e80e20c695a552101a35b3e99ebfd790e7c6f 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_shipment_renderers" /> <referenceContainer name="content"> <block class="Magento\Shipping\Block\Order\Shipment" name="sales.order.shipment" after="sales.order.info"> diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_view.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_view.xml index da76d9036b13f19dcd8a6ba19db69139074e9d1a..8539818ed1c3b890708dece70494e1b9030375c9 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_view.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.view"> <block class="Magento\Shipping\Block\Tracking\Link" name="tracking-info-link" template="tracking/link.phtml"> <arguments> @@ -31,4 +31,4 @@ </arguments> </block> </referenceBlock> -</page> \ No newline at end of file +</page> diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_order_reorder.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_order_reorder.xml index da76d9036b13f19dcd8a6ba19db69139074e9d1a..8539818ed1c3b890708dece70494e1b9030375c9 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/sales_order_reorder.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/sales_order_reorder.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.view"> <block class="Magento\Shipping\Block\Tracking\Link" name="tracking-info-link" template="tracking/link.phtml"> <arguments> @@ -31,4 +31,4 @@ </arguments> </block> </referenceBlock> -</page> \ No newline at end of file +</page> diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml index bc854833e09e23ebe584e65b0f2a621e798096da..e7762b5c6c1689f5fbc2069e7a3e7a1620f1979c 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="sales_order_shipment_renderers" /> <referenceContainer name="content"> <block class="Magento\Shipping\Block\Order\Shipment" name="sales.order.shipment" cacheable="false"> diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_order_view.xml index da76d9036b13f19dcd8a6ba19db69139074e9d1a..8539818ed1c3b890708dece70494e1b9030375c9 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/sales_order_view.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="sales.order.view"> <block class="Magento\Shipping\Block\Tracking\Link" name="tracking-info-link" template="tracking/link.phtml"> <arguments> @@ -31,4 +31,4 @@ </arguments> </block> </referenceBlock> -</page> \ No newline at end of file +</page> diff --git a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml index bf0cc30487473c2a25eab91dbcd236603b6c49de..ab48dd503e1467707c42a6c55087d25724606c91 100644 --- a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml +++ b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="tracking/popup.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index 1ceb37b1c822eaf70846d71cded0424b1bc928d2..cd62ee2265f4eeaeef598b61b97e2944c16e4205 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog-url-rewrite": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog-url-rewrite": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml index 9ec852fc95bb1ab0cb73b3b5266b5cfeb4d14134..7ecc4770361c41d794ebda508736d952d8f7a23c 100644 --- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml +++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_sitemap_index_grid_block"/> <referenceContainer name="content"> <block class="Magento\Sitemap\Block\Adminhtml\Sitemap" name="adminhtml.sitemap.container"/> diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml index 8d8b8f4e7d477dc7f9df5ce28c66d4521e044955..44b387f28b5a1135ae7a71f818b4109ee1fea955 100644 --- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml +++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.sitemap.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.sitemap.container.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Store/Model/Config/Processor/Placeholder.php b/app/code/Magento/Store/Model/Config/Processor/Placeholder.php index 6e2351891680579bce385f6f9894d19a5d24592a..be8d9d50758c321fdf7740aec33e0c0b4224b5d5 100644 --- a/app/code/Magento/Store/Model/Config/Processor/Placeholder.php +++ b/app/code/Magento/Store/Model/Config/Processor/Placeholder.php @@ -151,8 +151,8 @@ class Placeholder { $keys = explode('/', $path); foreach ($keys as $key) { - if (is_array($data) && array_key_exists($key, $data)) { - $data = $data[$key]; + if (is_array($data) && (isset($data[$key]) || array_key_exists($key, $data))) { + $data = $data[$key]; } else { return null; } diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index 5a32828033dd3a2535abcfe5689c2dfd1d96e98b..713ff4030ff3c4fd25c522ab39869e6978d253e0 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-core": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-ui": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-core": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-ui": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Store/view/base/layout/ui_components.xml b/app/code/Magento/Store/view/base/layout/ui_components.xml index c2d046e0e4d5ad84db6ef28fa9d4f93521879cf7..c66fb820c608d0c863958f77df98434337302189 100644 --- a/app/code/Magento/Store/view/base/layout/ui_components.xml +++ b/app/code/Magento/Store/view/base/layout/ui_components.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <block class="Magento\Ui\Filter\Type\Select" name="filter_store"> <arguments> <argument name="content_template" xsi:type="string">Magento_Ui::filter/type/select/default.phtml</argument> diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php index 1e6989db36b3038929835abb63af3b6760fc8249..92df11f7e45c56db674ba971c82dee396d988c8f 100644 --- a/app/code/Magento/Tax/Helper/Data.php +++ b/app/code/Magento/Tax/Helper/Data.php @@ -780,9 +780,15 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper $itemTaxDetails = $orderTaxDetails->getItems(); foreach ($itemTaxDetails as $itemTaxDetail) { //Aggregate taxable items associated with an item - if ($itemTaxDetail->getItemId() == $orderItemId - || $itemTaxDetail->getAssociatedItemId() == $orderItemId) { + if ($itemTaxDetail->getItemId() == $orderItemId) { $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $itemRatio); + } elseif ($itemTaxDetail->getAssociatedItemId() == $orderItemId) { + $taxableItemType = $itemTaxDetail->getType(); + $ratio = $itemRatio; + if ($item->getTaxRatio() && isset($item->getTaxRatio()[$taxableItemType])) { + $ratio = $item->getTaxRatio()[$taxableItemType]; + } + $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $ratio); } } } diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php index ecfbc2ef49f03161672373391ed7475c0b824f23..27438e874e8a57899761a03b7396e8425aa2d9d6 100644 --- a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php +++ b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php @@ -40,6 +40,10 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator $rate = $this->calculationTool->getRate($taxRateRequest); $storeRate = $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId); + $discountTaxCompensationAmount = 0; + $applyTaxAfterDiscount = $this->config->applyTaxAfterDiscount($this->storeId); + $discountAmount = $item->getDiscountAmount(); + // Calculate $rowTotalInclTax $priceInclTax = $this->calculationTool->round($item->getUnitPrice()); $rowTotalInclTax = $priceInclTax * $quantity; @@ -48,15 +52,16 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator $rowTotalInclTax = $priceInclTax * $quantity; } $rowTaxExact = $this->calculationTool->calcTaxAmount($rowTotalInclTax, $rate, true, false); - $rowTax = $this->roundAmount($rowTaxExact, $rate, true); + $deltaRoundingType = self::KEY_REGULAR_DELTA_ROUNDING; + if ($applyTaxAfterDiscount) { + $deltaRoundingType = self::KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING; + } + $rowTax = $this->roundAmount($rowTaxExact, $rate, true, $deltaRoundingType); $rowTotal = $rowTotalInclTax - $rowTax; $price = $this->calculationTool->round($rowTotal / $quantity); //Handle discount - $discountTaxCompensationAmount = 0; - $applyTaxAfterDiscount = $this->config->applyTaxAfterDiscount($this->storeId); - $discountAmount = $item->getDiscountAmount(); - if ($discountAmount && $applyTaxAfterDiscount) { + if ($applyTaxAfterDiscount) { //TODO: handle originalDiscountAmount $taxableAmount = max($rowTotalInclTax - $discountAmount, 0); $rowTaxAfterDiscount = $this->calculationTool->calcTaxAmount( @@ -65,12 +70,7 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator true, false ); - $rowTaxAfterDiscount = $this->roundAmount( - $rowTaxAfterDiscount, - $rate, - true, - self::KEY_TAX_AFTER_DISCOUNT_DELTA_ROUNDING - ); + $rowTaxAfterDiscount = $this->roundAmount($rowTaxAfterDiscount, $rate, true); // Set discount tax compensation $discountTaxCompensationAmount = $rowTax - $rowTaxAfterDiscount; $rowTax = $rowTaxAfterDiscount; @@ -122,11 +122,15 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator $taxId = $appliedRate['id']; $taxRate = $appliedRate['percent']; $rowTaxPerRate = $this->calculationTool->calcTaxAmount($rowTotal, $taxRate, false, false); - $rowTaxPerRate = $this->roundAmount($rowTaxPerRate, $taxRate, false); + $deltaRoundingType = self::KEY_REGULAR_DELTA_ROUNDING; + if ($applyTaxAfterDiscount) { + $deltaRoundingType = self::KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING; + } + $rowTaxPerRate = $this->roundAmount($rowTaxPerRate, $taxId, false, $deltaRoundingType); $rowTaxAfterDiscount = $rowTaxPerRate; //Handle discount - if ($discountAmount && $applyTaxAfterDiscount) { + if ($applyTaxAfterDiscount) { //TODO: handle originalDiscountAmount $taxableAmount = max($rowTotal - $discountAmount, 0); $rowTaxAfterDiscount = $this->calculationTool->calcTaxAmount( @@ -135,12 +139,7 @@ abstract class AbstractAggregateCalculator extends AbstractCalculator false, false ); - $rowTaxAfterDiscount = $this->roundAmount( - $rowTaxAfterDiscount, - $taxRate, - false, - self::KEY_TAX_AFTER_DISCOUNT_DELTA_ROUNDING - ); + $rowTaxAfterDiscount = $this->roundAmount($rowTaxAfterDiscount, $taxId, false); } $appliedTaxes[$taxId] = $this->getAppliedTax( $rowTaxAfterDiscount, diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php index 922bdd04cee45c47dce9e9913b455cfb20ec43fd..8e00fccce9432198fecfb19ddcb70436ba991b29 100644 --- a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php +++ b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php @@ -42,7 +42,7 @@ abstract class AbstractCalculator const KEY_APPLIED_TAX_DELTA_ROUNDING = 'applied_tax_amount'; - const KEY_TAX_AFTER_DISCOUNT_DELTA_ROUNDING = 'tax_after_discount'; + const KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING = 'tax_before_discount'; /**#@-*/ /** diff --git a/app/code/Magento/Tax/README.md b/app/code/Magento/Tax/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7950a10897033112ee759ce78af7bcc426caf8ab --- /dev/null +++ b/app/code/Magento/Tax/README.md @@ -0,0 +1 @@ +The Tax module provides the calculations needed to compute the consumption tax on goods and services. diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index faa67acb52c6d8b3a1bd8ab129e73874570bdfae..ae7f7192cecb13af4be91dec85019e377c9cdf16 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-reports": "0.1.0-alpha98", - "magento/module-configurable-product": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-reports": "0.1.0-alpha99", + "magento/module-configurable-product": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Tax/view/adminhtml/layout/sales_creditmemo_item_price.xml b/app/code/Magento/Tax/view/adminhtml/layout/sales_creditmemo_item_price.xml index 00ceda94217856f709ddaf6a6bcd6fdd85f7a518..039a27d116e5c10ca8b84682360946403f6b5eeb 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/sales_creditmemo_item_price.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/sales_creditmemo_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_items"> <block class="Magento\Tax\Block\Adminhtml\Items\Price\Renderer" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Tax\Block\Adminhtml\Items\Price\Renderer" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/sales_invoice_item_price.xml b/app/code/Magento/Tax/view/adminhtml/layout/sales_invoice_item_price.xml index d3176f17fadd07ac68ffc6e37198fe1c64a66d69..d6f150987da7095be1a6b5cf1868d1ff0d5216a1 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/sales_invoice_item_price.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/sales_invoice_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_items"> <block class="Magento\Tax\Block\Adminhtml\Items\Price\Renderer" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Tax\Block\Adminhtml\Items\Price\Renderer" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/sales_order_create_item_price.xml b/app/code/Magento/Tax/view/adminhtml/layout/sales_order_create_item_price.xml index e6bcd4e4990f83f3a2bd890bf8070a3a339806cb..74cd0e51e1d2068df3b020fee4503df8a3ae3da6 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/sales_order_create_item_price.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/sales_order_create_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Tax\Block\Item\Price\Renderer" name="item_unit_price" template="order/create/items/price/unit.phtml"> <arguments> <argument name="zone" xsi:type="string">cart</argument> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/sales_order_item_price.xml b/app/code/Magento/Tax/view/adminhtml/layout/sales_order_item_price.xml index bf0e841e1e33e73fb97aae238b1ed8cafe395512..666f78f949fae0eef03348c8368c51d587b98162 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/sales_order_item_price.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/sales_order_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Tax\Block\Adminhtml\Items\Price\Renderer" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Tax\Block\Adminhtml\Items\Price\Renderer" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml index ba39177eb2db9353cfeda23b8764d0062d91a37f..05eaf013f6c8a4d91e06593d3e0f549df8ea4501 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.tax.rate.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.tax.rate.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml index db2c8d3bcb6577c626702e15c6c32616e2815058..5315724aafc716a46ecfbcd29bdcf4665483290c 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="tax_rate_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.tax.rate.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml index db2c8d3bcb6577c626702e15c6c32616e2815058..5315724aafc716a46ecfbcd29bdcf4665483290c 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="tax_rate_block"/> <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.tax.rate.container" template="Magento_Backend::widget/grid/container/empty.phtml"/> </page> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml index a75f37afab875a7df9e2fb0fb508d783b4b761db..56547dc01fe9235e26c3fb26fa0de8d896e104e6 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="tax_rate_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml index 2febdb049fe381d2655645efd540e080ff767729..94671b90120917fd7501561e7378b355233621e3 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.block.tax.rule.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.tax.rule.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml index 47a33655917f8b7453fb84678eb2ab528b2e961e..73d6a4497e7c99c3407c63d3de78126546ccddf2 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="Magento_Tax::js/bootstrap.js"/> <css src="jquery/editableMultiselect/css/jquery.multiselect.css"/> diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml index fe1b33ac63a79933ccdbf0a34c90a638e6295f01..35e1018a5cbfbfc99e7350e04aad37f9eca05656 100644 --- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml +++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="tax_rule_block"/> <referenceContainer name="content"> <block class="Magento\Tax\Block\Adminhtml\Rule" name="adminhtml.block.tax.rule.container"/> diff --git a/app/code/Magento/Tax/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Tax/view/base/layout/catalog_product_prices.xml index 708621c8c5c3cf7d5c6716cc4681a8057c7fa51f..07942c496089d7c72d312ada63c2e56ebc78c17e 100644 --- a/app/code/Magento/Tax/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Tax/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="render.product.prices"> <arguments> <argument name="default" xsi:type="array"> diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml index 4a7c05da9b69e937201385093cdcf94e61347f65..38d5aa616ab8cdf2b53a898cece0bb8cfe91eeca 100644 --- a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml +++ b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="minicart"> <block class="Magento\Tax\Block\Item\Price\Renderer" name="checkout.cart.item.price.sidebar" template="Magento_Tax::checkout/cart/item/price/sidebar.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml index 3c829978e10ef1716a3e3d28d0c03be2e1d1c5ce..159b6dd6b0f47eb00bc277f7875a461558bb526c 100644 --- a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml +++ b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="minicart"> <block class="Magento\Tax\Block\Checkout\Cart\Sidebar\Totals" name="checkout.cart.minicart.totals" template="Magento_Tax::checkout/cart/minicart/totals.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_item_price_renderers.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_item_price_renderers.xml index 25a44a7eb4e36126535c1110c91ef8da9c4c17ca..477f050ae49c1339e5c303484eb048565b9aa6e8 100644 --- a/app/code/Magento/Tax/view/frontend/layout/checkout_item_price_renderers.xml +++ b/app/code/Magento/Tax/view/frontend/layout/checkout_item_price_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Tax\Block\Item\Price\Renderer" name="checkout.item.price.unit" template="Magento_Tax::item/price/unit.phtml"/> <block class="Magento\Tax\Block\Item\Price\Renderer" name="checkout.item.price.row" template="Magento_Tax::item/price/row.phtml"/> </page> diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_shipping_price_renderer.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_shipping_price_renderer.xml index da72a8d91a78db3c19aa20b92528d64a64fcf10c..842e7abdd6469d74241ae85d96cd60340b291470 100644 --- a/app/code/Magento/Tax/view/frontend/layout/checkout_shipping_price_renderer.xml +++ b/app/code/Magento/Tax/view/frontend/layout/checkout_shipping_price_renderer.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Tax\Block\Checkout\Shipping\Price" name="checkout.shipping.price" as="shipping.price" template="Magento_Tax::checkout/shipping/price.phtml"/> </page> diff --git a/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml b/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml index 8e860e82905b8c583ec3f4121ef84398cb508c0c..fce8c2b4b12f5753f7776aea0c7a3d3ff4df6d35 100644 --- a/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml +++ b/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="items"> <block class="Magento\Tax\Block\Item\Price\Renderer" name="item_price" template="email/items/price/row.phtml"> <arguments> diff --git a/app/code/Magento/Tax/view/frontend/layout/sales_order_item_price.xml b/app/code/Magento/Tax/view/frontend/layout/sales_order_item_price.xml index e4560a2c2c39ee81b0b4a5c6b1f709dc869cc576..989bb8e135f2bae94f87c04aa11bb75e5adaba6b 100644 --- a/app/code/Magento/Tax/view/frontend/layout/sales_order_item_price.xml +++ b/app/code/Magento/Tax/view/frontend/layout/sales_order_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Tax\Block\Item\Price\Renderer" name="item_unit_price" template="item/price/unit.phtml"> <arguments> <argument name="zone" xsi:type="string">sales</argument> diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml index bc0ff189f04bc171009941b783f8a47c76a8c969..cf33654fee9c8cd5f65f4ef3d1e27cb623587470 100644 --- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml +++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml @@ -26,7 +26,7 @@ */ ?> <?php if ($this->includeTax() && $this->getTotalExclTax()>=0):?> -<tr class="totals grand excl"> +<tr class="grand totals excl"> <td style="<?php echo $this->getStyle() ?>" class="mark" colspan="<?php echo $this->getColspan(); ?>"> <strong><?php echo __('Grand Total Excl. Tax')?></strong> </td> @@ -35,7 +35,7 @@ </td> </tr> <?php echo $this->renderTotals('taxes', $this->getColspan()); ?> -<tr class="totals grand incl"> +<tr class="grand totals incl"> <td style="<?php echo $this->getStyle() ?>" class="mark" colspan="<?php echo $this->getColspan(); ?>"> <strong><?php echo __('Grand Total Incl. Tax')?></strong> </td> diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml index cf069d794c268850213777051cdc27a3c92dac31..a73333e0c8e1de3d2fa7abe6e72759142d8e4539 100644 --- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml +++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml @@ -29,35 +29,27 @@ global $taxIter; $taxIter++; ?> -<?php if ($this->displayFullSummary()): ?> -<?php $isTop = 1; ?> - <?php if ($_fullInfo) foreach ($_fullInfo as $info): ?> - <?php if (isset($info['hidden']) && $info['hidden']) continue; ?> - <?php - $percent = $info['percent']; - $amount = $info['amount']; - $rates = $info['rates']; - $isFirst = 1; - ?> - <?php foreach ($rates as $rate): ?> - <tr class="totals tax details details-<?php echo $taxIter; ?> <?php echo ($this->getIsPlaneMode()) ? ' plane' : '';?>"> - <td <?php echo $this->getLabelProperties()?>> - <?php echo $this->escapeHtml($rate['title']); ?> - <?php if (!is_null($rate['percent'])): ?> - (<?php echo (float)$rate['percent']; ?>%) - <?php endif; ?> - <br /> - </td> - <?php if ($isFirst): ?> - <td <?php echo $this->getValueProperties()?> rowspan="<?php echo count($rates); ?>"> +<?php if ($_fullInfo && $this->displayFullSummary()): ?> + <?php foreach ($_fullInfo as $info): ?> + <?php + $percent = $info['percent']; + $amount = $info['tax_amount']; + $baseAmount = $info['base_tax_amount']; + $title = $info['title']; + ?> + <tr class="totals tax details details-<?php echo $taxIter; ?> <?php echo ($this->getIsPlaneMode()) ? ' plane' : '';?>"> + <td <?php echo $this->getLabelProperties()?>> + <?php echo $this->escapeHtml($title); ?> + <?php if (!is_null($percent)): ?> + (<?php echo (float)$percent; ?>%) + <?php endif; ?> + <br /> + </td> + <td <?php echo $this->getValueProperties()?> rowspan="1"> <?php echo $_order->formatPrice($amount); ?> </td> - <?php endif; ?> - </tr> - <?php $isFirst = 0; ?> - <?php $isTop = 0; ?> + </tr> <?php endforeach; ?> - <?php endforeach; ?> <?php endif;?> <?php if ($this->displayFullSummary() && $_fullInfo && !$this->getIsPlaneMode()): ?> diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index c5552cbb187717a1ca96d32e45ba7735f97e20e4..4170611094a5f49b6a935788d64183058ac38e4f 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rate_block.xml b/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rate_block.xml index 144e1741e33771205f56c7864f5f819a2d36d872..8829604ec41892ca83c27419ff90a55f815d2e4c 100644 --- a/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rate_block.xml +++ b/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rate_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.tax.rate.grid"> <block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.tax.rate.grid.export" as="grid.export"> <arguments> diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rule_edit.xml b/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rule_edit.xml index 3e9c44aba1ad1ac1a221082962613ed0c6ed28e7..0987ad228aac9320c0c56ffeb0c0302da99b9ed0 100644 --- a/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rule_edit.xml +++ b/app/code/Magento/TaxImportExport/view/adminhtml/layout/tax_rule_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="content"> <block class="Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport" name="tax-rate-importExport" template="importExport.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php index 2122de2a370ddb42c800780611e1985d16b7fb0d..d25d4afa7cb928cda161ad5c89985114f169a922 100644 --- a/app/code/Magento/Theme/Block/Html/Header.php +++ b/app/code/Magento/Theme/Block/Html/Header.php @@ -44,11 +44,6 @@ class Header extends \Magento\Framework\View\Element\Template */ protected $_customerSession; - /** - * @var \Magento\Core\Helper\File\Storage\Database - */ - protected $_fileStorageHelper; - /** * @var \Magento\Framework\App\Http\Context */ @@ -62,7 +57,6 @@ class Header extends \Magento\Framework\View\Element\Template /** * @param \Magento\Framework\View\Element\Template\Context $context * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Core\Helper\File\Storage\Database $fileStorageHelper * @param \Magento\Framework\App\Http\Context $httpContext * @param CustomerViewHelper $customerViewHelper * @param array $data @@ -70,12 +64,10 @@ class Header extends \Magento\Framework\View\Element\Template public function __construct( \Magento\Framework\View\Element\Template\Context $context, \Magento\Customer\Model\Session $customerSession, - \Magento\Core\Helper\File\Storage\Database $fileStorageHelper, \Magento\Framework\App\Http\Context $httpContext, CustomerViewHelper $customerViewHelper, array $data = array() ) { - $this->_fileStorageHelper = $fileStorageHelper; $this->_customerSession = $customerSession; parent::__construct($context, $data); $this->httpContext = $httpContext; @@ -83,47 +75,6 @@ class Header extends \Magento\Framework\View\Element\Template $this->_isScopePrivate = true; } - /** - * Check if current url is url for home page - * - * @return bool - */ - public function isHomePage() - { - $currentUrl = $this->getUrl('', array('_current' => true)); - $urlRewrite = $this->getUrl('*/*/*', array('_current' => true, '_use_rewrite' => true)); - return $currentUrl == $urlRewrite; - } - - /** - * Get logo image URL - * - * @return string - */ - public function getLogoSrc() - { - if (empty($this->_data['logo_src'])) { - $this->_data['logo_src'] = $this->_getLogoUrl(); - } - return $this->_data['logo_src']; - } - - /** - * Retrieve logo text - * - * @return string - */ - public function getLogoAlt() - { - if (empty($this->_data['logo_alt'])) { - $this->_data['logo_alt'] = $this->_scopeConfig->getValue( - 'design/header/logo_alt', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ); - } - return $this->_data['logo_alt']; - } - /** * Retrieve welcome text * @@ -149,45 +100,4 @@ class Header extends \Magento\Framework\View\Element\Template } return $this->_data['welcome']; } - - /** - * Retrieve logo image URL - * - * @return string - */ - protected function _getLogoUrl() - { - $folderName = \Magento\Backend\Model\Config\Backend\Image\Logo::UPLOAD_DIR; - $storeLogoPath = $this->_scopeConfig->getValue( - 'design/header/logo_src', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ); - $path = $folderName . '/' . $storeLogoPath; - $logoUrl = $this->_urlBuilder - ->getBaseUrl(array('_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA)) . $path; - - if (!is_null($storeLogoPath) && $this->_isFile($path)) { - $url = $logoUrl; - } elseif ($this->getLogoFile()) { - $url = $this->getViewFileUrl($this->getLogoFile()); - } else { - $url = $this->getViewFileUrl('images/logo.gif'); - } - return $url; - } - - /** - * If DB file storage is on - find there, otherwise - just file_exists - * - * @param string $filename relative path - * @return bool - */ - protected function _isFile($filename) - { - if ($this->_fileStorageHelper->checkDbUsage() && !$this->getMediaDirectory()->isFile($filename)) { - $this->_fileStorageHelper->saveFileToFilesystem($filename); - } - - return $this->getMediaDirectory()->isFile($filename); - } } diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php new file mode 100644 index 0000000000000000000000000000000000000000..e76de15725d6bb47bb0d68d17e37e90a20269973 --- /dev/null +++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php @@ -0,0 +1,139 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Theme\Block\Html\Header; + +/** + * Logo page header block + */ +class Logo extends \Magento\Framework\View\Element\Template +{ + /** + * Current template name + * + * @var string + */ + protected $_template = 'html/header/logo.phtml'; + + /** + * @var \Magento\Core\Helper\File\Storage\Database + */ + protected $_fileStorageHelper; + + /** + * @param \Magento\Framework\View\Element\Template\Context $context + * @param \Magento\Core\Helper\File\Storage\Database $fileStorageHelper + * @param array $data + */ + public function __construct( + \Magento\Framework\View\Element\Template\Context $context, + \Magento\Core\Helper\File\Storage\Database $fileStorageHelper, + array $data = array() + ) { + $this->_fileStorageHelper = $fileStorageHelper; + parent::__construct($context, $data); + } + + /** + * Check if current url is url for home page + * + * @return bool + */ + public function isHomePage() + { + $currentUrl = $this->getUrl('', array('_current' => true)); + $urlRewrite = $this->getUrl('*/*/*', array('_current' => true, '_use_rewrite' => true)); + return $currentUrl == $urlRewrite; + } + + /** + * Get logo image URL + * + * @return string + */ + public function getLogoSrc() + { + if (empty($this->_data['logo_src'])) { + $this->_data['logo_src'] = $this->_getLogoUrl(); + } + return $this->_data['logo_src']; + } + + /** + * Retrieve logo text + * + * @return string + */ + public function getLogoAlt() + { + if (empty($this->_data['logo_alt'])) { + $this->_data['logo_alt'] = $this->_scopeConfig->getValue( + 'design/header/logo_alt', + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + } + return $this->_data['logo_alt']; + } + + /** + * Retrieve logo image URL + * + * @return string + */ + protected function _getLogoUrl() + { + $folderName = \Magento\Backend\Model\Config\Backend\Image\Logo::UPLOAD_DIR; + $storeLogoPath = $this->_scopeConfig->getValue( + 'design/header/logo_src', + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + $path = $folderName . '/' . $storeLogoPath; + $logoUrl = $this->_urlBuilder + ->getBaseUrl(array('_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA)) . $path; + + if (!is_null($storeLogoPath) && $this->_isFile($path)) { + $url = $logoUrl; + } elseif ($this->getLogoFile()) { + $url = $this->getViewFileUrl($this->getLogoFile()); + } else { + $url = $this->getViewFileUrl('images/logo.gif'); + } + return $url; + } + + /** + * If DB file storage is on - find there, otherwise - just file_exists + * + * @param string $filename relative path + * @return bool + */ + protected function _isFile($filename) + { + if ($this->_fileStorageHelper->checkDbUsage() && !$this->getMediaDirectory()->isFile($filename)) { + $this->_fileStorageHelper->saveFileToFilesystem($filename); + } + + return $this->getMediaDirectory()->isFile($filename); + } +} diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 25294ec39fe0751c7f9df08e22988817afa39add..c9ad141aa84688c2f0f2cffebe15d011d86262ae 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-translation": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-translation": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml index 90a9a27060e3916da720854a6a2565042b6b50b2..8f64fc588fe78cbc399b2999ed7829f98fc69b9c 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml +++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="design_theme"> <block class="Magento\Backend\Block\Widget\Grid" name="theme.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml index 2552de7210d5cfcf7ef7e8c2bb7226f37901aba7..39efd395be0b054cd39c00d3b4b86f8bbe846368 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml +++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/> <css src="Magento_Theme::css/theme.css"/> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_grid.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_grid.xml index 8b5fb420653bb60ce2e0785886b37f48665b112d..cdd00ed98f73a6ff572365f158c3dfe006d84ec5 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_grid.xml +++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_system_design_theme_block"/> <container name="root"> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml index 9ced30268d93e9c11ef83d2d58ee155253e80743..46eabdb3f21bce5c6f282108f8e6919141145652 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml +++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="adminhtml_system_design_theme_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_contents.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_contents.xml index e9ad75a02c28996940a18f6c659a9610966d18ed..414a85358d8cd298da97e2b1b1fbe5c0e7391456 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_contents.xml +++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_contents.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files" name="wysiwyg_files.files" template="browser/content/files.phtml"/> </container> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_index.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_index.xml index 07ec1aa5999fef69d3ecce57555f82645bbc0249..951085c463ec9868834155d59c39d53fa3feb9ab 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_index.xml +++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_wysiwyg_files_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <remove name="footer"/> <referenceContainer name="left"> <block class="Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Tree" name="wysiwyg_files.tree" template="Magento_Cms::browser/tree.phtml"/> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/admin-1column.xml b/app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml similarity index 96% rename from app/code/Magento/Theme/view/adminhtml/layout/admin-1column.xml rename to app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml index 3a3f67f29c732afa6580d8e2346986704c99293b..2d222e9713c6cac58aeff6a458e5caf67e94ed80 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/admin-1column.xml +++ b/app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root"> <container name="backend.page"> <container name="after.body.start" as="after.body.start" label="Page Top" before="-"/> diff --git a/app/code/Magento/Theme/view/adminhtml/layout/admin-2columns-left.xml b/app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml similarity index 97% rename from app/code/Magento/Theme/view/adminhtml/layout/admin-2columns-left.xml rename to app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml index 1699e607438a57297725895d1cf649a2fd3fa19c..23a0bd7a2d63dc66c0ae5d6594c15a10d48740b5 100644 --- a/app/code/Magento/Theme/view/adminhtml/layout/admin-2columns-left.xml +++ b/app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root"> <container name="backend.page"> <container name="after.body.start" as="after.body.start" label="Page Top" before="-"/> diff --git a/app/code/Magento/Theme/view/base/layout/empty.xml b/app/code/Magento/Theme/view/base/page_layout/empty.xml similarity index 94% rename from app/code/Magento/Theme/view/base/layout/empty.xml rename to app/code/Magento/Theme/view/base/page_layout/empty.xml index 160be1b0bf48d696213c6eea99d2b2af5c6bb783..28eedaa4f0bd6ef5d71cf86d620ba1caf7416573 100644 --- a/app/code/Magento/Theme/view/base/layout/empty.xml +++ b/app/code/Magento/Theme/view/base/page_layout/empty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root"> <container name="after.body.start" as="after.body.start" before="-" label="Page Top"/> <container name="page.wrapper" as="page_wrapper" htmlTag="div" htmlClass="page-wrapper"> diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml index 1c36826b22d8139d5ad8f2dd39ea62423585421e..036309d1fdf674966efcdcece87b78392f569973 100644 --- a/app/code/Magento/Theme/view/frontend/layout/default.xml +++ b/app/code/Magento/Theme/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <!-- Temporary solution --> <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::js/require_js.phtml" /> <referenceContainer name="after.body.start"> @@ -51,11 +51,7 @@ <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="switch/languages.phtml"/> </container> <container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content"> - <block class="Magento\Theme\Block\Html\Header" name="logo"> - <arguments> - <argument name="show_part" xsi:type="string">logo</argument> - </arguments> - </block> + <block class="Magento\Theme\Block\Html\Header\Logo" name="logo" /> <block class="Magento\Framework\View\Element\Html\Links" name="top.links"> <arguments> <argument name="css_class" xsi:type="string">header links</argument> @@ -86,17 +82,15 @@ <container name="page.bottom" label="Before Page Footer" htmlTag="div" htmlClass="content"/> </referenceContainer> <referenceContainer name="footer-container"> - <container name="footer.wrapper" as="footer-wrapper" label="Page Footer Wrapper" htmlTag="div" htmlClass="page-footer"> - <container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="footer content"> - <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" template="switch/stores.phtml"/> - <block class="Magento\Framework\View\Element\Html\Links" name="footer_links"> - <arguments> - <argument name="css_class" xsi:type="string">footer links</argument> - </arguments> - </block> - <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="html/copyright.phtml"/> - <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" /> - </container> + <container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="footer content"> + <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" template="switch/stores.phtml"/> + <block class="Magento\Framework\View\Element\Html\Links" name="footer_links"> + <arguments> + <argument name="css_class" xsi:type="string">footer links</argument> + </arguments> + </block> + <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="html/copyright.phtml"/> + <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" /> </container> </referenceContainer> diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml index 4b58bfeed2806f4999dbf89401ae72a9543ef8e1..91b513079c52130cccd6ca095ab433d388d0721e 100644 --- a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml +++ b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <meta name="x_ua_compatible" content="IE=edge,chrome=1"/> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/> diff --git a/app/code/Magento/Theme/view/frontend/layout/page_calendar.xml b/app/code/Magento/Theme/view/frontend/layout/page_calendar.xml index 0d65420649a1954d935d73653a744ed4b853a401..71fa3b8e1119face10d7fac5da143f6dd7490793 100644 --- a/app/code/Magento/Theme/view/frontend/layout/page_calendar.xml +++ b/app/code/Magento/Theme/view/frontend/layout/page_calendar.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Framework\View\Element\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Theme::js/calendar.phtml"/> </referenceContainer> diff --git a/app/code/Magento/Theme/view/frontend/layout/1column.xml b/app/code/Magento/Theme/view/frontend/page_layout/1column.xml similarity index 93% rename from app/code/Magento/Theme/view/frontend/layout/1column.xml rename to app/code/Magento/Theme/view/frontend/page_layout/1column.xml index e68b01cbe0f23d72236c1897b72c0e3acab49a08..3014cc63dac36c90861e687b21bce3bc4b3a08f7 100644 --- a/app/code/Magento/Theme/view/frontend/layout/1column.xml +++ b/app/code/Magento/Theme/view/frontend/page_layout/1column.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="empty"/> <referenceContainer name="page.wrapper"> <container name="header.container" as="header_container" label="Page Header Container" htmlTag="header" htmlClass="page-header" before="main.content"/> diff --git a/app/code/Magento/Theme/view/frontend/layout/2columns-left.xml b/app/code/Magento/Theme/view/frontend/page_layout/2columns-left.xml similarity index 93% rename from app/code/Magento/Theme/view/frontend/layout/2columns-left.xml rename to app/code/Magento/Theme/view/frontend/page_layout/2columns-left.xml index abac2361da78c38843388fe76cfc23e15a0285ba..5cdb1fe4631f2d0b01098fdfe30eb79878cbf0ca 100644 --- a/app/code/Magento/Theme/view/frontend/layout/2columns-left.xml +++ b/app/code/Magento/Theme/view/frontend/page_layout/2columns-left.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="1column"/> <referenceContainer name="columns"> <container name="div.sidebar.main" htmlTag="div" htmlClass="sidebar sidebar-main" after="main"> diff --git a/app/code/Magento/Theme/view/frontend/layout/2columns-right.xml b/app/code/Magento/Theme/view/frontend/page_layout/2columns-right.xml similarity index 90% rename from app/code/Magento/Theme/view/frontend/layout/2columns-right.xml rename to app/code/Magento/Theme/view/frontend/page_layout/2columns-right.xml index b38327e5b7e582b8623b1afe61f13c1f8ff1e498..1a070af47cf2610b783301a85501c758a8b4d629 100644 --- a/app/code/Magento/Theme/view/frontend/layout/2columns-right.xml +++ b/app/code/Magento/Theme/view/frontend/page_layout/2columns-right.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="2columns-left"/> </layout> diff --git a/app/code/Magento/Theme/view/frontend/layout/3columns.xml b/app/code/Magento/Theme/view/frontend/page_layout/3columns.xml similarity index 90% rename from app/code/Magento/Theme/view/frontend/layout/3columns.xml rename to app/code/Magento/Theme/view/frontend/page_layout/3columns.xml index b38327e5b7e582b8623b1afe61f13c1f8ff1e498..1a070af47cf2610b783301a85501c758a8b4d629 100644 --- a/app/code/Magento/Theme/view/frontend/layout/3columns.xml +++ b/app/code/Magento/Theme/view/frontend/page_layout/3columns.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="2columns-left"/> </layout> diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml index 3131cc747d578b00ef08aa51ab1ab462d3698b09..f72c2eb2b381501775190b459fcaddb175d8dbb7 100644 --- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml +++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml @@ -26,21 +26,7 @@ */ ?> <?php switch($this->getShowPart()): - case 'logo': ?> - <?php $storeName = $this->getThemeName() ? $this->getThemeName() : $this->getLogoAlt();?> - <span data-action="toggle-nav" class="action nav-toggle"><span><?php echo __('Toggle Nav') ?></span></span> - <?php if ($this->isHomePage()):?> - <strong class="logo"> - <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /> - </strong> - <?php else:?> - <a class="logo" href="<?php echo $this->getUrl(''); ?>" title="<?php echo $storeName ?>"> - <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $storeName ?>" /> - </a> - <?php endif?> - <?php break; ?> - - <?php case 'welcome': ?> + case 'welcome': ?> <li class="greet welcome"><?php echo $this->getWelcome() ?></li> <?php break; ?> diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/hello.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml similarity index 58% rename from app/code/Magento/Customer/view/frontend/templates/account/dashboard/hello.phtml rename to app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml index 9ed5b2ffd2b7e843faab8c452178489376dca81f..4a599fd298507913126cd92f0b8e284a428f126e 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/hello.phtml +++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml @@ -21,12 +21,18 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ - -/** @var \Magento\Customer\Block\Account\Dashboard\Hello $this */ +/** + * @var \Magento\Theme\Block\Html\Header\Logo $this + */ ?> -<div class="block block-dashboard-welcome"> - <div class="block-title"><strong><?php echo __('Hello, %1!', $this->escapeHtml($this->getCustomerName())) ?></strong></div> - <div class="block-content"> - <p><?php echo __('From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.') ?></p> - </div> -</div> +<?php $storeName = $this->getThemeName() ? $this->getThemeName() : $this->getLogoAlt();?> +<span data-action="toggle-nav" class="action nav-toggle"><span><?php echo __('Toggle Nav') ?></span></span> +<?php if ($this->isHomePage()):?> + <strong class="logo"> + <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /> + </strong> +<?php else:?> + <a class="logo" href="<?php echo $this->getUrl(''); ?>" title="<?php echo $storeName ?>"> + <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $storeName ?>" /> + </a> +<?php endif?> diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml index b9a68623ebb72df2fd81344d1fea52aee14d815a..9c4aac372f32502275d795758f50283129eab092 100644 --- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml +++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml @@ -30,7 +30,7 @@ $prefix = $this->getPrefix() ? '<span class="prefix">' . $this->getPrefix() . '< $suffix = $this->getSuffix() ? '<span class="suffix">' . $this->getSuffix() . '</span>' : ''; $title = ''; if (trim($this->getPageTitle())) { - $title = $prefix . '<span class="base" data-ui-id="page-title" ' . $this->getAddBaseAttribute() . '>' . $this->getPageTitle() . '</span>' . $suffix; + $title = $prefix . '<span class="base" data-ui-id="page-title" ' . $this->getAddBaseAttribute() . '>' . $this->escapeHtml($this->getPageTitle()) . '</span>' . $suffix; } ?> <?php if ($title): ?> diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 7dd5da0f009bb1296e56cf6b1c527b4402daee55..22fb25cdd3ecdbf2cc1cfd96b53a2bd121c32c99 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-core": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-core": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index b8a564f6d859beb432f1841d7f0aa65b941b4ebb..c676b5567562e02824f22f8e40e6e6189fb1a028 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Ui/view/base/layout/default.xml b/app/code/Magento/Ui/view/base/layout/default.xml index a6ecc6b8b682cccaac86f2327137e61354a37ced..f8c0a0b4a0e711724e3b1c119685d0d82bb5a920 100644 --- a/app/code/Magento/Ui/view/base/layout/default.xml +++ b/app/code/Magento/Ui/view/base/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="footer"> <block class="Magento\Ui\Context\DataProvider" name="ui.global.config" after="-"> <arguments> diff --git a/app/code/Magento/Ui/view/base/layout/ui_components.xml b/app/code/Magento/Ui/view/base/layout/ui_components.xml index 86e63e3a94b75f9f60fd2b13e45f14610ec59ff6..dd514f11762a0e5732a3cee7f47d3cc3ae35c3b7 100644 --- a/app/code/Magento/Ui/view/base/layout/ui_components.xml +++ b/app/code/Magento/Ui/view/base/layout/ui_components.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <block class="Magento\Ui\Listing\View" name="listing"> <arguments> <argument name="content_template" xsi:type="string">Magento_Ui::listing/horizontal_grid.phtml</argument> diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 10debbf8f1d99018fb67d5a641b06c0827c86d7e..dfd436ce7b8332cc8778a08c76c07d385bd083cf 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Ups/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/Ups/view/adminhtml/layout/adminhtml_system_config_edit.xml index 86940f0f4e1ee8d0c4359631e43cfc00a69e5eac..f905127876596c119a2e4c5b381d1fe6c23f071e 100644 --- a/app/code/Magento/Ups/view/adminhtml/layout/adminhtml_system_config_edit.xml +++ b/app/code/Magento/Ups/view/adminhtml/layout/adminhtml_system_config_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="js"> <block class="Magento\Ups\Block\Backend\System\CarrierConfig" template="system/shipping/carrier_config.phtml"/> </referenceContainer> diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php index dc3c71545c33b4e402278ae7591d686783c4d82e..ea4e3cfdbb15cd972180b1ef61ff36890bfa1851 100644 --- a/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php +++ b/app/code/Magento/UrlRewrite/Block/Catalog/Edit/Form.php @@ -183,7 +183,7 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form * Get catalog entity associated stores * * @return array - * @throws \Magento\Framework\Model\Exception + * @throws \Magento\UrlRewrite\Model\EntityNotAssociatedWithWebsiteException */ protected function _getEntityStores() { @@ -201,7 +201,7 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form $entityStores = array_intersect($entityStores, $categoryStores); } if (!$entityStores) { - throw new \Magento\Framework\Model\Exception( + throw new \Magento\UrlRewrite\Model\EntityNotAssociatedWithWebsiteException( __( 'We can\'t set up a URL rewrite because the product you chose is not associated with a website.' ) @@ -211,10 +211,10 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form } elseif ($category->getId()) { $entityStores = (array)$category->getStoreIds(); $message = __( - 'We can\'t set up a URL rewrite because the category your chose is not associated with a website.' + 'We can\'t set up a URL rewrite because the category you chose is not associated with a website.' ); if (!$entityStores) { - throw new \Magento\Framework\Model\Exception($message); + throw new \Magento\UrlRewrite\Model\EntityNotAssociatedWithWebsiteException($message); } $this->_requireStoresFilter = true; } diff --git a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php index 712408dbae9f2ac3119f81ecd8f7528de18a90b0..0800ed866e56450de6de5d946871e2b300ca2c79 100644 --- a/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php +++ b/app/code/Magento/UrlRewrite/Block/Cms/Page/Edit/Form.php @@ -117,7 +117,7 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form * Get catalog entity associated stores * * @return array - * @throws \Magento\Framework\App\InitException + * @throws \Magento\UrlRewrite\Model\EntityNotAssociatedWithWebsiteException */ protected function _getEntityStores() { @@ -130,7 +130,7 @@ class Form extends \Magento\UrlRewrite\Block\Edit\Form $this->_requireStoresFilter = !in_array(0, $entityStores); if (!$entityStores) { - throw new \Magento\Framework\App\InitException( + throw new \Magento\UrlRewrite\Model\EntityNotAssociatedWithWebsiteException( __('Chosen cms page does not associated with any website.') ); } diff --git a/app/code/Magento/UrlRewrite/Block/Edit/Form.php b/app/code/Magento/UrlRewrite/Block/Edit/Form.php index 3de22757e0bf3f8ca548c4837dd3962b2d273acd..615d259c5c0e7a107a37c91fccc7762fda24071f 100644 --- a/app/code/Magento/UrlRewrite/Block/Edit/Form.php +++ b/app/code/Magento/UrlRewrite/Block/Edit/Form.php @@ -252,11 +252,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic array('name' => 'store_id', 'value' => $this->_storeManager->getStore(true)->getId()) ); } else { - /** @var $renderer \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element */ - $renderer = $this->getLayout()->createBlock( - 'Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element' - ); - $storeElement = $fieldset->addField( 'store_id', 'select', @@ -265,13 +260,23 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic 'title' => __('Store'), 'name' => 'store_id', 'required' => true, - 'values' => $this->_getRestrictedStoresList(), 'value' => $this->_formValues['store_id'] ) ); + try { + $stores = $this->_getStoresListRestrictedByEntityStores($this->_getEntityStores()); + } catch (\Magento\UrlRewrite\Model\EntityNotAssociatedWithWebsiteException $e) { + $stores = []; + $storeElement->setAfterElementHtml($e->getMessage()); + } + $storeElement->setValues($stores); if ($this->_getModel()->getIsAutogenerated()) { $storeElement->setReadonly(true); } + /** @var $renderer \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element */ + $renderer = $this->getLayout()->createBlock( + 'Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element' + ); $storeElement->setRenderer($renderer); } } @@ -341,30 +346,16 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic } /** - * Get restricted stores list + * Get stores list restricted by entity stores. * Stores should be filtered only if custom entity is specified. * If we use custom rewrite, all stores are accepted. * - * @return array - */ - protected function _getRestrictedStoresList() - { - $stores = $this->_getAllStores(); - $entityStores = $this->_getEntityStores(); - $stores = $this->_getStoresListRestrictedByEntityStores($stores, $entityStores); - - return $stores; - } - - /** - * Get stores list restricted by entity stores - * - * @param array $stores * @param array $entityStores * @return array */ - private function _getStoresListRestrictedByEntityStores(array $stores, array $entityStores) + private function _getStoresListRestrictedByEntityStores(array $entityStores) { + $stores = $this->_getAllStores(); if ($this->_requireStoresFilter) { foreach ($stores as $i => $store) { if (isset($store['value']) && $store['value']) { diff --git a/app/code/Magento/UrlRewrite/Model/EntityNotAssociatedWithWebsiteException.php b/app/code/Magento/UrlRewrite/Model/EntityNotAssociatedWithWebsiteException.php new file mode 100644 index 0000000000000000000000000000000000000000..a585bd08ec4246fc498156be557fa5f671fffada --- /dev/null +++ b/app/code/Magento/UrlRewrite/Model/EntityNotAssociatedWithWebsiteException.php @@ -0,0 +1,28 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\UrlRewrite\Model; + +class EntityNotAssociatedWithWebsiteException extends \Exception +{ +} diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 5fde5c1e6eccaba2c9dde2ffd97700c60390c13f..797c4f63115e236f0a3132318144a7834726f098 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog-url-rewrite": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-cms-url-rewrite": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog-url-rewrite": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-cms-url-rewrite": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml index 430ee813e38e6da58702f3147e80dd19e762e2a2..d0f2e2a7aaec09f9ce8effe4ef57e5385e692e7d 100644 --- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml +++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\UrlRewrite\Block\GridContainer" name="adminhtml.block.url_rewrite.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.url_rewrite.grid" as="grid"> diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index f0a8e811680f445ec3ef948d024d94d0aeff35b4..78b7114959f8518a0acd51f78972981455cd9c89 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-authorization": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-integration": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-authorization": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-integration": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml index 2ab8e7525cace212cdd2b97a805a876028b2bfc3..7bf1c85381bac7fb834471b2dc10ab98c91bd3bf 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Backend\Block\Template" name="content" template="Magento_User::admin/forgotpassword.phtml"> <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_login.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_login.xml index 1f26bd9b7bd67f5824a62a70056a7f91ceea9554..dae8d36b33bbc5f5b3399b2f6beea2bdca9e1f61 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_login.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="form.buttons"> <block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_forgotpassword" template="Magento_User::admin/forgotpassword_url.phtml"/> </referenceContainer> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml index cebde3d72b61449ea7f4d4dbb05efad841907ee1..14f82713a04b107402086a6ac483bec2a381c850 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\Backend\Block\Template" name="content" template="Magento_User::admin/resetforgottenpassword.phtml"> <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_edit.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_edit.xml index 198620633b6448bc42828ec68ac059e5748aaffb..0e1a4cf3dc1301a034fd3079d7b025718b05ef3f 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_edit.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="left"> <block class="Magento\User\Block\User\Edit\Tabs" name="adminhtml.user.edit.tabs"/> </referenceContainer> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml index 22fdd889c7fc7a986894fd79ceded2fcf66942e6..c74257d7024fdbfdf5335d81d696e5ec505868b3 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.user.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.user.grid" as="grid"> <arguments> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_index.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_index.xml index 70772199347a5636a546c080b55acf22b2838636..e60f6cbf20dc961a2f5e6593959d05605b4eb585 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_index.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_user_grid_block"/> <referenceContainer name="content"> <block class="Magento\User\Block\User" name="adminhtml.user.grid.container"/> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml index 68a5d3a0be281d5b4b3d533a30ce76fb49d4244f..a81d29d2925e37623ddd358373dd97fa0897800d 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrole.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="left"> <block class="Magento\User\Block\Role\Edit" name="adminhtml.user.editroles"> <block class="Magento\User\Block\Role\Tab\Edit" name="adminhtml.user.tab.rolesedit"/> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrolegrid.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrolegrid.xml index 0bdfa4d00256f6f0f78f29a734e13b7e735b39dd..6dfff02bc548f225969c7fb1be125f00c13a2e72 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrolegrid.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_editrolegrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\User\Block\Role\Grid\User" name="adminhtml.user.role.grid.user"/> </container> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml index 01bd6679b4add6bcd6df018fb8d8d2431df85262..19c272a3dfaa4d7b8747608896027c22a6179819 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.user.role.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.role.grid" as="grid"> <arguments> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_index.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_index.xml index 4770bb50e334f49de172c9ab0f23b13b790012a6..48dd3f8d58975ac7293697c53337d61f5562fafe 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_index.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="formkey"/> <update handle="adminhtml_user_role_grid_block"/> <referenceContainer name="content"> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_rolegrid.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_rolegrid.xml index 553f8a1bc869dd5761c3aec36cf59342c8075c03..6f66bccbf367a48745cf1460efe1bc3f8976e940 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_rolegrid.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_role_rolegrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_user_role_grid_block"/> <container name="root"> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolegrid.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolegrid.xml index 7bedfc9365ad17b131664d6766d3ff2026481374..cb1698d35e6bf26c782c55e155d773d7048bb4f7 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolegrid.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolegrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <update handle="formkey"/> <update handle="adminhtml_user_grid_block"/> <container name="root"> diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolesgrid.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolesgrid.xml index 3ce4700f3e112d10a2c1d7a594b95b2dad9bf5f7..045d5801a711db4c3ecc03d7bd0e6a9c13582aaf 100644 --- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolesgrid.xml +++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_rolesgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root" label="Root"> <block class="Magento\User\Block\User\Edit\Tab\Roles" name="adminhtml.user.rolesgrid"/> </container> diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index a5470c3bd376ce209f18194924efbd470fc02740..2adcc8616d290be37e60f56e5645afef6008da74 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-shipping": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-shipping": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index b18f8e6f495bd83c3a569a6d89eb11f0470276d7..52932187db1c5090a88c8b945e3d304cb9b60032 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-authorization": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-integration": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-integration": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_activate_permissions_webapi.xml b/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_activate_permissions_webapi.xml index 79e82d20f7e6ee11d097811a3b03f6f5e70e12a5..f8c462b1ae74a074fee32cfedf1e8c80609f1ffe 100644 --- a/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_activate_permissions_webapi.xml +++ b/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_activate_permissions_webapi.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="integration.activate.permissions.tabs"> <block class="Magento\Webapi\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi" name="integration_activate_permissions_tabs_webapi" template="integration/activate/permissions/tab/webapi.phtml"/> <action method="addTab"> diff --git a/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml b/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml index 6ee27aed2d21de103ec9905ddc1ddc637c6b449a..2d875c271c7e263c521aabadbf5d181bdbc3aa7e 100644 --- a/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml +++ b/app/code/Magento/Webapi/view/adminhtml/layout/adminhtml_integration_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="editor"/> <referenceBlock name="integration_edit_tabs"> <block class="Magento\Webapi\Block\Adminhtml\Integration\Edit\Tab\Webapi" name="integration_edit_tab_webapi" template="Magento_Webapi::resourcetree.phtml"/> diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php index dc5afada3fecfae71d7f743e5a5f7a7fc471e318..fd61ec10a11d627a06326e45f0106591b092d45c 100644 --- a/app/code/Magento/Weee/Helper/Data.php +++ b/app/code/Magento/Weee/Helper/Data.php @@ -31,6 +31,27 @@ use Magento\Store\Model\Website; */ class Data extends \Magento\Framework\App\Helper\AbstractHelper { + /**#@+ + * Constants defined for keys of array, makes typos less likely + */ + const KEY_WEEE_AMOUNT_INVOICED = 'weee_amount_invoiced'; + + const KEY_BASE_WEEE_AMOUNT_INVOICED = 'base_weee_amount_invoiced'; + + const KEY_WEEE_TAX_AMOUNT_INVOICED = 'weee_tax_amount_invoiced'; + + const KEY_BASE_WEEE_TAX_AMOUNT_INVOICED = 'base_weee_tax_amount_invoiced'; + + const KEY_WEEE_AMOUNT_REFUNDED = 'weee_amount_refunded'; + + const KEY_BASE_WEEE_AMOUNT_REFUNDED = 'base_weee_amount_refunded'; + + const KEY_WEEE_TAX_AMOUNT_REFUNDED = 'weee_tax_amount_refunded'; + + const KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED = 'base_weee_tax_amount_refunded'; + + /**#@-*/ + /** * @var array */ @@ -534,6 +555,134 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper return $totalTaxForWeeeTax; } + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getWeeeAmountInvoiced($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $totalAmountInvoiced = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_WEEE_AMOUNT_INVOICED])) { + $totalAmountInvoiced += $weeeTaxAppliedAmount[self::KEY_WEEE_AMOUNT_INVOICED]; + } + } + return $totalAmountInvoiced; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getBaseWeeeAmountInvoiced($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $baseTotalAmountInvoiced = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_BASE_WEEE_AMOUNT_INVOICED])) { + $baseTotalAmountInvoiced += $weeeTaxAppliedAmount[self::KEY_BASE_WEEE_AMOUNT_INVOICED]; + } + } + return $baseTotalAmountInvoiced; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getWeeeTaxAmountInvoiced($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $totalTaxInvoiced = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_WEEE_TAX_AMOUNT_INVOICED])) { + $totalTaxInvoiced += $weeeTaxAppliedAmount[self::KEY_WEEE_TAX_AMOUNT_INVOICED]; + } + } + return $totalTaxInvoiced; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getBaseWeeeTaxAmountInvoiced($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $baseTotalTaxInvoiced = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED])) { + $baseTotalTaxInvoiced += $weeeTaxAppliedAmount[self::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED]; + } + } + return $baseTotalTaxInvoiced; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getWeeeAmountRefunded($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $totalAmountRefunded = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_WEEE_AMOUNT_REFUNDED])) { + $totalAmountRefunded += $weeeTaxAppliedAmount[self::KEY_WEEE_AMOUNT_REFUNDED]; + } + } + return $totalAmountRefunded; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getBaseWeeeAmountRefunded($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $baseTotalAmountRefunded = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_BASE_WEEE_AMOUNT_REFUNDED])) { + $baseTotalAmountRefunded += $weeeTaxAppliedAmount[self::KEY_BASE_WEEE_AMOUNT_REFUNDED]; + } + } + return $baseTotalAmountRefunded; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getWeeeTaxAmountRefunded($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $totalTaxRefunded = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_WEEE_TAX_AMOUNT_REFUNDED])) { + $totalTaxRefunded += $weeeTaxAppliedAmount[self::KEY_WEEE_TAX_AMOUNT_REFUNDED]; + } + } + return $totalTaxRefunded; + } + + /** + * @param \Magento\Sales\Model\Order\Item $orderItem + * @return float + */ + public function getBaseWeeeTaxAmountRefunded($orderItem) + { + $weeeTaxAppliedAmounts = $this->getApplied($orderItem); + $baseTotalTaxRefunded = 0; + foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { + if (isset($weeeTaxAppliedAmount[self::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED])) { + $baseTotalTaxRefunded += $weeeTaxAppliedAmount[self::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED]; + } + } + return $baseTotalTaxRefunded; + } + /** * Returns the total amount of FPT across all items. Used for displaying the FPT totals line item. * diff --git a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php index 6996d6984758edcd66f2a800f0bfac81d2a38fbe..3f77edaa0a661c4e03d901945f315d8cff3d3f62 100644 --- a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php @@ -25,6 +25,7 @@ namespace Magento\Weee\Model\Total\Creditmemo; use Magento\Sales\Model\Order\Creditmemo; +use Magento\Weee\Helper\Data as WeeeHelper; class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal { @@ -60,57 +61,154 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal { $store = $creditmemo->getStore(); - $totalTax = 0; - $baseTotalTax = 0; + $totalWeeeAmount = 0; + $baseTotalWeeeAmount = 0; + + $totalWeeeAmountInclTax = 0; + $baseTotalWeeeAmountInclTax = 0; + + $totalTaxAmount = $totalWeeeAmountInclTax - $totalWeeeAmount; + $baseTotalTaxAmount = $baseTotalWeeeAmountInclTax - $baseTotalWeeeAmount; - $weeeTaxAmount = 0; - $baseWeeeTaxAmount = 0; - foreach ($creditmemo->getAllItems() as $item) { - if ($item->getOrderItem()->isDummy()) { + $orderItem = $item->getOrderItem(); + if ($orderItem->isDummy() || $item->getQty() <= 0) { continue; } - $weeeAmountExclTax = ($this->_weeeData->getWeeeTaxInclTax($item) - - $this->_weeeData->getTotalTaxAppliedForWeeeTax($item)) * $item->getQty(); - $totalTax += $weeeAmountExclTax; + $ratio = $item->getQty() / $orderItem->getQtyOrdered(); + + $orderItemWeeeAmountExclTax = $orderItem->getWeeeTaxAppliedRowAmount(); + $orderItemBaseWeeeAmountExclTax = $orderItem->getBaseWeeeTaxAppliedRowAmnt(); + $weeeAmountExclTax = $creditmemo->roundPrice($orderItemWeeeAmountExclTax * $ratio); + $baseWeeeAmountExclTax = $creditmemo->roundPrice( + $orderItemBaseWeeeAmountExclTax * $ratio, + 'base' + ); + + $orderItemWeeeAmountInclTax = $this->_weeeData->getRowWeeeTaxInclTax($orderItem); + $orderItemBaseWeeeAmountInclTax = $this->_weeeData->getBaseRowWeeeTaxInclTax($orderItem); + $weeeAmountInclTax = $creditmemo->roundPrice($orderItemWeeeAmountInclTax * $ratio); + $baseWeeeAmountInclTax = $creditmemo->roundPrice( + $orderItemBaseWeeeAmountInclTax * $ratio, + 'base' + ); + + $orderItemTaxAmount = $orderItemWeeeAmountInclTax - $orderItemWeeeAmountExclTax; + $orderItemBaseTaxAmount = $orderItemBaseWeeeAmountInclTax - $baseWeeeAmountInclTax; + $itemTaxAmount = $weeeAmountInclTax - $weeeAmountExclTax; + $itemBaseTaxAmount = $baseWeeeAmountInclTax - $baseWeeeAmountExclTax; + + $weeeAmountAvailable = $this->_weeeData->getWeeeAmountInvoiced($orderItem) - + $this->_weeeData->getWeeeAmountRefunded($orderItem); + $baseWeeeAmountAvailable = $this->_weeeData->getBaseWeeeAmountInvoiced($orderItem) - + $this->_weeeData->getBaseWeeeAmountRefunded($orderItem); + $weeeTaxAmountAvailable = $this->_weeeData->getWeeeTaxAmountInvoiced($orderItem) - + $this->_weeeData->getWeeeTaxAmountRefunded($orderItem); + $baseWeeeTaxAmountAvailable = $this->_weeeData->getBaseWeeeTaxAmountInvoiced($orderItem) - + $this->_weeeData->getBaseWeeeTaxAmountRefunded($orderItem); + + if ($item->isLast()) { + $weeeAmountExclTax = $weeeAmountAvailable; + $baseWeeeAmountExclTax = $baseWeeeAmountAvailable; + $itemTaxAmount = $weeeTaxAmountAvailable; + $itemBaseTaxAmount = $baseWeeeTaxAmountAvailable; + } else { + $weeeAmountExclTax = min($weeeAmountExclTax, $weeeAmountAvailable); + $baseWeeeAmountExclTax = min($baseWeeeAmountExclTax, $baseWeeeAmountAvailable); + $itemTaxAmount = min($itemTaxAmount, $weeeTaxAmountAvailable); + $itemBaseTaxAmount = min($itemBaseTaxAmount, $baseWeeeTaxAmountAvailable); + } - $baseWeeeAmountExclTax = ($this->_weeeData->getBaseWeeeTaxInclTax($item) - - $this->_weeeData->getBaseTotalTaxAppliedForWeeeTax($item)) * $item->getQty(); - $baseTotalTax += $baseWeeeAmountExclTax; + $totalWeeeAmount += $weeeAmountExclTax; + $baseTotalWeeeAmount += $baseWeeeAmountExclTax; $item->setWeeeTaxAppliedRowAmount($weeeAmountExclTax); $item->setBaseWeeeTaxAppliedRowAmount($baseWeeeAmountExclTax); - - $weeeTaxAmount += $this->_weeeData->getWeeeTaxInclTax($item)* $item->getQty(); - $baseWeeeTaxAmount += $this->_weeeData->getBaseWeeeTaxInclTax($item)* $item->getQty(); + + $totalTaxAmount += $itemTaxAmount; + $baseTotalTaxAmount += $itemBaseTaxAmount; + + //Set the ratio of the tax amount in invoice item compared to tax amount in order item + //This information is needed to calculate tax per tax rate later + if ($orderItemTaxAmount != 0) { + if (!$item->getTaxRatio()) { + $item->setTaxRatio([]); + } + $taxRatio = $item->getTaxRatio(); + $taxRatio[\Magento\Weee\Model\Total\Quote\Weee::ITEM_TYPE] = $itemTaxAmount / $orderItemTaxAmount; + $item->setTaxRatio($taxRatio); + } + + $totalWeeeAmountInclTax += $weeeAmountInclTax; + $baseTotalWeeeAmountInclTax += $baseWeeeAmountInclTax; $newApplied = array(); $applied = $this->_weeeData->getApplied($item); foreach ($applied as $one) { - $one['base_row_amount'] = $one['base_amount'] * $item->getQty(); - $one['row_amount'] = $one['amount'] * $item->getQty(); - $one['base_row_amount_incl_tax'] = $one['base_amount_incl_tax'] * $item->getQty(); - $one['row_amount_incl_tax'] = $one['amount_incl_tax'] * $item->getQty(); + $one['base_row_amount'] = $baseWeeeAmountExclTax; + $one['row_amount'] = $weeeAmountExclTax; + $one['base_row_amount_incl_tax'] = $baseWeeeAmountInclTax; + $one['row_amount_incl_tax'] = $weeeAmountInclTax; $newApplied[] = $one; } $this->_weeeData->setApplied($item, $newApplied); + // Update order item + $newApplied = array(); + $applied = $this->_weeeData->getApplied($orderItem); + foreach ($applied as $one) { + if (isset($one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_REFUNDED])) { + $one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_REFUNDED] = + $one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_REFUNDED] + $baseWeeeAmountExclTax; + } else { + $one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_REFUNDED] = $baseWeeeAmountExclTax; + } + if (isset($one[WeeeHelper::KEY_WEEE_AMOUNT_REFUNDED])) { + $one[WeeeHelper::KEY_WEEE_AMOUNT_REFUNDED] = + $one[WeeeHelper::KEY_WEEE_AMOUNT_REFUNDED] + $weeeAmountExclTax; + } else { + $one[WeeeHelper::KEY_WEEE_AMOUNT_REFUNDED] = $weeeAmountExclTax; + } + if (isset($one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED])) { + $one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED] = + $one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED] + $itemBaseTaxAmount; + } else { + $one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED] = $itemBaseTaxAmount; + } + if (isset($one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_REFUNDED])) { + $one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_REFUNDED] = + $one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_REFUNDED] + $itemTaxAmount; + } else { + $one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_REFUNDED] = $itemTaxAmount; + } + + $newApplied[] = $one; + } + $this->_weeeData->setApplied($orderItem, $newApplied); + $item->setWeeeTaxRowDisposition($item->getWeeeTaxDisposition() * $item->getQty()); $item->setBaseWeeeTaxRowDisposition($item->getBaseWeeeTaxDisposition() * $item->getQty()); } if ($this->_weeeData->includeInSubtotal($store)) { - $creditmemo->setSubtotal($creditmemo->getSubtotal() + $totalTax); - $creditmemo->setBaseSubtotal($creditmemo->getBaseSubtotal() + $baseTotalTax); + $creditmemo->setSubtotal($creditmemo->getSubtotal() + $totalWeeeAmount); + $creditmemo->setBaseSubtotal($creditmemo->getBaseSubtotal() + $baseTotalWeeeAmount); } - $creditmemo->setSubtotalInclTax($creditmemo->getSubtotalInclTax() + $weeeTaxAmount); - $creditmemo->setBaseSubtotalInclTax($creditmemo->getBaseSubtotalInclTax() + $baseWeeeTaxAmount); + $creditmemo->setTaxAmount($creditmemo->getTaxAmount() + $totalTaxAmount); + $creditmemo->setBaseTaxAmount($creditmemo->getBaseTaxAmount() + $baseTotalTaxAmount); + + $creditmemo->setSubtotalInclTax( + $creditmemo->getSubtotalInclTax() + $totalWeeeAmountInclTax + ); + $creditmemo->setBaseSubtotalInclTax( + $creditmemo->getBaseSubtotalInclTax() + $baseTotalWeeeAmountInclTax + ); - $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $totalTax); - $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $baseTotalTax); + $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $totalWeeeAmount + $totalTaxAmount); + $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $baseTotalWeeeAmount + $baseTotalTaxAmount); return $this; } diff --git a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php index 78c963fd91a2861cca26fe4625c2be7b21245193..114b10d61f8f172f8390706580b97de83e33b2b7 100644 --- a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php @@ -23,6 +23,8 @@ */ namespace Magento\Weee\Model\Total\Invoice; +use Magento\Weee\Helper\Data as WeeeHelper; + class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal { /** @@ -56,50 +58,126 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal public function collect(\Magento\Sales\Model\Order\Invoice $invoice) { $store = $invoice->getStore(); + $order = $invoice->getOrder(); - $totalTax = 0; - $baseTotalTax = 0; - $weeeInclTax = 0; - $baseWeeeInclTax = 0; + $totalWeeeAmount = 0; + $baseTotalWeeeAmount = 0; + $totalWeeeAmountInclTax = 0; + $baseTotalWeeeAmountInclTax = 0; + $totalWeeeTaxAmount = 0; + $baseTotalWeeeTaxAmount = 0; + /** @var \Magento\Sales\Model\Order\Invoice\Item $item */ foreach ($invoice->getAllItems() as $item) { $orderItem = $item->getOrderItem(); $orderItemQty = $orderItem->getQtyOrdered(); - if (!$orderItemQty || $orderItem->isDummy()) { + if (!$orderItemQty || $orderItem->isDummy() || $item->getQty() <= 0) { continue; } - $weeeTaxAmount = $item->getWeeeTaxAppliedAmount() * $item->getQty(); - $baseWeeeTaxAmount = $item->getBaseWeeeTaxAppliedAmount() * $item->getQty(); + $ratio = $item->getQty() / $orderItemQty; + $orderItemWeeeAmount = $orderItem->getWeeeTaxAppliedRowAmount(); + $orderItemBaseWeeeAmount = $orderItem->getBaseWeeeTaxAppliedRowAmnt(); + $weeeAmount = $invoice->roundPrice($orderItemWeeeAmount * $ratio); + $baseWeeeAmount = $invoice->roundPrice($orderItemBaseWeeeAmount * $ratio, 'base'); + + $orderItemWeeeInclTax = $this->_weeeData->getRowWeeeTaxInclTax($orderItem); + $orderItemBaseWeeeInclTax = $this->_weeeData->getBaseRowWeeeTaxInclTax($orderItem); + $weeeAmountInclTax = $invoice->roundPrice($orderItemWeeeInclTax * $ratio); + $baseWeeeAmountInclTax = $invoice->roundPrice($orderItemBaseWeeeInclTax * $ratio, 'base'); + + $orderItemWeeeTax = $orderItemWeeeInclTax - $orderItemWeeeAmount; + $itemWeeeTax = $weeeAmountInclTax - $weeeAmount; + $itemBaseWeeeTax = $baseWeeeAmountInclTax - $baseWeeeAmount; + + if ($item->isLast()) { + $weeeAmount = $orderItemWeeeAmount - $this->_weeeData->getWeeeAmountInvoiced($orderItem); + $baseWeeeAmount = + $orderItemBaseWeeeAmount - $this->_weeeData->getBaseWeeeAmountInvoiced($orderItem); + $itemWeeeTax = $orderItemWeeeTax - $this->_weeeData->getWeeeTaxAmountInvoiced($orderItem); + $itemBaseWeeeTax = + $orderItemWeeeTax - $this->_weeeData->getBaseWeeeTaxAmountInvoiced($orderItem); + } - $weeeTaxAmountInclTax = $this->_weeeData->getWeeeTaxInclTax($item) * $item->getQty(); - $baseWeeeTaxAmountInclTax = $this->_weeeData->getBaseWeeeTaxInclTax($item) * $item->getQty(); - - $item->setWeeeTaxAppliedRowAmount($weeeTaxAmount); - $item->setBaseWeeeTaxAppliedRowAmount($baseWeeeTaxAmount); + $totalWeeeTaxAmount += $itemWeeeTax; + $baseTotalWeeeTaxAmount += $itemBaseWeeeTax; + + //Set the ratio of the tax amount in invoice item compared to tax amount in order item + //This information is needed to calculate tax per tax rate later + if ($orderItemWeeeTax != 0) { + if (!$item->getTaxRatio()) { + $item->setTaxRatio([]); + } + $taxRatio = $item->getTaxRatio(); + $taxRatio[\Magento\Weee\Model\Total\Quote\Weee::ITEM_TYPE] = $itemWeeeTax / $orderItemWeeeTax; + $item->setTaxRatio($taxRatio); + } + + $item->setWeeeTaxAppliedRowAmount($weeeAmount); + $item->setBaseWeeeTaxAppliedRowAmount($baseWeeeAmount); $newApplied = array(); $applied = $this->_weeeData->getApplied($item); foreach ($applied as $one) { - $one['base_row_amount'] = $one['base_amount'] * $item->getQty(); - $one['row_amount'] = $one['amount'] * $item->getQty(); - $one['base_row_amount_incl_tax'] = $one['base_amount_incl_tax'] * $item->getQty(); - $one['row_amount_incl_tax'] = $one['amount_incl_tax'] * $item->getQty(); + $one['base_row_amount'] = $baseWeeeAmount; + $one['row_amount'] = $weeeAmount; + $one['base_row_amount_incl_tax'] = $baseWeeeAmountInclTax; + $one['row_amount_incl_tax'] = $weeeAmountInclTax; $newApplied[] = $one; } $this->_weeeData->setApplied($item, $newApplied); + //Update order item + $newApplied = array(); + $applied = $this->_weeeData->getApplied($orderItem); + foreach ($applied as $one) { + if (isset($one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_INVOICED])) { + $one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_INVOICED] = + $one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_INVOICED] + $baseWeeeAmount; + } else { + $one[WeeeHelper::KEY_BASE_WEEE_AMOUNT_INVOICED] = $baseWeeeAmount; + } + if (isset($one[WeeeHelper::KEY_WEEE_AMOUNT_INVOICED])) { + $one[WeeeHelper::KEY_WEEE_AMOUNT_INVOICED] = + $one[WeeeHelper::KEY_WEEE_AMOUNT_INVOICED] + $weeeAmount; + } else { + $one[WeeeHelper::KEY_WEEE_AMOUNT_INVOICED] = $weeeAmount; + } + if (isset($one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED])) { + $one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED] = + $one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED] + $itemWeeeTax; + } else { + $one[WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED] = $itemWeeeTax; + } + if (isset($one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_INVOICED])) { + $one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_INVOICED] = + $one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_INVOICED] + $itemBaseWeeeTax; + } else { + $one[WeeeHelper::KEY_WEEE_TAX_AMOUNT_INVOICED] = $itemBaseWeeeTax; + } + $newApplied[] = $one; + } + $this->_weeeData->setApplied($orderItem, $newApplied); + $item->setWeeeTaxRowDisposition($item->getWeeeTaxDisposition() * $item->getQty()); $item->setBaseWeeeTaxRowDisposition($item->getBaseWeeeTaxDisposition() * $item->getQty()); - $totalTax += $weeeTaxAmount; - $baseTotalTax += $baseWeeeTaxAmount; + $totalWeeeAmount += $weeeAmount; + $baseTotalWeeeAmount += $baseWeeeAmount; - $weeeInclTax += $weeeTaxAmountInclTax; - $baseWeeeInclTax += $baseWeeeTaxAmountInclTax; + $totalWeeeAmountInclTax += $weeeAmountInclTax; + $baseTotalWeeeAmountInclTax += $baseWeeeAmountInclTax; } + $allowedTax = $order->getTaxAmount() - $order->getTaxInvoiced() - $invoice->getTaxAmount(); + $allowedBaseTax = $order->getBaseTaxAmount() - $order->getBaseTaxInvoiced() - $invoice->getBaseTaxAmount(); + $totalWeeeTaxAmount = min($totalWeeeTaxAmount, $allowedTax); + $baseTotalWeeeTaxAmount = min($baseTotalWeeeTaxAmount, $allowedBaseTax); + + $invoice->setTaxAmount($invoice->getTaxAmount() + $totalWeeeTaxAmount); + $invoice->setBaseTaxAmount($invoice->getBaseTaxAmount() + $baseTotalWeeeTaxAmount); + // Add FPT to subtotal and grand total if ($this->_weeeData->includeInSubtotal($store)) { $order = $invoice->getOrder(); @@ -107,29 +185,25 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal $allowedBaseSubtotal = $order->getBaseSubtotal() - $order->getBaseSubtotalInvoiced() - $invoice->getBaseSubtotal(); - $totalTax = min($allowedSubtotal, $totalTax); - $baseTotalTax = min($allowedBaseSubtotal, $baseTotalTax); + $totalWeeeAmount = min($allowedSubtotal, $totalWeeeAmount); + $baseTotalWeeeAmount = min($allowedBaseSubtotal, $baseTotalWeeeAmount); - $invoice->setSubtotal($invoice->getSubtotal() + $totalTax); - $invoice->setBaseSubtotal($invoice->getBaseSubtotal() + $baseTotalTax); + $invoice->setSubtotal($invoice->getSubtotal() + $totalWeeeAmount); + $invoice->setBaseSubtotal($invoice->getBaseSubtotal() + $baseTotalWeeeAmount); } - $useWeeeInclTax = true; - if ($this->_weeeData->isTaxIncluded($store) && $invoice->isLast()) { - $useWeeeInclTax = false; - } - if ($useWeeeInclTax) { + if (!$invoice->isLast()) { // need to add the Weee amounts including all their taxes - $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $weeeInclTax); - $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseWeeeInclTax); + $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $totalWeeeAmountInclTax); + $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseTotalWeeeAmountInclTax); } else { // since the Subtotal Incl Tax line will already have the taxes on Weee, just add the non-taxable amounts - $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $totalTax); - $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseTotalTax); + $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $totalWeeeAmount); + $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseTotalWeeeAmount); } - $invoice->setGrandTotal($invoice->getGrandTotal() + $totalTax); - $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseTotalTax); + $invoice->setGrandTotal($invoice->getGrandTotal() + $totalWeeeAmount + $totalWeeeTaxAmount); + $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseTotalWeeeAmount + $baseTotalWeeeTaxAmount); return $this; } diff --git a/app/code/Magento/Weee/README.md b/app/code/Magento/Weee/README.md new file mode 100644 index 0000000000000000000000000000000000000000..baa8bbf95bae15f344035acf02b7a3be704b2eb1 --- /dev/null +++ b/app/code/Magento/Weee/README.md @@ -0,0 +1 @@ +The WEEE module enables the application of fees / fixed product taxes (FPT) on certain types of products, usually related to electronic devices and recycling. diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index aabbb4d654f3a15cfe04867bafed6759677c72b1..d4a7d32ab6c3a9fe797f2262437d1536bb6b50c4 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-bundle": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-bundle": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_creditmemo_item_price.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_creditmemo_item_price.xml index 60e34e325d034becef5672a84031c794e702237d..be5df570d77a87d91dd789ac9aece194461e4e3d 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_creditmemo_item_price.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_creditmemo_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_items"> <block class="Magento\Weee\Block\Adminhtml\Items\Price\Renderer" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Weee\Block\Adminhtml\Items\Price\Renderer" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_invoice_item_price.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_invoice_item_price.xml index 12aaf4b4e51ed0e6c26808e9ba92fe490c0ad314..c50b2936c426d8403dc400d91e6251de096035ee 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_invoice_item_price.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_invoice_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_items"> <block class="Magento\Weee\Block\Adminhtml\Items\Price\Renderer" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Weee\Block\Adminhtml\Items\Price\Renderer" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_create_item_price.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_create_item_price.xml index b5fd4edb48f5a283cc4a092ca8d86378fe6a9645..aed850690ac4434aafe2369f15521e83515e6bd6 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_create_item_price.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_create_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Weee\Block\Item\Price\Renderer" name="item_unit_price" template="order/create/items/price/unit.phtml"> <arguments> <argument name="zone" xsi:type="string">cart</argument> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_new.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_view.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_new.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_updateqty.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_view.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_item_price.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_item_price.xml index d2f4cbbfc3ebfef677212536c4df2e3e7ea101b5..0b2188e8d18f7cdcad2908d30647dacdf23a13ab 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_item_price.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_items"> <block class="Magento\Weee\Block\Adminhtml\Items\Price\Renderer" name="column_price" template="items/price/unit.phtml" group="column"/> <block class="Magento\Weee\Block\Adminhtml\Items\Price\Renderer" name="column_subtotal" template="items/price/row.phtml" group="column"/> diff --git a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_view.xml index be8fab59b6db4ffb30b788618a464ebaa6d8fd4b..d49416bc9a00395916147dc7e7086f1fff641833 100644 --- a/app/code/Magento/Weee/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/Weee/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Weee/view/base/layout/catalog_product_prices.xml index d7806df1d40b0cbfbb6da5c40885326f1d875705..f84aa036b7f5160fdf152707d0a7d9bf4b985e9e 100644 --- a/app/code/Magento/Weee/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Weee/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="render.product.prices"> <arguments> <argument name="default" xsi:type="array"> diff --git a/app/code/Magento/Weee/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml b/app/code/Magento/Weee/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml index 18b588de5840b2971804d656ffd2b8062e04f0e2..6682489a824cf5938101f1094e6fb4a6a7ee3e11 100644 --- a/app/code/Magento/Weee/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml +++ b/app/code/Magento/Weee/view/frontend/layout/checkout_cart_sidebar_item_price_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="minicart"> <block class="Magento\Weee\Block\Item\Price\Renderer" name="checkout.cart.item.price.sidebar" template="checkout/cart/item/price/sidebar.phtml"> <arguments> diff --git a/app/code/Magento/Weee/view/frontend/layout/checkout_item_price_renderers.xml b/app/code/Magento/Weee/view/frontend/layout/checkout_item_price_renderers.xml index 015f0599240a8258431b6cbb1c9ccca21d9172f4..89a1657915220d731ab431ef0f8a0eeb49e5e4b8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/checkout_item_price_renderers.xml +++ b/app/code/Magento/Weee/view/frontend/layout/checkout_item_price_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Weee\Block\Item\Price\Renderer" name="checkout.onepage.review.item.price.unit.excl" template="checkout/onepage/review/item/price/unit_excl_tax.phtml"> <arguments> <argument name="zone" xsi:type="string">cart</argument> diff --git a/app/code/Magento/Weee/view/frontend/layout/default.xml b/app/code/Magento/Weee/view/frontend/layout/default.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Weee/view/frontend/layout/default.xml +++ b/app/code/Magento/Weee/view/frontend/layout/default.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_email_item_price.xml b/app/code/Magento/Weee/view/frontend/layout/sales_email_item_price.xml index 8e66e4a7566eef1afa7f28a78b0d5e787a204cf3..2e545b4e555d171f4cc49df306d666d40f34e8cf 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_email_item_price.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_email_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="items"> <block class="Magento\Weee\Block\Item\Price\Renderer" name="item_price" template="email/items/price/row.phtml"> <arguments> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Weee/view/frontend/layout/sales_email_order_creditmemo_items.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_email_order_creditmemo_items.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_email_order_creditmemo_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Weee/view/frontend/layout/sales_email_order_invoice_items.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_email_order_invoice_items.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_email_order_invoice_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Weee/view/frontend/layout/sales_email_order_items.xml index be8fab59b6db4ffb30b788618a464ebaa6d8fd4b..d49416bc9a00395916147dc7e7086f1fff641833 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_email_order_items.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_email_order_items.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_guest_creditmemo.xml b/app/code/Magento/Weee/view/frontend/layout/sales_guest_creditmemo.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_guest_creditmemo.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_guest_creditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/Weee/view/frontend/layout/sales_guest_invoice.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_guest_invoice.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_guest_invoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_guest_print.xml b/app/code/Magento/Weee/view/frontend/layout/sales_guest_print.xml index be8fab59b6db4ffb30b788618a464ebaa6d8fd4b..d49416bc9a00395916147dc7e7086f1fff641833 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_guest_print.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_guest_print.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_guest_printcreditmemo.xml b/app/code/Magento/Weee/view/frontend/layout/sales_guest_printcreditmemo.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_guest_printcreditmemo.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_guest_printcreditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_guest_printinvoice.xml b/app/code/Magento/Weee/view/frontend/layout/sales_guest_printinvoice.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_guest_printinvoice.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_guest_printinvoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_guest_view.xml b/app/code/Magento/Weee/view/frontend/layout/sales_guest_view.xml index be8fab59b6db4ffb30b788618a464ebaa6d8fd4b..d49416bc9a00395916147dc7e7086f1fff641833 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_guest_view.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_guest_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_creditmemo.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_creditmemo.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_creditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_invoice.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_invoice.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_invoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_item_price.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_item_price.xml index d8886b438ac625e3aaa4248113d3bf57819c9d6e..28e0e3194bfff199551046b614e321068c9d24a7 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_item_price.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_item_price.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Weee\Block\Item\Price\Renderer" name="item_unit_price" template="item/price/unit.phtml"> <arguments> <argument name="zone" xsi:type="string">sales</argument> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_print.xml index be8fab59b6db4ffb30b788618a464ebaa6d8fd4b..d49416bc9a00395916147dc7e7086f1fff641833 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_print.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_print.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_printcreditmemo.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_printcreditmemo.xml index 7b19936de3fd9e77e6d74d6ebd87858892c49a8c..b3c99277f57d58c2bd4ca4e9684d4988ca8e3af8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_printcreditmemo.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_printcreditmemo.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="creditmemo_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_printinvoice.xml index a0414af18012f77452d9afa5d73a58dcd6737bb2..97acf7958ccc9895eba4ada26a4c41eee4e051a8 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_printinvoice.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_printinvoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="invoice_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Weee/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Weee/view/frontend/layout/sales_order_view.xml index be8fab59b6db4ffb30b788618a464ebaa6d8fd4b..d49416bc9a00395916147dc7e7086f1fff641833 100644 --- a/app/code/Magento/Weee/view/frontend/layout/sales_order_view.xml +++ b/app/code/Magento/Weee/view/frontend/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="order_totals"> <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals"> <action method="setBeforeCondition"> diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index ca7a34c58a88a73bac66b41e1abd620168b83be1..ca168676af02d36d7103a5094c8b1e07165a4ec9 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_index.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_index.xml index b43cab82290d37659d50e5536e627f929e84f5f7..ee455a12d16fa932ae5645445eea7c67f4a1682c 100644 --- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_index.xml +++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Widget\Block\Adminhtml\Widget" name="wysiwyg_widget"/> </container> diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml index d3989d5bdf62302188ab8428f1048f0e18b385ca..572b4243ffaa6047fe2e42bc2c21541ed3e1fb9f 100644 --- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml +++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="adminhtml.widget.instance.grid.container"> <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.widget.instance.grid" as="grid"> <arguments> diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml index db95f3e7c953eaf85d82bbb2f30bc132e894c4f1..d48208fa3ce9dd28b242041c1596cce176e3c80d 100644 --- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml +++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <link src="prototype/window.js"/> <css src="prototype/windows/themes/default.css"/> diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_index.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_index.xml index ff2f267544acb4741a6bec6fd1209ce85c14db8a..5de2bdecf05e50ff1eab44f238071649bfff96ea 100644 --- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_index.xml +++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="adminhtml_widget_instance_block"/> <referenceContainer name="content"> <block class="Magento\Widget\Block\Adminhtml\Widget\Instance" name="adminhtml.widget.instance.grid.container"/> diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_loadoptions.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_loadoptions.xml index ebc59d347f86192a9fb3b0e7d4d7acb2369eb7fa..9a98d16a5f0f728b26891420da0bb73ea7e5955d 100644 --- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_loadoptions.xml +++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_loadoptions.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Widget\Block\Adminhtml\Widget\Options" name="wysiwyg_widget.options"/> </container> diff --git a/app/code/Magento/Widget/view/frontend/layout/default.xml b/app/code/Magento/Widget/view/frontend/layout/default.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Widget/view/frontend/layout/default.xml +++ b/app/code/Magento/Widget/view/frontend/layout/default.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Widget/view/frontend/layout/print.xml b/app/code/Magento/Widget/view/frontend/layout/print.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Widget/view/frontend/layout/print.xml +++ b/app/code/Magento/Widget/view/frontend/layout/print.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Wishlist/Block/Item/Configure.php b/app/code/Magento/Wishlist/Block/Item/Configure.php index 071f689049daa6f546a4d98af7ea9d5f6ee0991e..5d8f40d837535849ed23cd857dac99719c9448e5 100644 --- a/app/code/Magento/Wishlist/Block/Item/Configure.php +++ b/app/code/Magento/Wishlist/Block/Item/Configure.php @@ -102,7 +102,7 @@ class Configure extends \Magento\Framework\View\Element\Template { // Set custom add to cart url $block = $this->getLayout()->getBlock('product.info'); - if ($block) { + if ($block && $this->getWishlistItem()) { $url = $this->_wishlistData->getAddToCartUrl($this->getWishlistItem()); $block->setCustomAddToCartUrl($url); } diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php index 6122fdcc759cb6893726d66af1f5b7cbf313c640..37773a0ce1f7a71d2056e5da7d2e5fdf1f74af34 100644 --- a/app/code/Magento/Wishlist/Helper/Data.php +++ b/app/code/Magento/Wishlist/Helper/Data.php @@ -382,7 +382,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper $url = $this->_getUrl('wishlist/index/updateItemOptions'); if ($itemId) { - $params = array('id' => $itemId, 'product' => $productId); + $params = array('id' => $itemId, 'product' => $productId, 'qty' => $item->getQty()); return $this->_postDataHelper->getPostData($url, $params); } diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index b43053c8d6d95b545cf1d5c913a2750d544fe05b..e7f3d6d59ddac52394d9bc94f6a61a62f614349e 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -3,25 +3,25 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-rss": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-bundle": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-grouped-product": "0.1.0-alpha98", - "magento/module-configurable-product": "0.1.0-alpha98", - "magento/module-downloadable": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-rss": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-bundle": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-grouped-product": "0.1.0-alpha99", + "magento/module-configurable-product": "0.1.0-alpha99", + "magento/module-downloadable": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml index 31b489744e0848590f0e5b5606f12e80c38bc433..66756d83aebe7f22410f2901711e11eab7785cfe 100644 --- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml +++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd"> <container name="root"> <block class="Magento\Backend\Block\Widget\Grid" name="customer.wishlist.edit.tab"> <arguments> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml index 7eded3289074cc72a304e322fa8d903f591d28fd..7c44d55928c4c4f1a3fffb0cf64f6d92e0a7c18e 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml"> <arguments> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalog_product_view.xml index 7eded3289074cc72a304e322fa8d903f591d28fd..7c44d55928c4c4f1a3fffb0cf64f6d92e0a7c18e 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml"> <arguments> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml index d079d8f85c6e939bf9bd7a00f326491846d0afe3..027bed8e32ab921d25b59ee72e6f63b05fdb3f1b 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="customer_account_navigation"> <block class="Magento\Framework\View\Element\Html\Link\Current" ifconfig="wishlist/general/active" name="customer-account-navigation-wish-list-link"> <arguments> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml index 5f65bd6a72b9273fbb79eda0cba39c08ed4fa867..7fe65f769c30d568a72a27216db0ca90ece6fa60 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="wishlist_page_head_components" template="Magento_Wishlist::js/components.phtml"/> </referenceBlock> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml index 9c29f45c2c0d4fa398e7b6c441fb32865075152a..fe9b968ad26764e11aed603e94891fb3f83a717a 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml @@ -23,17 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="catalog_product_view"/> - <referenceContainer name="product.info.main"> + <referenceContainer name="product.info.social"> <block class="Magento\Wishlist\Block\Item\Configure" name="product.info.addto" as="addto" template="Magento_Wishlist::item/configure/addto.phtml"/> </referenceContainer> - <referenceBlock name="product.info.options.wrapper.bottom"> - <action method="unsetChild"> - <argument name="name" xsi:type="string">product.info.addtocart.additional</argument> - </action> - <action method="append"> - <argument name="element" xsi:type="string">product.info.addtocart.additional</argument> - </action> - </referenceBlock> </page> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml index d4861aed666c7c2d256c36a0b5c137988863f992..a76ecbda8082ee2bdd346dd0943e1ef863f258bb 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> - <attribute name="class" value="type-bundle"/> + <attribute name="class" value="page-product-bundle"/> </body> <referenceBlock name="product.info"> <block class="Magento\Catalog\Block\Product\View" name="bundle.summary" as="form_top" template="Magento_Bundle::catalog/product/view/summary.phtml"> @@ -43,6 +43,9 @@ <referenceBlock name="product.info.options.wrapper"> <block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-"> + <container name="product.info.bundle.options.top" as="product_info_bundle_options_top"> + <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/> + </container> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/> @@ -52,7 +55,6 @@ <move element="product.price.tier" destination="product.info.options.wrapper.bottom" before="-" /> <referenceBlock name="product.info.options.wrapper.bottom"> <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/> - <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" after="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/> <action method="unsetChild"> <argument name="block" xsi:type="string">product.info.addtocart</argument> </action> @@ -64,12 +66,14 @@ </action> </referenceBlock> <referenceContainer name="content"> - <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/> + <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.main"/> <move element="product.info" destination="bundle.options.container" before="-"/> </referenceContainer> <referenceContainer name="product.info.type"> <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml"/> <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/> - <block class="Magento\Catalog\Block\Product\View" name="customize.button" as="customize_button" template="Magento_Bundle::catalog/product/view/customize.phtml"/> + </referenceContainer> + <referenceContainer name="product.info.main"> + <block class="Magento\Catalog\Block\Product\View" name="customize.button" as="customize_button" template="Magento_Bundle::catalog/product/view/customize.phtml" after="product.info.price" /> </referenceContainer> </page> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml index d647a964c3b52c44d6a050d424dedfc3153cee94..5a3eee9f9c741c8b2cbffeb4c67f7e096cb30181 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> - <attribute name="class" value="type-configurable"/> + <attribute name="class" value="page-product-configurable"/> </body> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="wishlist_product_view_head_components" template="Magento_Wishlist::js/components.phtml"/> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_downloadable.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_downloadable.xml index 4037d5037bb3f2be9cb89723e97ec5a9ec0fd8a4..1975908eee6239c31fa8703e07206a7411887fe2 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_downloadable.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_downloadable.xml @@ -23,14 +23,19 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="wishlist_product_view_head_components" template="Magento_Wishlist::js/components.phtml"/> <block class="Magento\Framework\View\Element\Js\Components" name="downloadable_page_head_components" template="Magento_Downloadable::js/components.phtml"/> </referenceBlock> + <body> + <attribute name="class" value="page-product-downloadable"/> + </body> + <referenceContainer name="product.info.main"> + <block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml" after="product.price.tier" /> + </referenceContainer> <referenceContainer name="product.info.type"> <block class="Magento\Downloadable\Block\Catalog\Product\View\Type" name="product.info.downloadable" as="product_type_data" template="catalog/product/type.phtml"> - <block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml"/> <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" name="product.info.downloadable.extra" as="product_type_data_extra" template="stockqty/default.phtml"/> </block> </referenceContainer> @@ -44,4 +49,17 @@ </block> </block> </referenceBlock> + <referenceContainer name="product.info.options.wrapper.bottom"> + <block class="Magento\Catalog\Pricing\Render" name="product.price.final.copy" before="-"> + <arguments> + <argument name="price_render" xsi:type="string">product.price.render.default</argument> + <argument name="price_type_code" xsi:type="string">final_price</argument> + <argument name="display_msrp_help_message" xsi:type="string">1</argument> + <argument name="zone" xsi:type="string">item_view</argument> + <argument name="id_suffix_some" xsi:type="string">copy-</argument> + </arguments> + </block> + </referenceContainer> + <move element="product.info" destination="content" after="product.info.main" /> + <move element="product.info.social" destination="product.info.options.wrapper.bottom" after="-" /> </page> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml index c90b9a49ba267296f8edf2a1312fd9925d3e9f02..67e061278df8d61c9f51b24692d8da17054dbd63 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml @@ -23,7 +23,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <body> + <attribute name="class" value="page-product-grouped"/> + </body> <referenceContainer name="product.info.form.content"> <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="product/view/type/grouped.phtml"/> <container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_simple.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_simple.xml index 28642f37db44e030bf7ebfb129a8ff85eff6a391..706558a3cf19c46b7efbf9ff969306515a310a9e 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_simple.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_simple.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml index 194bbbdd3e30ad6dd935b8f3bdbed76e33e88bb5..5d029adfffc0a1b98a78bd104d6eb7cd4d76247f 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceBlock name="head.components"> <block class="Magento\Framework\View\Element\Js\Components" name="wishlist_head_components" template="Magento_Wishlist::js/components.phtml"/> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_share.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_share.xml index 664ce5c229a7d8eb67be1c25545dd7b2340a1e24..39b2ae358dabab8372a62c45d75b957d8e09a780 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_share.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_share.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="customer_account"/> <referenceContainer name="content"> <block class="Magento\Wishlist\Block\Customer\Sharing" name="wishlist.sharing" template="sharing.phtml"/> diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_shared_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_shared_index.xml index 4926a752ea146771fa8cf2ef2e5a99fb8a623be0..ef50cfbacd436522f8951c3c53ab7a2f3b48f123 100644 --- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_shared_index.xml +++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_shared_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="content"> <block class="Magento\Wishlist\Block\Share\Wishlist" name="customer.wishlist" template="shared.phtml" cacheable="false"/> </referenceContainer> diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js index 6e626c5150e1f46e7f4c5362b27357ed19e29723..4156bc37f062da6fc3f9a0f4f69b36ace025b755 100644 --- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js +++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js @@ -53,10 +53,10 @@ define([ $(event.handleObj.selector).each(function(index, element){ dataToAdd[$(element).attr('name')] = $(element).val(); }); - + var self = this; $('[data-action="add-to-wishlist"]').each(function(index, element) { var params = $(element).data('post'); - params.data = $.extend({}, params.data, dataToAdd); + params.data = $.extend({}, params.data, dataToAdd, {'qty': $(self.options.qtyInfo).val()}); $(element).data('post', params); }); } diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml index 1adabb51b4c0bb17e1e4a5aca0cf2a7a4fc87536..6dfb78758a9f6d7f23ba883820e34187bda9c06b 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="mui/reset.css"/> <css src="mui/base.css"/> diff --git a/app/design/adminhtml/Magento/backend/Magento_Core/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Core/web/css/source/module.less index 85554dabcb89bc16ed0100bc22ef2e6347a8302a..c5002e3d19bf7b9b3b27273a561555034193ef3e 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Core/web/css/source/module.less +++ b/app/design/adminhtml/Magento/backend/Magento_Core/web/css/source/module.less @@ -26,5 +26,9 @@ .page-actions { position: relative; z-index: 1; + .debugging-hint-template-file { + left: auto !important; + right: 0 !important; + } } } diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index 407afee3724f47ca8dd1e66adbf2b928f94e4162..51e7f021faf5739ae517312a85c056161f8cc2aa 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/design/adminhtml/Magento/backend/theme.xml b/app/design/adminhtml/Magento/backend/theme.xml index acbb07ba133ac657601c0f5c529fe712dfaaf120..f7bf6aed49a229dc089a5ab524df9e707b12eac0 100644 --- a/app/design/adminhtml/Magento/backend/theme.xml +++ b/app/design/adminhtml/Magento/backend/theme.xml @@ -24,5 +24,5 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento 2 backend</title> - <version>0.1.0-alpha98</version> + <version>0.1.0-alpha99</version> </theme> diff --git a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less index fcab8cc1d04c81d5e54d2e723aac2fc2af5ac519..4097f09b48e6b8084d8714e61db53a4c54bbab73 100644 --- a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less @@ -53,6 +53,10 @@ clear: both; } + .action.back { + margin-bottom: @indent-l-base; + } + .price-box { .price { font-weight: @font-weight-bold; diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/layout/catalog_product_view.xml b/app/design/frontend/Magento/blank/Magento_Catalog/layout/catalog_product_view.xml index 4bd5699de1b6d0384b41bd099aad8a8c4361f8c9..91fdd0f0129b09ccc7bed6c409540125b0b6e1cc 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/layout/catalog_product_view.xml +++ b/app/design/frontend/Magento/blank/Magento_Catalog/layout/catalog_product_view.xml @@ -24,7 +24,6 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <move element="page.main.title" destination="product.info.main" before="-"/> - <move element="product.info.media" destination="content" before="product.info.main" /> </page> diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/listings.less index afe03e58e1b789d7b2e2f18e3e75000a0fb95dc1..093fc88ccf310bc8b371d10c17f7b7e3a1f10aa6 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/listings.less +++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/listings.less @@ -226,25 +226,30 @@ } } -.products-list .product { - &-item { - display: table; - width: 100%; +.products-list { + .product { + &-item { + display: table; + width: 100%; - &-info { - display: table-row; - } - &-photo { - width: 1%; - padding: 0 @indent-l-base @indent-l-base 0; - vertical-align: top; - display: table-cell; - } - &-details { - vertical-align: top; - display: table-cell; + &-info { + display: table-row; + } + &-photo { + width: 1%; + padding: 0 @indent-l-base @indent-l-base 0; + vertical-align: top; + display: table-cell; + } + &-details { + vertical-align: top; + display: table-cell; + } } } + .product-image-wrapper { + &:extend(.abstract-reset-image-wrapper all); + } } .responsive-smaller (@break) when (@break = @screen-s) { diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less index 2e9751d4f692a0cfe034664ea95d4485c9f219e9..740dff467f18176b044575176cc09fcd4ea3aecf 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less @@ -208,7 +208,12 @@ margin: @indent-s-base 0; } } - + .product-reviews-summary .reviews-actions { + .font-size(@font-size-base); + } +} +.product-info-main, +.product-options-bottom { .price-box { .price-including-tax + .price-excluding-tax, .weee + .price-excluding-tax, @@ -226,7 +231,6 @@ font-weight: @font-weight-bold; } } - .special-price { display: block; margin: @indent-s-base 0; @@ -237,7 +241,6 @@ display: inline-block; } } - .old-price, .special-price { .price-label { @@ -246,7 +249,6 @@ } } } - .box-tocart { margin: @indent-base 0; .field.qty { @@ -264,7 +266,7 @@ text-align: center; } .action.tocart { - .button-l(); + &:extend(.abstract-button-l all); } } .product-addto-links { @@ -274,9 +276,6 @@ &:extend(.abstract-action-addto-product all); vertical-align: top; } - .product-reviews-summary .reviews-actions { - .font-size(@font-size-base); - } } .prices-tier { @@ -319,7 +318,8 @@ // Desktop //-------------------------------------- .responsive(@break) when (@break = @screen-m) { - .product-info-main { + .product-info-main, + .product-options-bottom { .box-tocart { display: table; .field.qty { @@ -469,10 +469,13 @@ body.catalog-product-compare-index { } .product-item-photo { - text-align: center; + text-align: left; display: block; margin: 0 auto 15px; } + .product-image-photo { + margin-left: 0; + } .product-item-actions, .price-box, diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml index a3555ecc82fec74e15b774f17e7083393ccf28b4..cc66f1dac05a2c837e148ee92daaf76688afb349 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml +++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml @@ -24,7 +24,7 @@ */ --> <page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="checkout.cart.items"> <container name="checkout.cart.container" label="invisible" htmlTag="div" htmlClass="cart-container" before="-"> <container name="cart.summary" label="Cart Summary Container" htmlTag="div" htmlClass="cart-summary" after="-"> diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_onepage_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_onepage_index.xml new file mode 100644 index 0000000000000000000000000000000000000000..eb7e2fa2efd83c865f7116063eb4934c46c54d05 --- /dev/null +++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_onepage_index.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> + <remove name="minicart" /> + <remove name="header.panel" /> + <remove name="top.search" /> + <remove name="catalog.compare.link" /> + <remove name="page.main.title" /> + <remove name="catalog.topnav" /> + <remove name="footer-container" /> +</page> diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less index c0d7af501dfc4cbbbe84892ef389edc8c6cd4108..09db4e38533f61c49e431b056f6eb1aa4b324b04 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/cart.less @@ -233,7 +233,7 @@ margin-bottom: 10px; &:first-child { margin-left: 0; - } + } } } .action { @@ -265,14 +265,18 @@ text-overflow: ellipsis; } } + // Product options - .cart-item-options { + .item-options { font-size: @font-size-s; margin-top: @indent-s-base; margin-bottom: @indent-s-base; &:extend(.abstract-product-options-list all); &:extend(.abstract-add-clearfix all); } + .product-image-wrapper { + &:extend(.abstract-reset-image-wrapper all); + } } &-container { .form.cart { @@ -320,7 +324,7 @@ text-align: center; margin-top: @indent-s-base; .action.primary { - .button-l(); + &:extend(.abstract-button-l all); margin-bottom: 20px; width: 100%; } diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less index c8c54aec977f3a8dec9bb64473000c71698109e1..2bc8a723f20658675519a6c7200d1a1b22c209e3 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/minicart.less @@ -26,15 +26,22 @@ // Minicart //-------------------------------------- .block-minicart { + .items-total { + float: left; + margin: 0 10px; + } .subtotal { - border-top: 1px solid @color-secondary; - padding-top: 10px; + margin: 0 10px; + text-align: right; + } + .amount { + .price-wrapper:first-child .price { + font-size: @font-size-l; + font-weight: @font-weight-bold; + } } .subtitle { - .heading(h3); - display: inline-block; - margin-top: 0; - font-weight: 500; + display: none; } .subtitle.empty { display: block; @@ -43,19 +50,25 @@ font-size: 14px; } .empty.text { - margin: -10px 0 20px; text-align: center; - & + .actions { - margin-bottom: 10px; - text-align: center; - } } > .content > .actions { - margin-top: 10px; - > .secondary, + margin-top: 15px; + > .secondary { + margin: 15px 0; + text-align: center; + } > .primary { - padding-right: 20px; - display: inline; + margin: 0 10px; + .action.primary { + &:extend(.abstract-button-l all); + display: block; + width: 100%; + } + } + .paypal-logo { + margin-top: 15px; + text-align: center; } } } @@ -71,24 +84,24 @@ @_icon-font-position: before, @_icon-font-size: 35px, @_icon-font-line-height: 33px, - @_icon-font-color: @color-primary, + @_icon-font-color: @minicart-icons-color, @_icon-font-color-hover: @color-primary, - @_icon-font-color-active: @color-primary + @_icon-font-color-active: @minicart-icons-color ); float: right; .block-minicart { - right: -7px; + padding: 25px 20px; + right: 0; width: 320px; - padding: 15px; > .title { display: none; } - &:before, &:after { left: auto; right: 25px; } &:before { + left: auto; right: 26px; } } @@ -97,42 +110,19 @@ > .primary, > .secondary { display: inline; + margin-right: @indent-s-base; + &:last-child { + margin-right: 0; + } } } - .ui-dialog { - .action.close { - right: 0; - top: 46px; - z-index: 100; - } - } .action.close { - position: absolute; - right: 14px; - top: 6px; - .icon-font( - @icon-remove, - @_icon-font-size: 33px, - @_icon-font-line-height: 33px, - @_icon-font-color: @text-color-muted, - @_icon-font-text-hide: true - ); - .button-reset(); + display: none; } .action.showcart { .text { &:extend(.abstract-visually-hidden all); } - .icon-font( - @_icon-font-content: @icon-cart, - @_icon-font-position: before, - @_icon-font-size: 35px, - @_icon-font-line-height: 33px, - @_icon-font-vertical-align: top, - @_icon-font-color: @color-primary, - @_icon-font-color-hover: @color-primary, - @_icon-font-color-active: @color-primary - ); white-space: nowrap; .counter.qty { &.empty { @@ -140,14 +130,15 @@ } background: @color-active; border-radius: 2px; - color: #fff; + color: @page-bg-color; clip: none; display: inline-block; - height: 26px; - line-height: 26px; - margin: 3px 0 0 -5px; + height: 24px; + line-height: 24px; max-width: 2em; - min-width: 20px; + min-width: 18px; + margin: 3px 0 0; + padding: 0 3px; overflow: hidden; text-align: center; white-space: normal; @@ -159,22 +150,52 @@ .list-reset-styles(0, 0); .item { border-top: 1px solid @color-secondary; - padding: 15px 0; + padding: 20px 0; z-index: 1; } - .item > .product { &:extend(.abstract-add-clearfix all); } - - .product.photo { - float: left; + .product-image-wrapper { + &:extend(.abstract-reset-image-wrapper all); } - - .product-item-details { - padding-left: 88px; + .product { + &.photo { + float: left; + } + &-item-name { + display: block; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + font-weight: @font-weight-base; + margin-top: 0; + a { + color: @link-color; + } + } + &.details { + padding-left: 88px; + .price { + font-weight: @font-weight-bold; + } + } + &.pricing { + margin-top: 3px; + } + &.options { + .tooltip.toggle { + .icon-font( + @icon-down, + @_icon-font-size: 28px, + @_icon-font-line-height: 28px, + @_icon-font-text-hide: true, + @_icon-font-margin: -3px 0 0 7px, + @_icon-font-position: after + ); + } + } } - .details-qty { .label:after { content: ":"; @@ -206,7 +227,7 @@ //-------------------------------------- .responsive-smaller(@break) when (@break = @screen-xs) { .minicart-wrapper .block-minicart { - width: 280px; + width: 289px; } } @@ -215,10 +236,10 @@ //-------------------------------------- .responsive(@break) when (@break = @screen-m) { .minicart-wrapper { - margin-left: 10px; + margin-left: 13px; .block-minicart { right: -15px; - width: 380px; + width: 390px; } } } diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less index 24e85d2518ee996208f87857d6360ba4940348b0..67670a0dd04a9890fb4bf5534e1d0f5be2babfd1 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module.less @@ -106,61 +106,14 @@ margin: @form-field-vertical-indent 0 0; } } - .actions { - margin-top: 20px; - } - } - } - - // Shipping and payment mathods - .methods-shipping, - .methods-payment { - img { - vertical-align: middle; - } - .field.month { - padding-right: 10px; - } - } - - // Shipping methods - .methods-shipping { - .item-title { - &:extend(.abstract-shipping-methods-title all); - } - .item-content { - margin: 0 0 20px; - .field.choice { - margin: 0 0 10px; - } - .price { - font-weight: @font-weight-bold; - } - &:extend(.abstract-adjustment-incl-excl-tax all); - } - .price-box { - margin-left: 20px; - .label + .price { - font-weight: @font-weight-bold; - } - } - } - - .methods-payment { - .item-title { - font-weight: @font-weight-base; - } - .item-content { - margin-bottom: 0; - .fieldset { - padding: 15px 0; - .field:first-child, - .field.year { - margin-top: 0; + .form:not(.login), + .order-review { + .action.primary { + &:extend(.abstract-button-l all); } } - .label { - font-weight: @font-weight-base; + .actions { + margin-top: 20px; } } } @@ -200,11 +153,14 @@ tbody tr:last-child td { border-bottom: @border-width-base solid @border-color-base; } - .review-item-options { + .item-options { font-size: @font-size-s; margin: 10px 0 0; &:extend(.abstract-add-clearfix all); } + .cart-price { + &:extend(.abstract-checkout-cart-price all); + } } .action.primary.checkout { @@ -212,7 +168,7 @@ } .hidden { - display: none; + &:extend(.abstract-no-display all); } // Customer login @@ -235,6 +191,61 @@ } } +// Shipping methods +.methods-shipping { + .item-title { + &:extend(.abstract-methods-shipping-title all); + } + .item-content { + margin: 0 0 20px; + .field.choice { + margin: 0 0 10px; + } + .price { + font-weight: @font-weight-bold; + } + &:extend(.abstract-adjustment-incl-excl-tax all); + } + .price-box { + margin-left: 20px; + .label + .price { + font-weight: @font-weight-bold; + } + } + img { + vertical-align: middle; + } + .field.month { + padding-right: 10px; + } +} + +// Payment methods +.methods-payment { + .item-title { + font-weight: @font-weight-base; + } + .item-content { + margin-bottom: 0; + .fieldset { + padding: 15px 0; + .field:first-child, + .field.year { + margin-top: 0; + } + } + .label { + font-weight: @font-weight-base; + } + } + img { + vertical-align: middle; + } + .field.month { + padding-right: 10px; + } +} + .cart-tax-info + .cart-tax-total { display: block; } @@ -313,14 +324,23 @@ } } - // // Mobile //-------------------------------------- .responsive-smaller(@break) when (@break = @screen-m) { + .checkout-onepage-index { + .nav-toggle { + display: none; + } + .logo { + margin-left: 0; + } + } + .opc-wrapper { .data.table { &:extend(.abstract-table-vertical-mobile all); + &:extend(.abstract-product-items-summary all); tbody tr { &:first-child, &:last-child { @@ -394,7 +414,7 @@ .login-wrapper { &:extend(.abstract-add-clearfix-desktop all); .block { - &:extend(.blocks-2columns all); + &:extend(.abstract-blocks-2columns all); } .field.choice:not(.persistent) { &:before { diff --git a/app/design/frontend/Magento/blank/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/blank/Magento_Customer/layout/customer_account.xml index 4fd832a902b508d40060729e3e48f4a62169a8bb..45589c3553408e1a1c501a5a96606a941471a4f3 100644 --- a/app/design/frontend/Magento/blank/Magento_Customer/layout/customer_account.xml +++ b/app/design/frontend/Magento/blank/Magento_Customer/layout/customer_account.xml @@ -23,10 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> - <body> - <attribute name="class" value="account"/> - </body> +<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="sidebar.main"> <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml"> <arguments> @@ -58,4 +55,5 @@ </block> </block> </referenceContainer> + <move element="page.main.title" destination="content.top" before="-"/> </page> diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less index f5997ab3b43929d14a1d28d8238e22ec186e2748..b8bad12544f8c4d87f1a16ff5318b68d5efbdcbb 100644 --- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less @@ -57,6 +57,9 @@ #region_id { display: none; } + .actions-toolbar .action.primary { + &:extend(.abstract-button-l all); + } } .form-edit-account { @@ -76,6 +79,12 @@ // My account .account { + .page-title { + .title { + display: inline-block; + margin-top: 0; + } + } .messages { margin-bottom: @indent-base; } @@ -162,6 +171,9 @@ .page.messages { margin-bottom: 40px; } + .block-collapsible-nav { + margin-top: -21px; + } .data.table { &:extend(.abstract-table-vertical-mobile all); .col.actions { @@ -186,6 +198,11 @@ .css(margin-bottom, @indent-s-base); } } + .customer-account-index { + .page-title { + position: relative; + } + } } // @@ -300,6 +317,13 @@ clear: both; } + // + // Welcome block + //-------------------------------------- + .dashboard-welcome-toggler { + &:extend(.abstract-visually-hidden-desktop all); + } + .control.captcha-image { white-space: nowrap; .captcha-img { diff --git a/app/design/frontend/Magento/blank/Magento_Downloadable/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Downloadable/web/css/source/module.less index 42c54c388597aa8c8a938e752f98330afae7514c..9668329f8303dc7dc84fd3ba2165bc7da34e7335 100644 --- a/app/design/frontend/Magento/blank/Magento_Downloadable/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Downloadable/web/css/source/module.less @@ -56,4 +56,43 @@ font-weight: @font-weight-semibold; .font-size(14); } + .sample.link { + float: right; + } +} +.page-product-downloadable { + .product-add-form { + clear: both; + margin-bottom: @indent-m-base; + &:extend(.abstract-add-clearfix all); + } + .product-options-bottom { + .field.qty { + display: none!important; + } + } +} + +// +// Product view Desktop +//-------------------------------------- +.responsive(@break) when (@break = @screen-m) { + .page-product-downloadable { + .product-add-form { + &:extend(.clearer all); + } + .product-options-wrapper { + float: left; + width: 55%; + } + .product-options-bottom { + float: right; + width: 40%; + .field.qty { + & + .actions { + padding-top: 0; + } + } + } + } } diff --git a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less index e15c51ec52282ce9ca2ec4c3417481bf26499286..2e3a5b2bf466c92c3752d0603784b85423c2af74 100644 --- a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/module.less @@ -22,104 +22,104 @@ // * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) // */ -.opc-wrapper { - .gift-message { - > legend { - .font-size(14); - font-weight: @font-weight-bold; - margin: 20px 0 0; +.gift-message { + margin: 0; + .fieldset& { + > .legend { + &:extend(.abstract-methods-shipping-title all); } - .field.choice { + } + .field.choice { + font-weight: @font-weight-base; + margin: 0 0 20px; + &:before { + display: none; + } + } + .activate.message { + display: inline-block; + margin: 0 0 10px; + } + .product-image-wrapper { + &:extend(.abstract-reset-image-wrapper all); + } + .options-items { + background: @sidebar-background; + display: block; + margin: 20px 0 0; + padding: 20px; + .order-title:not(:first-child), + .extra-options-container { font-weight: @font-weight-base; - margin: 0 0 20px; - &:before { - display: none; - } + margin: 20px 0 0; } - .activate.message { - display: inline-block; - margin: 0 0 10px; + .order-options { + margin: 0 0 20px 20px; } - .options-items { - background: @sidebar-background; - display: block; - margin: 20px 0 0; - padding: 20px; - .order-title:not(:first-child), - .extra-options-container { - font-weight: @font-weight-base; - margin: 20px 0 0; - } - .order-options { - margin: 0 0 20px 20px; - } - .block.message { - margin-bottom: 10px; - } - .items { - .list-reset-styles(); - .item { - border-bottom: @border-width-base solid @border-color-base; - margin-bottom: 20px; - padding-bottom: 10px; - .product { - .photo { - margin: 10px 0; - } - } - &:last-child { - border-bottom: 0; - padding-bottom: 0; + .block.message { + margin-bottom: 10px; + } + .items { + .list-reset-styles(); + .item { + border-bottom: @border-width-base solid @border-color-base; + margin-bottom: 20px; + padding-bottom: 10px; + .product { + .photo { + margin: 10px 0; } } - } - .number { - font-size: @font-size-s; - } - .regular-price, - .price-including-tax, - .price-excluding-tax { - &:before { - content: attr(data-label) ": "; - } - .price { - font-weight: @font-weight-bold; + &:last-child { + border-bottom: 0; + padding-bottom: 0; } } - .price-including-tax { - .font-size(14); + } + .number { + font-size: @font-size-s; + } + .regular-price, + .price-including-tax, + .price-excluding-tax { + &:before { + content: attr(data-label) ": "; + } + .price { + font-weight: @font-weight-bold; } } + .price-including-tax { + .font-size(14); + } } } .responsive(@break) when (@break = @screen-m) { - .opc-wrapper { - .gift-message { - .item { - border-bottom: @border-width-base solid @border-color-base; - margin-bottom: 20px; - padding-bottom: 10px; - &:extend(.abstract-add-clearfix-desktop all); - .product { - float: left; - margin-right: 20px; - .photo { - margin: 10px 0; - } - .name { - text-overflow: ellipsis; - overflow: hidden; - max-width: 145px; - } + .gift-message { + .item { + border-bottom: @border-width-base solid @border-color-base; + margin-bottom: 20px; + padding-bottom: 10px; + &:extend(.abstract-add-clearfix-desktop all); + .product { + float: left; + margin-right: 20px; + .photo { + margin: 10px 0; } - .options { + .name { + text-overflow: ellipsis; overflow: hidden; + max-width: 145px; } } - .price-box > .price { - display: block; + .options { + overflow: hidden; } } + .price-box > .price { + display: block; + } } } diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/layout/multishipping_checkout.xml b/app/design/frontend/Magento/blank/Magento_Multishipping/layout/multishipping_checkout.xml new file mode 100644 index 0000000000000000000000000000000000000000..5f2378c6b5af00ca36cb9956c537f3c5e236cee2 --- /dev/null +++ b/app/design/frontend/Magento/blank/Magento_Multishipping/layout/multishipping_checkout.xml @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout" design_abstraction="custom"> + <remove name="minicart" /> + <remove name="header.panel" /> + <remove name="top.search" /> + <remove name="catalog.topnav" /> + <remove name="footer-container" /> + <remove name="catalog.compare.link" /> +</page> diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less index 2999d80e643c8c5f1e9da8f03d0757b31f5accee..2823bf4aa6cd888a1f52a745f03c0bb47095dd53 100644 --- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/module.less @@ -23,187 +23,325 @@ // */ .multicheckout { - &.form { - > .title { - &:extend(.abstract-add-clearfix all); - margin-bottom: 25px; - > strong { - .heading(h3); - } - > .action { - &:extend(.abstract-button-responsive all); - margin-top: 10px; - } - } - .items.table { - .table-bordered( - @_type: light, - @_border-width: 1px - ); - td { - vertical-align: top; - input, - select { - margin-top: -@table-cell-padding-vertical; - } - padding-top: @table-cell-padding-vertical*2; - } - tbody tr:last-child td { - border-bottom: 1px solid @border-color-base; - } - .col.delete .action { - white-space: nowrap; - } - .col.qty { - width: 45px; + .title { + margin-bottom: 30px; + strong { + font-weight: @font-weight-base; + } + } + + .table-wrapper { + margin-bottom: 0; + .action.delete { + display: inline-block; + margin: 7px 0 0; + } + .col { + &.qty { .input-text { - width: 3.3em; text-align: center; + width: 45px; + } + } + &.item { + .action.edit { + font-weight: @font-weight-base; + margin-left: @indent-s-base; } } } - - .product .item.options { - font-size: @font-size-s; - margin-top: 10px; - &:extend(.abstract-product-options-list all); + .cart-price { + &:extend(.abstract-checkout-cart-price all); + } + .product-item-name { + &:extend(.abstract-checkout-product-name all); } } - .box-order-shipping-method { - &:extend(.abstract-adjustment-incl-excl-tax all); - } - - .column.main & { - .block:not(.widget):not(.widget) { - &:extend(.account .column.main .block:not(.widget) all); - .content .block.items .price.box { - float: none; - margin-left: 40px; + &:not(.address) { + .table-wrapper { + .product-item-name { + margin: 0; } } } - - > .title { - &:extend(.opc-wrapper .step.title all); + + > .actions-toolbar { + margin-top: @indent-xl-base; } - .fieldset.gift.message { - &:extend(.opc-wrapper .fieldset.gift.message all); - margin: 0; + .actions-toolbar > .secondary { + display: block; + .action.back { + display: block; + } } - .field.wrapping { - &:extend(.opc-wrapper .field.wrapping all); + .action.primary { + &:extend(.abstract-button-l all); } - .activate.message { - &:extend(.opc-wrapper .activate.message all); + .item-options { + margin: 10px 0 0; + &:extend(.abstract-product-options-list all); + &:extend(.abstract-add-clearfix all); } + + &:extend(.abstract-account-blocks all); - .hidden { - &:extend(.opc-wrapper .hidden all); + .block { + &:extend(.abstract-add-clearfix all); } - .options.individual { - &:extend(.opc-wrapper .options.individual all); + .block-title, + .block-content .title { + &:extend(.abstract-account-title all); + border-bottom: @border-width-base solid @border-color-base; + padding-bottom: 10px; + strong { + font-weight: @font-weight-base; + span { + color: @color-primary-light; + } + } } - .items.methods { - &:extend(.opc-wrapper .items.methods all); + .block-content { + &:extend(.abstract-add-clearfix all); + .title { + border-bottom: none; + padding-bottom: 0; + } } - .block.billing { - .method .methods .item.title { - margin-bottom: 5px; + &.order-review { + .block-title > strong { + .font-size(24); } - .box.address { - margin-bottom: 40px; + .data.table { + tfoot { + &:extend(.abstract-account-summary all); + } + } + .block-shipping { + .block-content:not(:last-child) { + margin-bottom: @indent-xl-base; + } } } - .data.table { - .col.subtotal { - &:extend(.opc-wrapper .data.table .col.subtotal all); - } - .amount { - &:extend(.opc-wrapper .data.table .amount all); + .box-shipping-method { + .price { + font-weight: @font-weight-bold; } } - .checkout.review .grand.totals { - &:extend(.abstract-add-clearfix all); - margin: 0 10px 40px; + .hidden { + &:extend(.abstract-no-display all); + } + + .checkout-review .grand.totals { + .font-size(@font-size-xl); + margin-bottom: @indent-xl-base; .mark { - float: left; - } - .amount { - float: right; + font-weight: @font-weight-base; } } +} - &.block.progress { - background: @sidebar-background; - padding: 15px; - &:extend(.abstract-reset-list); - .active { - font-weight: bold; - } +[class^="multishipping-"] { + .nav-sections { + &:extend(.abstract-no-display all); } } -.responsive(@break) when (@break = @screen-m) { +// +// Mobile +//-------------------------------------- +.responsive-smaller(@break) when (@break = @screen-m) { + [class^="multishipping-"] { + .nav-toggle { + &:extend(.abstract-no-display all); + } + .logo { + margin-left: 0; + } + } + .multicheckout { - &.form { - .title { - margin-bottom: 25px; - > strong { - .heading(h3); + .data.table { + &:extend(.abstract-table-vertical-mobile all); + &:extend(.abstract-product-items-summary all); + > tbody { + > tr td { + padding-top: 15px; + padding-left: 0; } - > .action { - float: right; - margin-left: 15px; - &:extend(.abstract-button-desktop all); + td { + &:before { + margin-bottom: 5px; + } + &.actions { + padding-top: 9px; + padding-bottom: 15px; + &:before { + &:extend(.abstract-visually-hidden-mobile-m all); + } + } + &:last-child { + border-bottom: @border-width-base solid @border-color-base; + } } } - .col { - &.product { - vertical-align: middle; - width: 35%; - } - &.address { - vertical-align: middle; - } + } + + .block-content .box { + &:not(:last-child) { + margin-bottom: @indent-xl-base; } - .actions-toolbar { - .primary .action { - margin-right: 10px; - } + &:last-child { + margin-bottom: 0; } - .column.main & { - .actions-toolbar { - &:extend(.abstract-reset-left-margin-desktop all); + } + + &.order-review { + .data.table { + thead { + .col.item { + display: block; + padding: 0; + } } - .block:not(.widget):not(.widget) .content .box.items { - width: 100%; + } + } + } +} + +// +// Desktop +//-------------------------------------- +.responsive(@break) when (@break = @screen-m) { + .multicheckout { + .actions-toolbar { + .column:not(.sidebar-main) & { + &:extend(.abstract-reset-left-margin-desktop all); + } + .secondary { + float: none; + margin-top: 11px; + text-align: right; + .action { + margin-left: 10px; + &.back { + display: block; + float: left; + } } } } - &.change.billing { - .content { - &:extend(.abstract-add-clearfix-desktop all); + .table-wrapper { + tbody { + td { + border-top: @border-width-base solid @border-color-base; + } + } + .col.qty { + text-align: center; } + } + + .item-options { + margin: 20px 0 0; + } + + .block-content .box { + margin-bottom: 0; + } + + .block-shipping { .box { - &:extend(.abstract-blocks-2columns all); + &:extend(.abstract-add-box-sizing-desktop all); + float: left; + width: 25%; + } + .box-shipping-method { + padding-right: @indent-m-base; + padding-left: @indent-m-base; + width: 50%; } } - .checkout.review .grand.totals { - &:extend(.abstract-add-clearfix-desktop all); + .block-billing { + &:extend(.abstract-add-clearfix-mobile-m all); + .box-billing-address { + &:extend(.abstract-add-box-sizing-desktop all); + float: left; + width: 25%; + } + .box-billing-method { + &:extend(.abstract-add-box-sizing-desktop all); + float: left; + padding-left: @indent-m-base; + width: 50%; + } } - &.success { - overflow: hidden; + + &.form.address { + .table-wrapper { + .applicable { + margin: 7px 0 0; + } + } + } + + &.order-review { + .box-items { + clear: left; + float: none; + padding-top: @indent-xl-base; + width: auto; + .data.table { + tr:first-child td { + padding-top: 20px; + } + tr:last-child td { + padding-bottom: 20px; + } + } + } + .col.item { + width: 75%; + } + .mark { + text-align: right; + } + } + + // Payment methods + .methods-payment { + .item-content > .fieldset { + width: auto; + .field { + &.cvv { + display: inline-block; + width: auto; + } + } + } + .fieldset > .field:not(.choice) { + > .label { + float: none; + margin-bottom: 8px; + text-align: left; + width: auto; + } + &:not(.cvv) { + .control { + width: 100%; + } + } + } } } } diff --git a/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less index 35d099f9ac15a0698f951efdb92678ebc4d33533..3664cba749a20b98697a33aa89eae07a24052c38 100644 --- a/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less @@ -120,7 +120,7 @@ .actions-toolbar { margin-top: @indent-s-base; } - .review-item-options { + .item-options { dt { display: inline-block; &:after { diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less index 1dc556680d71c168bdc139aa02eaebca715a51a0..9af81ddf25b21b2686b25cbce6712e7b243d953f 100644 --- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/module.less @@ -64,9 +64,7 @@ ); .account & { tfoot { - tr:first-child td { - border-top: @table-border-width @table-border-style @table-border-color; - } + &:extend(.abstract-account-summary all); } } @@ -92,6 +90,33 @@ } } +.order-actions-toolbar { + margin-bottom: 25px; + .action { + margin-right: 30px; + &.print { + margin: 0; + } + } +} + +.order-status { + display: inline-block; + margin-bottom: 20px; + text-transform: uppercase; +} + +.sales-order-view { + .page-title { + .title { + margin-right: 25px; + } + .order-date { + margin: 0 0 20px; + } + } +} + .form.orders.search { .field { &.email, @@ -178,7 +203,7 @@ // // Mobile //-------------------------------------- -.responsive-smaller(@break) when (@break = @screen-s) { +.responsive-smaller(@break) when (@break = @screen-m) { .account { .order-details-items { .table-order-items { @@ -267,26 +292,22 @@ // Desktop //-------------------------------------- .responsive(@break) when (@break = @screen-m) { - .account { - .page-title { - .order-actions-toolbar { - margin: -20px 0 0; + .table-order-items { + .col { + &.subtotal { text-align: right; - .action { - margin: 0 0 0 20px; - } } } - .table-order-items { - .col { - &.subtotal { - text-align: right; - } - } - .mark, - .amount { - text-align: right; - } + .mark, + .amount { + text-align: right; + } + } + + .order-actions-toolbar { + .action.print { + display: block; + float: right; } } diff --git a/app/design/frontend/Magento/blank/Magento_Theme/layout/default.xml b/app/design/frontend/Magento/blank/Magento_Theme/layout/default.xml index 7fdd07f52255bd6263692272cee0deea0b729995..b05cec4dfb2669a9c493173697bc31c40b1101dd 100644 --- a/app/design/frontend/Magento/blank/Magento_Theme/layout/default.xml +++ b/app/design/frontend/Magento/blank/Magento_Theme/layout/default.xml @@ -24,7 +24,7 @@ */ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <referenceContainer name="header.container"> <container name="header.panel.wrapper" htmlClass="panel wrapper" htmlTag="div" before="-" /> </referenceContainer> diff --git a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml index efad0e64b8af2fee282de64e828b853450737183..93ab2d6bee4d21622db8e024aac3342ebe8d9874 100644 --- a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml +++ b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <css src="css/styles.css" /> </head> diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less index 9cac5a97a0656a5d81c555fc13e85449529ddcaf..cf249d63ab343980395988fe1b46d837111483a7 100644 --- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less @@ -42,6 +42,7 @@ @addto-color: @text-color-muted; @addto-hover-color: @color-primary; +@minicart-icons-color: #8f8f8f; body { .css(background-color, @page-bg-color); @@ -60,6 +61,7 @@ body { &.content { padding-top: 10px; position: relative; + &:extend(.abstract-add-clearfix all); } } @@ -126,9 +128,9 @@ body { @footer-bg-color: false; .page-footer { - margin-top: 25px; - .css(background-color, @footer-bg-color); - } + margin-top: 25px; + .css(background-color, @footer-bg-color); +} .footer { &.content { @@ -280,7 +282,7 @@ body { } .no-display { - display: none; + &:extend(.abstract-no-display all); } // Calendar diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less index 15372373964911b94dda04b37d6750f1cedbfc68..7ab662f736630b4b245b0ef02917abd53792363d 100644 --- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less +++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/module.less @@ -29,6 +29,7 @@ } .product-info-main, +.product-options-bottom, .block-bundle-summary { .action.towishlist { &:extend(.abstract-action-addto-product all); diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index 8386cbafd9d0de7c9f4e0c5a9e79564a81297b48..caa85240e1270131c854acb5da5a39cf21289193 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/design/frontend/Magento/blank/theme.xml b/app/design/frontend/Magento/blank/theme.xml index feb7ace0aa1b62f95de20c69fdb7e80b391282d2..75644de5e446df97882a0954d3b4662af348c47a 100644 --- a/app/design/frontend/Magento/blank/theme.xml +++ b/app/design/frontend/Magento/blank/theme.xml @@ -24,7 +24,7 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento Blank</title> - <version>0.1.0-alpha98</version> + <version>0.1.0-alpha99</version> <media> <preview_image>media/preview.jpg</preview_image> </media> diff --git a/app/design/frontend/Magento/blank/web/css/source/abstract.less b/app/design/frontend/Magento/blank/web/css/source/abstract.less index 59159a88275f6b41bba7ecf2939f4904e9ea83a7..2ff5714d33662de6b5c39c0d82a0f2f8c93d1165 100644 --- a/app/design/frontend/Magento/blank/web/css/source/abstract.less +++ b/app/design/frontend/Magento/blank/web/css/source/abstract.less @@ -99,6 +99,17 @@ } } +// +// Reset image alignment in container +//-------------------------------------- +.abstract-reset-image-wrapper { + height: auto; + padding: 0!important; + .product-image-photo { + position: static; + } +} + // // Title for login blocks //-------------------------------------- @@ -145,6 +156,15 @@ } } +// +// Account pages: order table summary +//-------------------------------------- +.abstract-account-summary { + tr:first-child td { + border-top: @table-border-width @table-border-style @table-border-color; + } +} + // // Simple Dropdown //-------------------------------------- @@ -492,9 +512,9 @@ .price-including-tax, .price-excluding-tax, .weee { - white-space: nowrap; display: inline-block; .font-size(14); + white-space: nowrap; } .price-including-tax + .price-excluding-tax { display: inline-block; @@ -542,6 +562,62 @@ ); } +// +// Checkout shipping methods title +//-------------------------------------- +.abstract-methods-shipping-title { + .font-size(14); + margin: 20px 0 15px; + font-weight: @font-weight-bold; +} + +// +// Checkout order review price +//-------------------------------------- +.abstract-checkout-cart-price { +} + +// +// Checkout order product name +//-------------------------------------- +.abstract-checkout-product-name { +} + +// +// Checkout order product name +//-------------------------------------- +.abstract-product-items-summary { + td { + text-align: left; + } +} + +// +// Mobile checkout order product name +//-------------------------------------- +.responsive-smaller(@break) when (@break = @screen-m) { + .abstract-product-items-summary { + tbody { + .col { + padding: @indent-s-base 0 0; + &:last-child { + padding-bottom: @indent-s-base + } + } + } + tfoot { + .mark { + padding-bottom: @indent-xs-base; + text-align: left; + } + .amount { + padding-top: 0; + text-align: left; + } + } + } +} + // // Add colon //-------------------------------------- @@ -625,3 +701,10 @@ } } } + +// +// Abstract no display +//-------------------------------------- +.abstract-no-display { + display: none; +} diff --git a/app/design/frontend/Magento/plushe/composer.json b/app/design/frontend/Magento/plushe/composer.json index afab06c39758188917c22cce60bcd5c62a1e89b7..f4aaff551729f473dd79ef715865db3709486c88 100644 --- a/app/design/frontend/Magento/plushe/composer.json +++ b/app/design/frontend/Magento/plushe/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/theme-frontend-blank": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/theme-frontend-blank": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/design/frontend/Magento/plushe/theme.xml b/app/design/frontend/Magento/plushe/theme.xml index ae7f7d0b8f1324751b2b0461d0e3bfd215ee666f..8aa89616028ecfda9227a10e72d6d6cb61216e74 100644 --- a/app/design/frontend/Magento/plushe/theme.xml +++ b/app/design/frontend/Magento/plushe/theme.xml @@ -24,7 +24,7 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento Plushe</title> - <version>0.1.0-alpha98</version> + <version>0.1.0-alpha99</version> <parent>Magento/blank</parent> <media> <preview_image>media/preview.jpg</preview_image> diff --git a/app/design/install/Magento/basic/theme.xml b/app/design/install/Magento/basic/theme.xml index 2e347e2c16323c630adf479e6559de10682737dc..b62e26bf97f22e1ff8f105a01e7c801f26505bb6 100644 --- a/app/design/install/Magento/basic/theme.xml +++ b/app/design/install/Magento/basic/theme.xml @@ -24,5 +24,5 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento Basic</title> - <version>0.1.0-alpha98</version> + <version>0.1.0-alpha99</version> </theme> diff --git a/app/etc/di.xml b/app/etc/di.xml index 100b0b76a5c0b4d709d25fedc7d7110622c125d7..07f4a8f5bbac6cc5c4b74e84729c3753f01d4bf3 100644 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -421,7 +421,15 @@ <argument name="reader" xsi:type="object">Magento\Framework\Module\Declaration\Reader\Filesystem\Proxy</argument> </arguments> </type> - + <type name="Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container"> + <arguments> + <argument name="buckets" xsi:type="array"> + <item name="termBucket" xsi:type="object">Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Term</item> + <item name="rangeBucket" xsi:type="object">Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Range</item> + <item name="dynamicBucket" xsi:type="object">Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Dynamic</item> + </argument> + </arguments> + </type> <type name="Magento\Framework\View\Result\Page"> <arguments> <argument name="template" xsi:type="string">Magento_Theme::root.phtml</argument> diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/magento/de_de/composer.json index 062c3add97428645d9aadae2db6684c3eee85560..b225fb4e3caf991db510c89319a237c3bb7ad628 100644 --- a/app/i18n/magento/de_de/composer.json +++ b/app/i18n/magento/de_de/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-de_de", "description": "German (Germany) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/en_us/composer.json b/app/i18n/magento/en_us/composer.json index 576af7cda01ba1a6f9d1f6f18e4b911ed18e4f3d..cd4cf9d353ab0967a2b5f6f70a7485c06fb3b362 100644 --- a/app/i18n/magento/en_us/composer.json +++ b/app/i18n/magento/en_us/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-en_us", "description": "English (United States) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/es_es/composer.json b/app/i18n/magento/es_es/composer.json index d5702cc1f5dbea2b23ee7917c8f0d2ceefb4c546..ddbdcec4ccb0144acea7f340858dfee828898482 100644 --- a/app/i18n/magento/es_es/composer.json +++ b/app/i18n/magento/es_es/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-es_es", "description": "Spanish (Spain) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/fr_fr/composer.json b/app/i18n/magento/fr_fr/composer.json index 5d9c4962205e5a6cd80ea6cee91f684302c06d3c..bc518653e2d32d120bb684265d038c5378f4587e 100644 --- a/app/i18n/magento/fr_fr/composer.json +++ b/app/i18n/magento/fr_fr/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-fr_fr", "description": "French (France) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/nl_nl/composer.json b/app/i18n/magento/nl_nl/composer.json index c8c6d10ede64ebe02d167c31600972cd9a00c78c..67ab860c4ee6977e5bc23017751b969fe3f1acba 100644 --- a/app/i18n/magento/nl_nl/composer.json +++ b/app/i18n/magento/nl_nl/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-nl_nl", "description": "Dutch (Netherlands) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/pt_br/composer.json b/app/i18n/magento/pt_br/composer.json index 38f0b204123212eee040eb16a5060b193a23b141..20fe0dacdf504feffcc74209f396d04f3fcbe86d 100644 --- a/app/i18n/magento/pt_br/composer.json +++ b/app/i18n/magento/pt_br/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-pt_br", "description": "Portuguese (Brazil) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/zh_cn/composer.json b/app/i18n/magento/zh_cn/composer.json index 45f3b1ea226c9acc8fde8ab63d4c29c142aa813e..de4070246f781091ad7e720e49726970c517f1ef 100644 --- a/app/i18n/magento/zh_cn/composer.json +++ b/app/i18n/magento/zh_cn/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-zh_cn", "description": "Chinese (China) language", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "magento/framework": "0.1.0-alpha98", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/composer.json b/composer.json index ca94c7c2a83132a52fceb5bb93632ae46bc0c07a..717711d1f7c401b3ca18dca9d9903b2cad697cfb 100644 --- a/composer.json +++ b/composer.json @@ -2,12 +2,13 @@ "name": "magento/project-community-edition", "description": "Magento project (Community Edition)", "type": "project", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0", + "zendframework/zend-stdlib": "2.0.3" }, "require-dev": { - "phpunit/phpunit": "4.1.*" + "phpunit/phpunit": "4.1.0" }, "replace": { "magento/module-admin-notification": "self.version", @@ -76,6 +77,7 @@ "magento/module-rule": "self.version", "magento/module-sales": "self.version", "magento/module-sales-rule": "self.version", + "magento/module-search": "self.version", "magento/module-sendfriend": "self.version", "magento/module-shipping": "self.version", "magento/module-sitemap": "self.version", @@ -106,7 +108,6 @@ "magento/framework": "self.version", "magento/project-setup": "0.1.0", "zendframework/zend-eventmanager": "2.0.3", - "zendframework/zend-stdlib": "2.0.3", "zendframework/zend-di": "2.0.3", "zendframework/zend-escaper": "2.0.3", "zendframework/zend-i18n": "2.0.3", @@ -135,7 +136,6 @@ "extra": { "component_paths": { "zendframework/zend-eventmanager": "lib/internal/Zend/EventManager", - "zendframework/zend-stdlib": "lib/internal/Zend/Stdlib", "zendframework/zend-di": "lib/internal/Zend/Di", "zendframework/zend-escaper": "lib/internal/Zend/Escaper", "zendframework/zend-i18n": "lib/internal/Zend/I18n", diff --git a/dev/shell/cache.php b/dev/shell/cache.php new file mode 100644 index 0000000000000000000000000000000000000000..65e129bb1a8584fe6e185ebdfc6dfb1ece2396c0 --- /dev/null +++ b/dev/shell/cache.php @@ -0,0 +1,75 @@ +<?php +/** + * A CLI tool for managing Magento application caches + * + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Framework\App; + +use Magento\Framework\App\Cache\ManagerApp; + +require __DIR__ . '/../../app/bootstrap.php'; + +$usage = 'Usage: php -f cache.php -- [--' . ManagerApp::KEY_SET . '=1|0]' + . ' [--' . ManagerApp::KEY_CLEAN . ']' + . ' [--' . ManagerApp::KEY_FLUSH . ']' + . ' [--' . ManagerApp::KEY_TYPES . '=<type1>,<type2>,...]' + . ' [--bootstrap=<json>] + --' . ManagerApp::KEY_TYPES . ' - list of cache types, comma-separated. If omitted, all caches will be affected + --' . ManagerApp::KEY_SET . ' - enable or disable the specified cache types + --' . ManagerApp::KEY_CLEAN . ' - clean data of the specified cache types + --' . ManagerApp::KEY_FLUSH . ' - destroy all data in storage that the specified cache types reside on + --bootstrap - add or override parameters of the bootstrap' . PHP_EOL; +$longOpts = [ + ManagerApp::KEY_SET . '::', + ManagerApp::KEY_CLEAN, + ManagerApp::KEY_FLUSH, + ManagerApp::KEY_TYPES . '::', + 'bootstrap::' +]; +$opt = getopt('', $longOpts); +if (empty($opt)) { + echo $usage; +} + +try { + $params = $_SERVER; + if (isset($opt['bootstrap'])) { + $extra = json_decode($opt['bootstrap'], true); + if (!is_array($extra)) { + throw new \Exception("Unable to decode JSON in the parameter 'bootstrap'"); + } + $params = array_replace_recursive($params, $extra); + } + $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null; + $bootstrap = Bootstrap::create(BP, $params); + /** @var ManagerApp $app */ + $app = $bootstrap->createApplication('Magento\Framework\App\Cache\ManagerApp', ['request' => $opt]); + $bootstrap->run($app); + echo "Current status:\n"; + var_export($app->getStatusSummary()); + echo "\n"; +} catch (\Exception $e) { + echo $e; + exit(1); +} diff --git a/dev/shell/dependency.php b/dev/shell/dependency.php new file mode 100644 index 0000000000000000000000000000000000000000..e32a3fe583a1fe54877ad07ed47cec8d5d67a354 --- /dev/null +++ b/dev/shell/dependency.php @@ -0,0 +1,402 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +const KEY_COMPOSER_COMPONENT_TYPE = 'type'; +const KEY_COMPOSER_MAGENTO2_MODULE = 'magento2-module'; +const KEY_COMPOSER_REQUIRE = 'require'; +const KEY_COMPOSER_COMPONENT_NAME = 'name'; + +const KEY_MODULE_DIRECTORY_NAME = 'module_directory_name'; +const KEY_MODULE_DEPENDENT_MODULES = 'dependent_modules'; +const KEY_MODULE_NAME = 'name'; +const KEY_MODULE_COMPONENT = 'component'; + +const KEY_COMPONENT_MODULES = 'modules'; +const KEY_COMPONENT_NAME = 'name'; +const KEY_COMPONENT_DEPENDENCIES = 'dependencies'; +const KEY_COMPONENT_DEPENDENTS = 'dependents'; + +const KEY_MAGENTO_CORE_MODULE = 'magento/module-core'; + +$modules = []; +$componentsByName = []; + +define( + 'USAGE', + "Usage: php -f dependency.php -- [--list-modules] [--list-components][--list-component-dependencies component_name] + [--list-component-dependents component_name] [--list-module-dependencies module-name] + [--list module-dependents module-name] [--direct-dependency-only] + --help - print usage message + --list-modules - list all modules in order of module dependency + --list-components - list all components consisting of circularly dependent modules + --list-component-dependencies - list components that the specified component depends on + --list-component-dependents - list components that depends on the specified components + --list-module-dependencies - list modules that the specified module depends on + --list-module-dependents - list modules that depends on the specified module + --direct-dependency-only - only return direct dependencies + \n" +); +$opt = getopt( + '', + [ + 'help', + 'list-modules', + 'list-components', + 'list-component-dependencies:', + 'list-component-dependents:', + 'list-module-dependencies:', + 'list-module-dependents:', + 'direct-dependency-only', + ] +); + +if (empty($opt) || isset($opt['help'])) { + echo USAGE; +} + +initialize(); +$directDependenciesOnly = isset($opt['direct-dependency-only']) ? true : false; + +if (isset($opt['list-modules'])) { + $sortedComponents = topologicalSort($componentsByName); + $result = []; + foreach ($sortedComponents as $component) { + foreach ($componentsByName[$component][KEY_COMPONENT_MODULES] as $module) { + $result[] = $module; + } + } + echo json_encode($result, JSON_PRETTY_PRINT); +} elseif (isset($opt['list-components'])) { + $sortedComponents = topologicalSort($componentsByName); + $result = []; + foreach ($sortedComponents as $componentName) { + $component = ['name' => $componentName]; + foreach ($componentsByName[$componentName][KEY_COMPONENT_MODULES] as $module) { + $component['modules'][] = $module; + } + $result[] = $component; + } + echo json_encode($result, JSON_PRETTY_PRINT); +} elseif (isset($opt['list-component-dependencies'])) { + //Get components that the specified component depends on, directly or indirectly + $targetComponent = $opt['list-component-dependencies']; + if (!isset($componentsByName[$targetComponent])) { + die("Can't find specified component: " . $targetComponent . "\n"); + } + if ($directDependenciesOnly) { + $dependencies = $componentsByName[$targetComponent][KEY_COMPONENT_DEPENDENCIES]; + } else { + $dependencies = getComponentDependency($targetComponent, KEY_COMPONENT_DEPENDENCIES); + } + echo json_encode($dependencies, JSON_PRETTY_PRINT); +} elseif (isset($opt['list-component-dependents'])) { + //Get components that depends on the specified component, directly or indirectly + $targetComponent = $opt['list-component-dependents']; + if (!isset($componentsByName[$targetComponent])) { + die("Can't find specified component: " . $targetComponent . "\n"); + } + if ($directDependenciesOnly) { + $dependencies = $componentsByName[$targetComponent][KEY_COMPONENT_DEPENDENTS]; + } else { + $dependencies = getComponentDependency($targetComponent, KEY_COMPONENT_DEPENDENTS); + } + echo json_encode($dependencies, JSON_PRETTY_PRINT); +} elseif (isset($opt['list-module-dependents'])) { + //Get modules that depends on the specified module, directly or indirectly + $targetModule = $opt['list-module-dependents']; + $dependencies = []; + if (!isset($modules[$targetModule])) { + die("Can't find specified module: " . $targetModule . "\n"); + } + + if ($directDependenciesOnly) { + foreach ($modules as $module) { + if (in_array($targetModule, $module[KEY_MODULE_DEPENDENT_MODULES])) { + $dependencies[] = $module[KEY_MODULE_NAME]; + } + } + } else { + $selfComponentName = $modules[$targetModule][KEY_MODULE_COMPONENT]; + foreach ($componentsByName[$selfComponentName][KEY_COMPONENT_MODULES] as $module) { + if ($module != $targetModule) { + $dependencies[] = $module; + } + } + + $componentDependencies = getComponentDependency( + $selfComponentName, + KEY_COMPONENT_DEPENDENTS + ); + foreach ($componentDependencies as $component) { + foreach ($componentsByName[$component][KEY_COMPONENT_MODULES] as $module) { + if (!in_array($module, $dependencies)) { + $dependencies[] = $module; + } + } + } + } + echo json_encode($dependencies, JSON_PRETTY_PRINT); +} elseif (isset($opt['list-module-dependencies'])) { + //Get modules that depends on the specified module, directly or indirectly + $targetModule = $opt['list-module-dependencies']; + $dependencies = []; + if (!isset($modules[$targetModule])) { + die("Can't find specified module: " . $targetModule . "\n"); + } + + if ($directDependenciesOnly) { + $module = $modules[$targetModule]; + $dependencies = $module[KEY_MODULE_DEPENDENT_MODULES]; + } else { + $selfComponentName = $modules[$targetModule][KEY_MODULE_COMPONENT]; + foreach ($componentsByName[$selfComponentName][KEY_COMPONENT_MODULES] as $module) { + if ($module != $targetModule) { + $dependencies[] = $module; + } + } + + $componentDependencies = getComponentDependency( + $selfComponentName, + KEY_COMPONENT_DEPENDENCIES + ); + foreach ($componentDependencies as $component) { + foreach ($componentsByName[$component][KEY_COMPONENT_MODULES] as $module) { + if (!in_array($module, $dependencies)) { + $dependencies[] = $module; + } + } + } + } + echo json_encode($dependencies, JSON_PRETTY_PRINT); +} + +/** + * For a given component, return a list of components that depend on the component or a list of components + * that the given component depends on + * + * @param string $component + * @param string $direction + * @return array + */ +function getComponentDependency($component, $direction) +{ + global $componentsByName; + $dependencies = []; + $queue = []; + + foreach ($componentsByName[$component][$direction] as $componentName) { + $dependencies[] = $componentName; + $queue[] = $componentName; + } + + while (!empty($queue)) { + $head = array_shift($queue); + $headComponent = $componentsByName[$head]; + foreach ($headComponent[$direction] as $componentName) { + if (!in_array($componentName, $dependencies)) { + $dependencies[] = $componentName; + $queue[] = $componentName; + } + } + } + + return $dependencies; +} + +/** + * initialize the component and module dependency + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.NPathComplexity) + * @return void + */ +function initialize() +{ + global $modules, $componentsByName; + $baseDir = "../../"; + $fileNames = glob($baseDir . "app/code/Magento/*/composer.json"); + + foreach ($fileNames as $fileName) { + $moduleDirectoryName = basename(dirname($fileName)); + $content = json_decode(file_get_contents($fileName), true); + if ($content[KEY_COMPOSER_COMPONENT_TYPE] != KEY_COMPOSER_MAGENTO2_MODULE) { + continue; + } + $dependentModules = []; + $dependencies = $content[KEY_COMPOSER_REQUIRE]; + foreach (array_keys($dependencies) as $name) { + $dependentModules[$name] = $name; + } + $moduleName = $content[KEY_COMPOSER_COMPONENT_NAME]; + $modules[$moduleName] = [ + KEY_MODULE_DIRECTORY_NAME => $moduleDirectoryName, + KEY_MODULE_DEPENDENT_MODULES => $dependentModules, + KEY_MODULE_NAME => $moduleName, + ]; + } + + //going through the array one more time to clean up the content, remove the dependencies that are not module + foreach ($modules as &$module) { + $dependentModules = []; + foreach ($module[KEY_MODULE_DEPENDENT_MODULES] as $dependentModuleName) { + if (isset($modules[$dependentModuleName])) { + $dependentModules[$dependentModuleName] = $dependentModuleName; + } + } + $module[KEY_MODULE_DEPENDENT_MODULES] = $dependentModules; + } + + //Group strongly connected modules as components + $components = identifyComponents($modules); + + foreach ($components as &$component) { + if (count($component[KEY_COMPONENT_MODULES]) == 1) { + $component[KEY_COMPONENT_NAME] = $component[KEY_COMPONENT_MODULES][0]; + $modules[$component[KEY_COMPONENT_MODULES][0]][KEY_MODULE_COMPONENT] = $component[KEY_COMPONENT_NAME]; + } elseif (in_array(KEY_MAGENTO_CORE_MODULE, $component[KEY_COMPONENT_MODULES])) { + $component[KEY_COMPONENT_NAME] = KEY_MAGENTO_CORE_MODULE; + } else { + $component[KEY_COMPONENT_NAME] = implode(':', $component[KEY_COMPONENT_MODULES]); + } + foreach ($component[KEY_COMPONENT_MODULES] as $moduleName) { + $modules[$moduleName][KEY_MODULE_COMPONENT] = $component[KEY_COMPONENT_NAME]; + } + $componentsByName[$component[KEY_COMPONENT_NAME]] = $component; + } + + //Process dependency between components + foreach ($componentsByName as $name => &$component) { + foreach ($component[KEY_COMPONENT_MODULES] as $moduleName) { + foreach ($modules[$moduleName][KEY_MODULE_DEPENDENT_MODULES] as $dependentModule) { + $dependentComponent = $modules[$dependentModule][KEY_MODULE_COMPONENT]; + + if ($dependentComponent != $component[KEY_COMPONENT_NAME]) { + $component[KEY_COMPONENT_DEPENDENCIES][$dependentComponent] = + $dependentComponent; + $componentsByName[$dependentComponent][KEY_COMPONENT_DEPENDENTS][$component[KEY_COMPONENT_NAME]] = + $component[KEY_COMPONENT_NAME]; + } + } + } + } + foreach ($componentsByName as &$component) { + if (!isset($component[KEY_COMPONENT_DEPENDENTS])) { + $component[KEY_COMPONENT_DEPENDENTS] = []; + } + if (!isset($component[KEY_COMPONENT_DEPENDENCIES])) { + $component[KEY_COMPONENT_DEPENDENCIES] = []; + } + } +} + +/** + * For a given acyclic graph of components, sort the components according to the dependencies so that components + * can only depend on components with lower index + * + * @param array $components + * @return array + */ +function topologicalSort($components) +{ + $sortedComponents = []; + $rootComponents = []; + foreach ($components as $component) { + if (empty($component[KEY_COMPONENT_DEPENDENCIES])) { + $rootComponents[] = $component; + } + } + + while (!empty($rootComponents)) { + $rootComponent = array_shift($rootComponents); + $sortedComponents[] = $rootComponent[KEY_COMPONENT_NAME]; + + foreach ($rootComponent[KEY_COMPONENT_DEPENDENTS] as $componentName) { + unset($components[$componentName][KEY_COMPONENT_DEPENDENCIES][$rootComponent[KEY_COMPONENT_NAME]]); + if (empty($components[$componentName][KEY_COMPONENT_DEPENDENCIES])) { + $rootComponents[] = $components[$componentName]; + } + } + } + + return $sortedComponents; +} + +/** + * Identify components in the dependency graph using Tarjan algorithm. Modules that circularly depend on each other + * are grouped into components. Modules that are not in a cyclic graph are grouped into component of its own + * + * @param array $modules + * @return array + */ +function identifyComponents($modules) +{ + $index = 0; + $stack = []; + $components = []; + + foreach ($modules as &$module) { + if (!isset($module['index'])) { + identifyComponent($modules, $module, $stack, $index, $components); + } + } + + return $components; +} + +/** + * Recursive function to identify one component + * + * @param array $modules + * @param array $module + * @param array $stack + * @param int $index + * @param array $components + * @return void + */ +function identifyComponent(&$modules, &$module, &$stack, &$index, &$components) +{ + $module['index'] = $index; + $module['lowlink'] = $index; + $index++; + $stack[] = $module[KEY_MODULE_NAME]; + + foreach ($module[KEY_MODULE_DEPENDENT_MODULES] as $dependentModuleName) { + $dependentModule = &$modules[$dependentModuleName]; + if (!isset($dependentModule['index'])) { + identifyComponent($modules, $dependentModule, $stack, $index, $components); + $module['lowlink'] = min($module['lowlink'], $dependentModule['lowlink']); + } elseif (in_array($dependentModuleName, $stack)) { + $module['lowlink'] = min($module['lowlink'], $dependentModule['index']); + } + } + + if ($module['lowlink'] == $module['index']) { + $component = []; + do { + $moduleName = array_pop($stack); + $component[KEY_COMPONENT_MODULES][] = $moduleName; + } while ($moduleName != $module[KEY_MODULE_NAME]); + $components[] = $component; + } +} diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore index b2e71ed25e12f2ea4f257233b7bbf14719473a56..e559b0dd179abcdf7b4e66256b98d1da6810c6a5 100755 --- a/dev/tests/functional/.gitignore +++ b/dev/tests/functional/.gitignore @@ -4,6 +4,4 @@ /var /config/* !/config/*.dist -tests/app/Magento/*/Test/Page/*/*.php -tests/app/Magento/*/Test/Page/*.php phpunit.xml diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php index f3a9202afcee87cb99386d94a316064eee926a90..3fc34483bc74e339546f3d07af38d2d6df40826f 100644 --- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php +++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php @@ -36,7 +36,7 @@ abstract class AbstractFactory protected $type = ''; protected $cnt = 0; - + protected $factoryContent = ''; protected $_checkList = []; @@ -160,11 +160,10 @@ abstract class AbstractFactory $items = []; $rewrites = []; - $fallbacks = array( - array( - 'path' => 'tests/app' - ) - ); + $fallbacks = [ + ['path' => 'tests/app'], + ['path' => 'generated'], + ]; while ($fallback = array_pop($fallbacks)) { $path = isset($fallback['path']) ? $fallback['path'] : ''; @@ -179,7 +178,7 @@ abstract class AbstractFactory if (!is_dir($filePath)) { $this->_processItem($items, $rewrites, $filePath, $location, $path); } else { - $dirIterator = new \RegexIterator( + $dirIterator = new \RegexIterator( new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($filePath, \FilesystemIterator::SKIP_DOTS) ), @@ -248,7 +247,7 @@ abstract class AbstractFactory $items[$original]['fallback'][$className]['class'] = $className; } - $rewrites[$className] = & $items[$original]['fallback'][$className]; + $rewrites[$className] = &$items[$original]['fallback'][$className]; if (isset($items[$className])) { unset($items[$className]); @@ -267,7 +266,7 @@ abstract class AbstractFactory $rewrites[$original]['fallback'][$className]['class'] = $className; } - $rewrites[$className] = & $rewrites[$original]['fallback'][$className]; + $rewrites[$className] = &$rewrites[$original]['fallback'][$className]; if (isset($items[$className])) { unset($items[$className]); @@ -280,7 +279,7 @@ abstract class AbstractFactory $items[$original]['fallback'][$className]['class'] = $className; } - $rewrites[$className] = & $items[$original]['fallback'][$className]; + $rewrites[$className] = &$items[$original]['fallback'][$className]; if (isset($items[$className])) { unset($items[$className]); diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php index 76d6fb16a12696d47fa3e788d7a737ca1050ce5e..ecaa287d4edbf0b6b70cbf24b4a0465c78b4ad75 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php @@ -192,6 +192,20 @@ abstract class Grid extends Block */ protected $loader = '[data-role="spinner"]'; + /** + * Locator for next page action + * + * @var string + */ + protected $actionNextPage = '.pager .action-next'; + + /** + * Locator for disabled next page action + * + * @var string + */ + protected $actionNextPageDisabled = '.pager .action-next.disabled'; + /** * Get backend abstract block * @@ -393,6 +407,30 @@ abstract class Grid extends Block return $this->_rootElement->find($location, Locator::SELECTOR_XPATH); } + /** + * Get rows data + * + * @param array $columns + * @return array + */ + public function getRowsData(array $columns) + { + $data = []; + do { + $rows = $this->_rootElement->find($this->rowItem)->getElements(); + foreach ($rows as $row) { + $rowData = []; + foreach ($columns as $columnName) { + $rowData[$columnName] = trim($row->find('.col-' . $columnName)->getText()); + } + + $data[] = $rowData; + } + } while ($this->nextPage()); + + return $data; + } + /** * Check if specific row exists in grid * @@ -436,4 +474,19 @@ abstract class Grid extends Block $button->click(); } } + + /** + * Click to next page action link + * + * @return bool + */ + protected function nextPage() + { + if ($this->_rootElement->find($this->actionNextPageDisabled)->isVisible()) { + return false; + } + $this->_rootElement->find($this->actionNextPage)->click(); + $this->waitLoader(); + return true; + } } diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php index 53eb2373b89777e523b5c2f1ecc64f1b82609d57..7908bd66a94f50d5bd7a93c1e30b578cc9cbfc51 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php @@ -50,6 +50,13 @@ class View extends \Magento\Catalog\Test\Block\Product\View */ protected $bundleBlock = '//*[@id="product-options-wrapper"]//fieldset[contains(@class,"bundle")]'; + /** + * Selector for visible bundle options block + * + * @var string + */ + protected $visibleOptions = '//*[@class="product-add-form"][contains(@style,"block")]'; + /** * Get bundle options block * @@ -113,6 +120,13 @@ class View extends \Magento\Catalog\Test\Block\Product\View if (!$this->getBundleBlock()->isVisible()) { $this->_rootElement->find($this->customizeButton)->click(); } + $element = $this->_rootElement; + $this->_rootElement->waitUntil( + function () use ($element) { + $bundleOptionsBlock = $element->find($this->visibleOptions, Locator::SELECTOR_XPATH); + return $bundleOptionsBlock->isVisible() ? true : null; + } + ); $this->getBundleBlock()->fillBundleOptions($bundleCheckoutData); parent::fillOptions($product); diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php index e4ff9e0ad53b8ef25923507ef4078e2c190e64f6..740b0f1c53d4d26877d87d5f6993a74e7761bc59 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php @@ -73,9 +73,6 @@ class BundleProduct extends InjectableFixture $dataSet = '', $persist = false ) { - if (!isset($data['url_key']) && isset($data['name'])) { - $data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $data['name'])), '-'); - } parent::__construct( $configuration, $repositoryFactory, @@ -86,6 +83,9 @@ class BundleProduct extends InjectableFixture $dataSet, $persist ); + if (!isset($this->data['url_key']) && isset($this->data['name'])) { + $this->data['url_key'] = trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $this->data['name'])), '-'); + } } protected $dataConfig = [ @@ -577,7 +577,7 @@ class BundleProduct extends InjectableFixture 'is_required' => '0', 'default_value' => '', 'input' => 'text', - 'group' => 'autosettings' + 'group' => 'search-engine-optimization' ]; protected $url_path = [ diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml index 313e142623b0ab4a835b01048447e5a11cb1201c..446c8c679c2f5c2f35a1a974e1c2ba201b2e7ae5 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml @@ -384,6 +384,7 @@ <is_required>0</is_required> <default_value></default_value> <input>text</input> + <group>search-engine-optimization</group> </url_key> <url_path> <attribute_code>url_path</attribute_code> diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php index ddd757646f6ea29b1c4fed984bc9289e8b2162e3..9acf53df98d599f3020c32c5cbaea7801baf18b2 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php @@ -170,10 +170,10 @@ class Price implements FixtureInterface 'price_to' => '120.00', 'cart_price' => '317.00' ], - 'fixed-126' => [ + 'fixed-159' => [ 'price_from' => '115.00', 'price_to' => '120.00', - 'cart_price' => '126.00' + 'cart_price' => '159.00' ], 'fixed-15' => [ 'price_from' => '15.00', diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php index 8a2eb10a7b3c6ec4b7f8e955d2e9633fc1bb0a3e..6c0751b4b70d5d5848267267418916c98ffb5f33 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php @@ -72,7 +72,9 @@ class Item extends \Magento\Catalog\Test\Fixture\Cart\Item $bundleOptions = $bundleSelection['bundle_options'][$attributeKey]; $value = $bundleSelectionAttribute[$optionKey]->getName(); $qty = $bundleOptions['assigned_products'][$optionKey]['data']['selection_qty']; - $price = number_format($bundleSelectionAttribute[$optionKey]->getPrice(), 2); + $price = $product->getPriceType() == 'Dynamic' + ? number_format($bundleSelectionAttribute[$optionKey]->getPrice(), 2) + : number_format($bundleOptions['assigned_products'][$optionKey]['data']['selection_price_value'], 2); $optionData = [ 'title' => $checkoutOption['title'], 'value' => "{$qty} x {$value} {$price}" diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv index 6a5c159441c00208e5a0cf42786cadc1f1b8d030..f30fdc9c2673f0185f3926686dc2b7ffa2136a76 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv @@ -1,15 +1,15 @@ "product/data/name";"product/data/sku_type";"product/data/sku";"product/data/status";"product/data/price_type";"product/data/price/value";"product/data/price/preset";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/is_in_stock";"product/data/weight_type";"product/data/weight";"product/data/category";"product/data/description";"product/data/group_price/preset";"product/data/special_price";"product/data/special_from_date/pattern";"product/data/special_to_date/pattern";"product/data/tier_price/preset";"product/data/price_view";"product/data/stock_data/use_config_manage_stock";"product/data/stock_data/manage_stock";"product/data/shipment_type";"product/data/bundle_selections/preset";"product/data/bundle_selections/products";"product/data/checkout_data/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"product/data/use_config_gift_message_available";"product/data/gift_message_available";"constraint";"issue" "BundleProduct %isolation%";"-";"bundle_sku_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Bundle Product Dynamic Required";"-";"-";"-";"-";"-";"-";"No";"No";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage";"" "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product offline";"Dynamic";"-";"-";"-";"Out of Stock";"Dynamic";"-";"category_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Separately";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductNotSearchableBySku";"" -"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"Product online";"Dynamic";"-";"dynamic-200";"-";"In Stock";"Dynamic";"-";"category_%isolation%";"Bundle Product Dynamic";"-";"-";"-";"-";"-";"Price Range";"-";"-";"Together";"all_types_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType";"" +"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"Product online";"Dynamic";"-";"dynamic-200";"-";"In Stock";"Dynamic";"-";"category_%isolation%";"Bundle Product Dynamic";"-";"-";"-";"-";"-";"Price Range";"-";"-";"Together";"all_types_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType";"Bug: MAGETWO-26969" "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"-";"Fixed";"10";"fixed-15";"None";"-";"Fixed";"10";"-";"Bundle Product Fixed Required";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage";"" "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"100";"fixed-24";"Taxable Goods";"In Stock";"Fixed";"10";"category_%isolation%";"Bundle Product Fixed";"default";"-";"-";"-";"-";"As Low as";"-";"-";"Separately";"all_types_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType";"Bug: MAGETWO-26969" "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"10";"fixed-1";"Taxable Goods";"Out of Stock";"Fixed";"10";"category_%isolation%";"-";"-";"10";"m/d/Y";"m/d/Y +3 days";"-";"Price Range";"No";"Yes";"Together";"with_not_required_options";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"with_not_required_options";"-";"-";"Catalog";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView";"Bug: MAGETWO-26980" -"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage";"" +"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage";"Bug: MAGETWO-28914" "Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-8";"-";"-";"-";"-";"-";"-";"-";"20";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory";"" "Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";"" "Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";"" -"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_1";"drop_down_with_one_option_fixed_price";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage";"" -"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-126";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";"" +"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_1";"drop_down_with_one_option_fixed_price";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage";"Bug: MAGETWO-28905, MAGETWO-28913" +"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-159";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";"" "Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage";"" "Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage";"" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php new file mode 100644 index 0000000000000000000000000000000000000000..0436f7ee5c117be67c2f75f20aa8aa82140fb4ad --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php @@ -0,0 +1,55 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit; + +use Magento\Backend\Test\Block\FormPageActions; + +/** + * Class PageActions + * Category page actions + */ +class PageActions extends FormPageActions +{ + /** + * Locator for "OK" button in warning block + * + * @var string + */ + protected $warningBlock = '.ui-widget-content .ui-dialog-buttonset button:first-child'; + + /** + * Click on "Save" button + * + * @return void + */ + public function save() + { + $this->_rootElement->find($this->saveButton)->click(); + $warningBlock = $this->browser->find($this->warningBlock); + if ($warningBlock->isVisible()) { + $warningBlock->click(); + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php new file mode 100644 index 0000000000000000000000000000000000000000..295334a47e3c83f2a351f181e5c08e5b109cd7b1 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php @@ -0,0 +1,92 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab; + +use Mtf\Client\Element; +use Magento\Backend\Test\Block\Widget\Tab; +use Magento\Backend\Test\Block\Widget\Grid; + +/** + * Class AbstractRelated + * Base class for related products tab + */ +abstract class AbstractRelated extends Tab +{ + /** + * Type related products + * + * @var string + */ + protected $relatedType = ''; + + /** + * Select related products + * + * @param array $data + * @param Element|null $element + * @return $this + */ + public function fillFormTab(array $data, Element $element = null) + { + if (isset($data[$this->relatedType]['value'])) { + $context = $element ? $element : $this->_rootElement; + $relatedBlock = $this->getRelatedGrid($context); + + foreach ($data[$this->relatedType]['value'] as $product) { + $relatedBlock->searchAndSelect(['sku' => $product['sku']]); + } + } + + return $this; + } + + /** + * Get data of tab + * + * @param array|null $fields + * @param Element|null $element + * @return array + */ + public function getDataFormTab($fields = null, Element $element = null) + { + $relatedBlock = $this->getRelatedGrid($element); + $columns = [ + 'entity_id', + 'name', + 'sku', + ]; + $relatedProducts = $relatedBlock->getRowsData($columns); + + return [$this->relatedType => $relatedProducts]; + } + + /** + * Return related products grid + * + * @param Element $element + * @return Grid + */ + abstract protected function getRelatedGrid(Element $element = null); +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php index 3f197b91ebb8a72ad7242e65c268d15daaf52ef3..f740e4ff35daef6a5f7fd63b4b950f057601c1da 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php @@ -26,37 +26,40 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab; use Mtf\Client\Element; -use Magento\Backend\Test\Block\Widget\Tab; -use Mtf\Factory\Factory; +use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell\Grid as CrosssellGrid; /** * Class Crosssell - * Cross-sell Tab + * Cross-sells Tab */ -class Crosssell extends Tab +class Crosssell extends AbstractRelated { - const GROUP = 'crosssells'; + /** + * Related products type + * + * @var string + */ + protected $relatedType = 'cross_sell_products'; + + /** + * Locator for cross sell products grid + * + * @var string + */ + protected $crossSellGrid = '#cross_sell_product_grid'; /** - * Select cross-sells products + * Return cross sell products grid * - * @param array $products - * @param Element|null $context - * @return $this + * @param Element|null $element [optional] + * @return CrosssellGrid */ - public function fillFormTab(array $products, Element $context = null) + protected function getRelatedGrid(Element $element = null) { - if (!isset($products['crosssell_products'])) { - return $this; - } - $element = $context ? : $this->_rootElement; - $crossSellBlock = Factory::getBlockFactory()->getMagentoCatalogAdminhtmlProductEditTabCrosssellGrid( - $element->find('#cross_sell_product_grid') + $element = $element ? $element : $this->_rootElement; + return $this->blockFactory->create( + '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell\Grid', + ['element' => $element->find($this->crossSellGrid)] ); - foreach ($products['crosssell_products']['value'] as $product) { - $crossSellBlock->searchAndSelect($product); - } - - return $this; } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell/Grid.php index ddff4890daad6410cb3b79b755858403bcb15874..13685001b94c61734aa70d96c700522cd176f9a5 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell/Grid.php @@ -24,11 +24,12 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell; -use Mtf\Client\Element; -use Mtf\Factory\Factory; -use Mtf\Client\Element\Locator; use Magento\Backend\Test\Block\Widget\Grid as GridInterface; +/** + * Class Grid + * Cross sell products grid + */ class Grid extends GridInterface { /** @@ -36,16 +37,16 @@ class Grid extends GridInterface * * @var array */ - protected $filters = array( - 'name' => array( - 'selector' => '#cross_sell_product_grid_filter_name' - ), - 'sku' => array( - 'selector' => '#cross_sell_product_grid_filter_sku' - ), - 'type' => array( - 'selector' => '#cross_sell_product_grid_filter_type', + protected $filters = [ + 'name' => [ + 'selector' => 'input[name="name"]' + ], + 'sku' => [ + 'selector' => 'input[name="sku"]' + ], + 'type' => [ + 'selector' => 'select[name="type"]', 'input' => 'select' - ) - ); + ] + ]; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php index 27e9304a6d70a0bf3cebfbb3d9a06a3b237aadfc..7d4b8fc0e572e4b4700c927cdf615ce44f896819 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php @@ -26,37 +26,40 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab; use Mtf\Client\Element; -use Mtf\Factory\Factory; -use Magento\Backend\Test\Block\Widget\Tab; +use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid as RelatedGrid; /** * Class Related * Related Tab */ -class Related extends Tab +class Related extends AbstractRelated { - const GROUP = 'related-products'; + /** + * Related products type + * + * @var string + */ + protected $relatedType = 'related_products'; + + /** + * Locator for related products grid + * + * @var string + */ + protected $relatedGrid = '#related_product_grid'; /** - * Select related products + * Return related products grid * - * @param array $products - * @param Element|null $context - * @return $this + * @param Element|null $element [optional] + * @return RelatedGrid */ - public function fillFormTab(array $products, Element $context = null) + protected function getRelatedGrid(Element $element = null) { - if (!isset($products['related_products'])) { - return $this; - } - $element = $context ? : $this->_rootElement; - $relatedBlock = Factory::getBlockFactory()->getMagentoCatalogAdminhtmlProductEditTabRelatedGrid( - $element->find('#related_product_grid') + $element = $element ? $element : $this->_rootElement; + return $this->blockFactory->create( + '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid', + ['element' => $element->find($this->relatedGrid)] ); - foreach ($products['related_products']['value'] as $product) { - $relatedBlock->searchAndSelect($product); - } - - return $this; } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related/Grid.php index 8d3ece7dec9d0e6dffc03e2524bdcced6895f1f4..469fe1586569222b38ba887d6aecb348a71622e5 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related/Grid.php @@ -24,38 +24,29 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related; -use Mtf\Client\Element; -use Mtf\Factory\Factory; -use Mtf\Client\Element\Locator; use Magento\Backend\Test\Block\Widget\Grid as GridInterface; +/** + * Class Grid + * Related products grid + */ class Grid extends GridInterface { - protected $filters = array( - 'name' => array( - 'selector' => '#related_product_grid_filter_name' - ), - 'sku' => array( - 'selector' => '#related_product_grid_filter_sku' - ), - 'type' => array( - 'selector' => '#related_product_grid_filter_type', - 'input' => 'select' - ) - ); - /** - * @param array $filter + * Grid fields map + * + * @var array */ - public function searchAndSelect(array $filter) - { - $element = $this->_rootElement; - $resetButton = $this->resetButton; - $this->_rootElement->waitUntil( - function () use ($element, $resetButton) { - return $element->find($resetButton)->isVisible() ? true : null; - } - ); - parent::searchAndSelect($filter); - } + protected $filters = [ + 'name' => [ + 'selector' => 'input[name="name"]' + ], + 'sku' => [ + 'selector' => 'input[name="sku"]' + ], + 'type' => [ + 'selector' => 'select[name="type"]', + 'input' => 'select' + ] + ]; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php index 79464bf426e9f788df725b7cb3facff0abc9c775..213c935aa9b3d6ea2e5a17c54505f0647262ff1e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php @@ -26,37 +26,40 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab; use Mtf\Client\Element; -use Magento\Backend\Test\Block\Widget\Tab; -use Mtf\Factory\Factory; +use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid as UpsellGrid; /** * Class Upsell - * Upsell Tab + * Up-sells Tab */ -class Upsell extends Tab +class Upsell extends AbstractRelated { - const GROUP = 'upsells'; + /** + * Related products type + * + * @var string + */ + protected $relatedType = 'up_sell_products'; + + /** + * Locator for cross sell products grid + * + * @var string + */ + protected $crossSellGrid = '#up_sell_product_grid'; /** - * Select up-sell products + * Return related products grid * - * @param array $products - * @param Element|null $context - * @return $this + * @param Element|null $element [optional] + * @return UpsellGrid */ - public function fillFormTab(array $products, Element $context = null) + protected function getRelatedGrid(Element $element = null) { - if (!isset($products['upsell_products'])) { - return $this; - } - $element = $context ? : $this->_rootElement; - $upSellBlock = Factory::getBlockFactory()->getMagentoCatalogAdminhtmlProductEditTabUpsellGrid( - $element->find('#up_sell_product_grid') + $element = $element ? $element : $this->_rootElement; + return $this->blockFactory->create( + '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid', + ['element' => $element->find($this->crossSellGrid)] ); - foreach ($products['upsell_products']['value'] as $product) { - $upSellBlock->searchAndSelect($product); - } - - return $this; } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell/Grid.php index 9c0e8025f5941fe7a2fe040844953e668816fa14..59f7ba35e6d065194d80a7376cae14b9def3f2c0 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell/Grid.php @@ -24,38 +24,29 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell; -use Mtf\Client\Element; -use Mtf\Factory\Factory; -use Mtf\Client\Element\Locator; use Magento\Backend\Test\Block\Widget\Grid as GridInterface; +/** + * Class Grid + * Related up sell products grid + */ class Grid extends GridInterface { - protected $filters = array( - 'name' => array( - 'selector' => '#up_sell_product_grid_filter_name' - ), - 'sku' => array( - 'selector' => '#up_sell_product_grid_filter_sku' - ), - 'type' => array( - 'selector' => '#up_sell_product_grid_filter_type', - 'input' => 'select' - ) - ); - /** - * @param array $filter + * Grid fields map + * + * @var array */ - public function searchAndSelect(array $filter) - { - $element = $this->_rootElement; - $resetButton = $this->resetButton; - $this->_rootElement->waitUntil( - function () use ($element, $resetButton) { - return $element->find($resetButton)->isVisible() ? true : null; - } - ); - parent::searchAndSelect($filter); - } + protected $filters = [ + 'name' => [ + 'selector' => 'input[name="name"]' + ], + 'sku' => [ + 'selector' => 'input[name="sku"]' + ], + 'type' => [ + 'selector' => 'select[name="type"]', + 'input' => 'select' + ] + ]; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php index b3e903278f156904b0dd6f0a219c0c0e305ceb1e..92061c60d8980f06e3b676da09a47c3d939a5854 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php @@ -112,6 +112,13 @@ class ProductForm extends FormTabs */ protected $createCategoryButton = '//button[contains(@class,"action-create")]'; + /** + * Tabs title css selector + * + * @var string + */ + protected $tabsTitle = '#product_info_tabs-basic [data-role="title"]'; + /** * Fill the product form * @@ -176,6 +183,7 @@ class ProductForm extends FormTabs $this->_rootElement->find($this->advancedSettingTrigger)->click(); $this->waitForElementVisible($this->advancedSettingContent); } + $this->_rootElement->find($this->tabsTitle)->click(); } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php new file mode 100644 index 0000000000000000000000000000000000000000..d823c6d335d681d822da41939bc577f4bba31746 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\Constraint; + +use Mtf\Client\Browser; +use Mtf\Constraint\AbstractConstraint; +use Magento\Catalog\Test\Fixture\CatalogCategory; + +/** + * Class AssertCategoryRedirect + * Assert that old Category URL lead to appropriate Category in frontend + */ +class AssertCategoryRedirect extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that old Category URL lead to appropriate Category in frontend + * + * @param CatalogCategory $category + * @param Browser $browser + * @param CatalogCategory $initialCategory + * @return void + */ + public function processAssert(CatalogCategory $category, Browser $browser, CatalogCategory $initialCategory) + { + $browser->open($_ENV['app_frontend_url'] . $initialCategory->getUrlKey() . '.html'); + + \PHPUnit_Framework_Assert::assertEquals( + $browser->getUrl(), + $_ENV['app_frontend_url'] . strtolower($category->getUrlKey()) . '.html', + 'URL rewrite category redirect false.' + ); + } + + /** + * URL rewrite category redirect success + * + * @return string + */ + public function toString() + { + return 'URL rewrite category redirect success.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php index fd2acc9b17c8774c757d74b36c734137b1ec1fad..033806e9191f5b7d35bead51e81d62277a78b08c 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php @@ -24,15 +24,16 @@ namespace Magento\Catalog\Test\Constraint; +use Mtf\Client\Browser; use Mtf\Constraint\AbstractConstraint; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; -use Magento\Cms\Test\Page\CmsIndex; -use Magento\Catalog\Test\Page\Category\CatalogCategoryView; -use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Checkout\Test\Page\CheckoutCart; +use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Mtf\Fixture\InjectableFixture; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; /** * Class AssertCrossSellsProductsSection + * Assert that product is displayed in cross-sell section */ class AssertCrossSellsProductsSection extends AbstractConstraint { @@ -46,33 +47,33 @@ class AssertCrossSellsProductsSection extends AbstractConstraint /** * Assert that product is displayed in cross-sell section * - * @param CatalogProductSimple $product1 - * @param CatalogProductSimple $product2 - * @param CmsIndex $cmsIndex - * @param CatalogCategoryView $catalogCategoryView - * @param CatalogProductView $catalogProductView + * @param Browser $browser * @param CheckoutCart $checkoutCart + * @param CatalogProductSimple $product + * @param CatalogProductView $catalogProductView + * @param InjectableFixture[] $relatedProducts * @return void */ public function processAssert( - CatalogProductSimple $product1, - CatalogProductSimple $product2, - CmsIndex $cmsIndex, - CatalogCategoryView $catalogCategoryView, + Browser $browser, + CheckoutCart $checkoutCart, + CatalogProductSimple $product, CatalogProductView $catalogProductView, - CheckoutCart $checkoutCart + array $relatedProducts ) { - $categoryName = $product1->getCategoryIds()[0]; $checkoutCart->open(); $checkoutCart->getCartBlock()->clearShoppingCart(); - $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); - $catalogCategoryView->getListProductBlock()->openProductViewPage($product1->getName()); - $catalogProductView->getViewBlock()->addToCart($product1); - \PHPUnit_Framework_Assert::assertTrue( - $checkoutCart->getCrosssellBlock()->verifyProductCrosssell($product2), - 'Product \'' . $product2->getName() . '\' is absent in cross-sell section.' - ); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + $catalogProductView->getViewBlock()->addToCart($product); + $errors = []; + foreach ($relatedProducts as $relatedProduct) { + if (!$checkoutCart->getCrosssellBlock()->verifyProductCrosssell($relatedProduct)) { + $errors[] = 'Product \'' . $relatedProduct->getName() . '\' is absent in cross-sell section.'; + } + } + + \PHPUnit_Framework_Assert::assertEmpty($errors, implode(" ", $errors)); } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php index 38a422f7f501fca09316224494e492cbb8933d9d..2e8d7482c47d4e282baefa84e2f1e544fecc4f56 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php @@ -24,15 +24,16 @@ namespace Magento\Catalog\Test\Constraint; +use Mtf\Client\Browser; use Mtf\Constraint\AbstractConstraint; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; -use Magento\Cms\Test\Page\CmsIndex; -use Magento\Catalog\Test\Page\Category\CatalogCategoryView; -use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Checkout\Test\Page\CheckoutCart; +use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Mtf\Fixture\InjectableFixture; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; /** * Class AssertNoCrossSellsProductsSection + * Assert that product is not displayed in cross-sell section */ class AssertNoCrossSellsProductsSection extends AbstractConstraint { @@ -46,33 +47,31 @@ class AssertNoCrossSellsProductsSection extends AbstractConstraint /** * Assert that product is not displayed in cross-sell section * - * @param CatalogProductSimple $product1 - * @param CatalogProductSimple $product2 - * @param CmsIndex $cmsIndex - * @param CatalogCategoryView $catalogCategoryView + * @param Browser $browser + * @param CatalogProductSimple $product + * @param InjectableFixture[] $relatedProducts * @param CatalogProductView $catalogProductView * @param CheckoutCart $checkoutCart * @return void */ public function processAssert( - CatalogProductSimple $product1, - CatalogProductSimple $product2, - CmsIndex $cmsIndex, - CatalogCategoryView $catalogCategoryView, + Browser $browser, + CatalogProductSimple $product, + array $relatedProducts, CatalogProductView $catalogProductView, CheckoutCart $checkoutCart ) { - $categoryName = $product1->getCategoryIds()[0]; $checkoutCart->open(); $checkoutCart->getCartBlock()->clearShoppingCart(); - $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); - $catalogCategoryView->getListProductBlock()->openProductViewPage($product1->getName()); - $catalogProductView->getViewBlock()->addToCart($product1); - \PHPUnit_Framework_Assert::assertFalse( - $checkoutCart->getCrosssellBlock()->verifyProductCrosssell($product2), - 'Product \'' . $product2->getName() . '\' is exist in cross-sell section.' - ); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + $catalogProductView->getViewBlock()->addToCart($product); + foreach ($relatedProducts as $relatedProduct) { + \PHPUnit_Framework_Assert::assertFalse( + $checkoutCart->getCrosssellBlock()->verifyProductCrosssell($relatedProduct), + 'Product \'' . $relatedProduct->getName() . '\' is exist in cross-sell section.' + ); + } } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php index 0e53a68b1334ed5a8750c67ef00da4f233eb1e95..80c65e04d67e06d6fa2c01e552c40a64c1763ee0 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php @@ -24,14 +24,15 @@ namespace Magento\Catalog\Test\Constraint; +use Mtf\Client\Browser; use Mtf\Constraint\AbstractConstraint; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; -use Magento\Cms\Test\Page\CmsIndex; -use Magento\Catalog\Test\Page\Category\CatalogCategoryView; use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; +use Mtf\Fixture\InjectableFixture; /** * Class AssertNoRelatedProductsSection + * Assert that product is not displayed in related products section */ class AssertNoRelatedProductsSection extends AbstractConstraint { @@ -45,29 +46,25 @@ class AssertNoRelatedProductsSection extends AbstractConstraint /** * Assert that product is not displayed in related products section * - * @param CatalogProductSimple $product1 - * @param CatalogProductSimple $product2 - * @param CmsIndex $cmsIndex - * @param CatalogCategoryView $catalogCategoryView + * @param Browser $browser + * @param CatalogProductSimple $product + * @param InjectableFixture[] $relatedProducts * @param CatalogProductView $catalogProductView * @return void */ public function processAssert( - CatalogProductSimple $product1, - CatalogProductSimple $product2, - CmsIndex $cmsIndex, - CatalogCategoryView $catalogCategoryView, + Browser $browser, + CatalogProductSimple $product, + array $relatedProducts, CatalogProductView $catalogProductView ) { - $categoryName = $product1->getCategoryIds()[0]; - $cmsIndex->open(); - $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); - $catalogCategoryView->getListProductBlock()->openProductViewPage($product1->getName()); - - \PHPUnit_Framework_Assert::assertFalse( - $catalogProductView->getRelatedProductBlock()->isRelatedProductVisible($product2->getName()), - 'Product \'' . $product2->getName() . '\' is exist in related products.' - ); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + foreach ($relatedProducts as $relatedProduct) { + \PHPUnit_Framework_Assert::assertFalse( + $catalogProductView->getRelatedProductBlock()->isRelatedProductVisible($relatedProduct->getName()), + 'Product \'' . $relatedProduct->getName() . '\' is exist in related products.' + ); + } } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php index 8f8a952c590e7e46d68d0829319bc60e2338430f..3bd584eb45645854a1f01cd8b331c9a033f66c1c 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php @@ -24,14 +24,15 @@ namespace Magento\Catalog\Test\Constraint; +use Mtf\Client\Browser; use Mtf\Constraint\AbstractConstraint; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; -use Magento\Cms\Test\Page\CmsIndex; -use Magento\Catalog\Test\Page\Category\CatalogCategoryView; use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Mtf\Fixture\InjectableFixture; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; /** * Class AssertNoUpSellsProductsSection + * Assert that product is not displayed in up-sell section */ class AssertNoUpSellsProductsSection extends AbstractConstraint { @@ -45,29 +46,25 @@ class AssertNoUpSellsProductsSection extends AbstractConstraint /** * Assert that product is not displayed in up-sell section * - * @param CatalogProductSimple $product1 - * @param CatalogProductSimple $product2 - * @param CmsIndex $cmsIndex - * @param CatalogCategoryView $catalogCategoryView + * @param Browser $browser + * @param CatalogProductSimple $product + * @param InjectableFixture[] $relatedProducts * @param CatalogProductView $catalogProductView * @return void */ public function processAssert( - CatalogProductSimple $product1, - CatalogProductSimple $product2, - CmsIndex $cmsIndex, - CatalogCategoryView $catalogCategoryView, + Browser $browser, + CatalogProductSimple $product, + array $relatedProducts, CatalogProductView $catalogProductView ) { - $categoryName = $product1->getCategoryIds()[0]; - $cmsIndex->open(); - $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); - $catalogCategoryView->getListProductBlock()->openProductViewPage($product1->getName()); - - \PHPUnit_Framework_Assert::assertFalse( - $catalogProductView->getUpsellBlock()->isUpsellProductVisible($product2->getName()), - 'Product \'' . $product2->getName() . '\' is exist in up-sells products.' - ); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + foreach ($relatedProducts as $relatedProduct) { + \PHPUnit_Framework_Assert::assertFalse( + $catalogProductView->getUpsellBlock()->isUpsellProductVisible($relatedProduct->getName()), + 'Product \'' . $relatedProduct->getName() . '\' is exist in up-sells products.' + ); + } } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php index 37c0fa1307864fec409b347272259037edd72d4c..678dc3c3cf3d0b9315231417f93020904c0fd436 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php @@ -50,7 +50,10 @@ class AssertProductForm extends AbstractAssertForm * @var array */ protected $sortFields = [ - 'custom_options::title' + 'custom_options::title', + 'cross_sell_products::entity_id', + 'up_sell_products::entity_id', + 'related_products::entity_id', ]; /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php index 5448c74e9a5167efa265b09c9a4c56de946025d9..cc91b2a6dc559d12fd8eff2538ca43a94a87bd63 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php @@ -24,14 +24,15 @@ namespace Magento\Catalog\Test\Constraint; +use Mtf\Client\Browser; use Mtf\Constraint\AbstractConstraint; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; -use Magento\Cms\Test\Page\CmsIndex; -use Magento\Catalog\Test\Page\Category\CatalogCategoryView; use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Mtf\Fixture\InjectableFixture; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; /** * Class AssertRelatedProductsSection + * Assert that product is displayed in related products section */ class AssertRelatedProductsSection extends AbstractConstraint { @@ -45,29 +46,25 @@ class AssertRelatedProductsSection extends AbstractConstraint /** * Assert that product is displayed in related products section * - * @param CatalogProductSimple $product1 - * @param CatalogProductSimple $product2 - * @param CmsIndex $cmsIndex - * @param CatalogCategoryView $catalogCategoryView + * @param Browser $browser + * @param CatalogProductSimple $product + * @param InjectableFixture[] $relatedProducts * @param CatalogProductView $catalogProductView * @return void */ public function processAssert( - CatalogProductSimple $product1, - CatalogProductSimple $product2, - CmsIndex $cmsIndex, - CatalogCategoryView $catalogCategoryView, + Browser $browser, + CatalogProductSimple $product, + array $relatedProducts, CatalogProductView $catalogProductView ) { - $categoryName = $product1->getCategoryIds()[0]; - $cmsIndex->open(); - $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); - $catalogCategoryView->getListProductBlock()->openProductViewPage($product1->getName()); - - \PHPUnit_Framework_Assert::assertTrue( - $catalogProductView->getRelatedProductBlock()->isRelatedProductVisible($product2->getName()), - 'Product \'' . $product2->getName() . '\' is absent in related products.' - ); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + foreach ($relatedProducts as $relatedProduct) { + \PHPUnit_Framework_Assert::assertTrue( + $catalogProductView->getRelatedProductBlock()->isRelatedProductVisible($relatedProduct->getName()), + 'Product \'' . $relatedProduct->getName() . '\' is absent in related products.' + ); + } } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php index bc6d87abcce1be69c1eeacaa7bec5ddca87b2c95..dd89b86edf4cbe05eccaaeab7d2d4e7d85646b2d 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php @@ -24,14 +24,15 @@ namespace Magento\Catalog\Test\Constraint; +use Mtf\Client\Browser; use Mtf\Constraint\AbstractConstraint; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; -use Magento\Cms\Test\Page\CmsIndex; -use Magento\Catalog\Test\Page\Category\CatalogCategoryView; use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Mtf\Fixture\InjectableFixture; +use Mtf\Fixture\FixtureInterface; /** * Class AssertUpSellsProductsSection + * Assert that product is displayed in up-sell section */ class AssertUpSellsProductsSection extends AbstractConstraint { @@ -45,29 +46,25 @@ class AssertUpSellsProductsSection extends AbstractConstraint /** * Assert that product is displayed in up-sell section * - * @param CatalogProductSimple $product1 - * @param CatalogProductSimple $product2 - * @param CmsIndex $cmsIndex - * @param CatalogCategoryView $catalogCategoryView + * @param Browser $browser + * @param FixtureInterface $product + * @param InjectableFixture[] $relatedProducts, * @param CatalogProductView $catalogProductView * @return void */ public function processAssert( - CatalogProductSimple $product1, - CatalogProductSimple $product2, - CmsIndex $cmsIndex, - CatalogCategoryView $catalogCategoryView, + Browser $browser, + FixtureInterface $product, + array $relatedProducts, CatalogProductView $catalogProductView ) { - $categoryName = $product1->getCategoryIds()[0]; - $cmsIndex->open(); - $cmsIndex->getTopmenu()->selectCategoryByName($categoryName); - $catalogCategoryView->getListProductBlock()->openProductViewPage($product1->getName()); - - \PHPUnit_Framework_Assert::assertTrue( - $catalogProductView->getUpsellBlock()->isUpsellProductVisible($product2->getName()), - 'Product \'' . $product2->getName() . '\' is absent in up-sells products.' - ); + $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + foreach ($relatedProducts as $relatedProduct) { + \PHPUnit_Framework_Assert::assertTrue( + $catalogProductView->getUpsellBlock()->isUpsellProductVisible($relatedProduct->getName()), + 'Product \'' . $relatedProduct->getName() . '\' is absent in up-sells products.' + ); + } } /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php index 51fb6832a78df48ca683f181d9ae4608b0d361bc..b27d8b8553cf4af39702e78a3ba9f3aeac380c42 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php @@ -33,6 +33,8 @@ class AssignProducts extends Product { protected $assignType = ''; + protected $group = ''; + /** * {@inheritdoc} */ @@ -54,8 +56,6 @@ class AssignProducts extends Product $this->_dataConfig = array( 'assignType ' => $this->assignType, ); - /** @var $type Related|Upsell */ - $type = 'Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\\' . ucfirst(strtolower($this->assignType)); $this->_data = array( 'fields' => array( $this->assignType . '_products' => array( @@ -69,7 +69,7 @@ class AssignProducts extends Product 'name' => '%' . $this->assignType . '_configurable::getName%' ) ), - 'group' => $type::GROUP + 'group' => $this->group ) ), ); diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php index 01d262eb1004dcee47be14368e117d350e124c8d..ea2967a46fa1849ad77924f2cc345bfd4d81908e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php @@ -77,9 +77,9 @@ class Item implements FixtureInterface $cartItem['options'] = isset($cartItem['options']) ? $cartItem['options'] + $checkoutCustomOptions : $checkoutCustomOptions; - if (isset($checkoutData['options']['qty'])) { - $cartItem['qty'] = $checkoutData['options']['qty']; - } + $cartItem['qty'] = isset($checkoutData['options']['qty']) + ? $checkoutData['options']['qty'] + : 1; $this->data = $cartItem; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php index 1a0b79f2d3f0a3521c55bd70c7c158e3986385fc..1d8dee8ecdab3bdb237959a705765d884e41c2c5 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php @@ -603,6 +603,20 @@ class CatalogProductSimple extends InjectableFixture 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData' ]; + protected $cross_sell_products = [ + 'attribute_code' => 'cross_sell_products', + 'backend_type' => 'virtual', + 'group' => 'crosssells', + 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts' + ]; + + protected $up_sell_products = [ + 'attribute_code' => 'up_sell_products', + 'backend_type' => 'virtual', + 'group' => 'upsells', + 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts' + ]; + public function getCategoryIds() { return $this->getData('category_ids'); @@ -902,4 +916,14 @@ class CatalogProductSimple extends InjectableFixture { return $this->getData('checkout_data'); } + + public function getCrossSellProducts() + { + return $this->getData('cross_sell_products'); + } + + public function getUpSellProducts() + { + return $this->getData('up_sell_products'); + } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index bafc13ce22afc7b3869a79445912da8a2435f92f..8282a773085f69400c2c9592889146dc0fc72c9b 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -463,6 +463,18 @@ <group /> <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\CheckoutData</source> </checkout_data> + <cross_sell_products> + <attribute_code>cross_sell_products</attribute_code> + <backend_type>virtual</backend_type> + <group>crosssells</group> + <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts</source> + </cross_sell_products> + <up_sell_products> + <attribute_code>cross_sell_products</attribute_code> + <backend_type>virtual</backend_type> + <group>crosssells</group> + <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts</source> + </up_sell_products> </fields> <data_set> <sku></sku> diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php new file mode 100644 index 0000000000000000000000000000000000000000..09d7c16a6123ed1223eef5a0fe679b3c0a03ee38 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php @@ -0,0 +1,135 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\Fixture\CatalogProductSimple; + +use Mtf\Fixture\FixtureFactory; +use Mtf\Fixture\FixtureInterface; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; + +/** + * Class AbstractRelatedProducts + * Base class create related products + */ +class AbstractRelatedProducts implements FixtureInterface +{ + /** + * Data set configuration settings + * + * @var array + */ + protected $params; + + /** + * Data of the created products + * + * @var array + */ + protected $data = []; + + /** + * Products fixture + * + * @var array + */ + protected $products = []; + + /** + * @constructor + * @param FixtureFactory $fixtureFactory + * @param array $params + * @param array $data + */ + public function __construct(FixtureFactory $fixtureFactory, array $params, array $data = []) + { + $this->params = $params; + + if (isset($data['presets'])) { + $presets = array_map('trim', explode(',', $data['presets'])); + foreach ($presets as $preset) { + list($fixtureCode, $dataSet) = explode('::', $preset); + + /** @var CatalogProductSimple $product */ + $product = $fixtureFactory->createByCode($fixtureCode, ['dataSet' => $dataSet]); + if (!$product->hasData('id')) { + $product->persist(); + } + + $this->products[] = $product; + $this->data[] = [ + 'entity_id' => $product->getId(), + 'name' => $product->getName(), + 'sku' => $product->getSku() + ]; + } + } + + if (isset($data['data'])) { + $this->data = array_replace_recursive($this->data, $data['data']); + } + } + + /** + * Persist related products + * + * @return void + */ + public function persist() + { + // + } + + /** + * Return prepared data set + * + * @param string|null $key + * @return array + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function getData($key = null) + { + return $this->data; + } + + /** + * Return data set configuration settings + * + * @return array + */ + public function getDataConfig() + { + return $this->params; + } + + /** + * Return related products + * + * @return array + */ + public function getProducts() + { + return $this->products; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php index 1e754e93ff4fdccf77bc7b54145724d4ee83d471..8c6b6e9823288c09047dbd430fd8b4d47fe3de0d 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php @@ -117,7 +117,8 @@ class CheckoutData implements FixtureInterface 'title' => 'attribute_key_1', 'value' => 'Content option %isolation%', ] - ] + ], + 'qty' => 1 ], 'cartItem' => [ 'price' => 340, diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CrossSellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CrossSellProducts.php new file mode 100644 index 0000000000000000000000000000000000000000..aca2fb0ea602963f3ba1443ab1e0ead6c57637de --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CrossSellProducts.php @@ -0,0 +1,34 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\Fixture\CatalogProductSimple; + +/** + * Class CrossSellProducts + * Create cross sell products + */ +class CrossSellProducts extends AbstractRelatedProducts +{ + // +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/UpSellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/UpSellProducts.php new file mode 100644 index 0000000000000000000000000000000000000000..9b25b93a89e4ac00aa6d337d70b83bb085291a70 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/UpSellProducts.php @@ -0,0 +1,34 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\Fixture\CatalogProductSimple; + +/** + * Class UpSellProducts + * Create up sell products + */ +class UpSellProducts extends AbstractRelatedProducts +{ + // +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php index 5e1ffb8b8b147a27cc8138a04076a13e4b899b08..fe942ee22953ae6cbd013ec63c756a063bb02b64 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php @@ -36,6 +36,11 @@ class CrosssellProducts extends AssignProducts */ protected $assignType = 'crosssell'; + /** + * @var string + */ + protected $group = 'crosssells'; + /** * @var array */ @@ -49,8 +54,6 @@ class CrosssellProducts extends AssignProducts $this->_dataConfig = [ 'assignType ' => $this->assignType, ]; - /** @var $type Related|Upsell */ - $type = 'Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\\' . ucfirst(strtolower($this->assignType)); $productsArray = []; foreach ($this->_products as $key => $product) { /** @var $product \Magento\Catalog\Test\Fixture\Product */ @@ -59,8 +62,8 @@ class CrosssellProducts extends AssignProducts 'name' => $product->getName() ]; } - $this->_data['fields'][$this->assignType . '_products']['value'] = $productsArray; - $this->_data['fields'][$this->assignType . '_products']['group'] = $type::GROUP; + $this->_data['fields']['cross_sell_products']['value'] = $productsArray; + $this->_data['fields']['cross_sell_products']['group'] = $this->group; $this->_repository = Factory::getRepositoryFactory() ->getMagentoCatalogAssignProducts($this->_dataConfig, $this->_data); diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/RelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/RelatedProducts.php index 97d2f65ef05ce3ea4fbee5ae7a21407d20de6b57..b3e234529febccaa88b44cb771e533af34d96787 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/RelatedProducts.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/RelatedProducts.php @@ -24,11 +24,9 @@ namespace Magento\Catalog\Test\Fixture; -use Mtf\System\Config; -use Mtf\Factory\Factory; -use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related; - class RelatedProducts extends AssignProducts { protected $assignType = 'related'; + + protected $group = 'related-products'; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/UpsellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/UpsellProducts.php index 2826c90a4e71617dcf7086bc1569c8596ed0e006..6c1c3ef8ac3ffbf23793c8d0dbed8f8e7c8b0488 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/UpsellProducts.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/UpsellProducts.php @@ -24,11 +24,9 @@ namespace Magento\Catalog\Test\Fixture; -use Mtf\System\Config; -use Mtf\Factory\Factory; -use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell; - class UpsellProducts extends AssignProducts { - protected $assignType = 'upsell'; + protected $assignType = 'up_sell'; + + protected $group = 'upsells'; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml index 0434bf0377625bae2509cf07cdf9a1173a0a1bea..599893a56ecb57aaa63dc6e25dba9773da724715 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogCategoryEdit.xml @@ -31,7 +31,7 @@ <strategy>css selector</strategy> </messagesBlock> <formPageActions> - <class>Magento\Backend\Test\Block\FormPageActions</class> + <class>Magento\Catalog\Test\Block\Adminhtml\Category\Edit\PageActions</class> <locator>.page-main-actions</locator> <strategy>css selector</strategy> </formPageActions> diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv index 269b08ebd8d8e536f25ec71f4dfad404bfded5e0..712790b63786a3d90713408eaac061b86bc284f4 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest/test.csv @@ -1,4 +1,4 @@ "category/data/name";"category/data/is_active";"category/data/url_key";"category/data/description";"category/data/meta_title";"category/data/include_in_menu";"category/data/available_product_listing_config";"category/data/available_sort_by/sort_2";"category/data/available_sort_by/sort_1";"category/data/default_product_listing_config";"category/data/default_sort_by";"constraint" -"Name%isolation%";"Yes";"UrlKey%isolation%";"-";"-";"Yes";"Yes";"-";"-";"No";"Name";"assertCategorySaveMessage, assertCategoryForm, assertCategoryPage " -"Name%isolation%";"Yes";"UrlKey%isolation%";"Category Description";"Category Title";"Yes";"No";"Position";"Price";"Yes";"-";"assertCategorySaveMessage, assertCategoryForm, assertCategoryPage " +"Name%isolation%";"Yes";"UrlKey%isolation%";"-";"-";"Yes";"Yes";"-";"-";"No";"Name";"assertCategorySaveMessage, assertCategoryForm, assertUrlRewriteCategoryInGrid, assertCategoryRedirect, assertCategoryPage" +"Name%isolation%";"Yes";"UrlKey%isolation%";"Category Description";"Category Title";"Yes";"No";"Position";"Price";"Yes";"-";"assertCategorySaveMessage, assertCategoryForm, assertCategoryPage" "Name%isolation%";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php new file mode 100644 index 0000000000000000000000000000000000000000..0cb67b73099a0b05e000b4cfbb68a57897110b91 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php @@ -0,0 +1,99 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\TestCase\Product; + +use Mtf\ObjectManager; +use Mtf\TestCase\Injectable; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; +use Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts; + +/** + * Class AddCrossSellEntityTest + * + * Test Flow: + * + * Preconditions: + * 1. Create cross cell products + * + * Steps: + * 1. Open Backend + * 2. Go to Products > Catalog + * 3. Click Add new product + * 4. Fill data from dataSet + * 5. Save product + * 6. Perform all assertions + * + * @group Cross-sells_(MX) + * @ZephyrId MAGETWO-29081 + */ +class AddCrossSellEntityTest extends Injectable +{ + /** + * Catalog product index page on backend + * + * @var CatalogProductIndex + */ + protected $catalogProductIndex; + + /** + * Catalog product view page on backend + * + * @var CatalogProductNew + */ + protected $catalogProductNew; + + /** + * Inject data + * + * @param CatalogProductIndex $catalogProductIndex + * @param CatalogProductNew $catalogProductNew + * @return void + */ + public function __inject(CatalogProductIndex $catalogProductIndex, CatalogProductNew $catalogProductNew) + { + $this->catalogProductIndex = $catalogProductIndex; + $this->catalogProductNew = $catalogProductNew; + } + + /** + * Run test add cross sell entity + * + * @param CatalogProductSimple $product + * @return array + */ + public function test(CatalogProductSimple $product) + { + $this->catalogProductIndex->open(); + $this->catalogProductIndex->getGridPageActionBlock()->addProduct('simple'); + $this->catalogProductNew->getProductForm()->fill($product); + $this->catalogProductNew->getFormPageActions()->save(); + + /** @var CrossSellProducts $crossSellProducts*/ + $crossSellProducts = $product->getDataFieldConfig('cross_sell_products')['source']; + return ['relatedProducts' => $crossSellProducts->getProducts()]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv new file mode 100644 index 0000000000000000000000000000000000000000..97fda4fc3f2a9222714fa0089cddb366065c182d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv @@ -0,0 +1,2 @@ +"product/dataSet";"product/data/cross_sell_products/presets";"constraint" +"default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertCrossSellsProductsSection" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php new file mode 100644 index 0000000000000000000000000000000000000000..00459db77a0ae6cd23eeb06e551e1fd99e471b76 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php @@ -0,0 +1,148 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\TestCase\Product; + +use Mtf\TestCase\Injectable; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex; +use Mtf\Fixture\FixtureFactory; +use Mtf\Fixture\FixtureInterface; +use Magento\Catalog\Test\Fixture\CatalogProductSimple; +use Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts; + +/** + * Class AddUpSellEntityTest + * + * Test Flow: + * + * Preconditions: + * 1. Create related products + * + * Steps: + * 1. Login to the backend + * 2. Navigate to Products > Catalog + * 3. Start to create product according to dataset + * 4. Save product + * 5. Perform appropriate assertions + * + * @group Up-sells_(MX) + * @ZephyrId MAGETWO-29105 + */ +class AddUpSellEntityTest extends Injectable +{ + /** + * Fixture factory + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * Catalog product index page on backend + * + * @var CatalogProductIndex + */ + protected $catalogProductIndex; + + /** + * Catalog product view page on backend + * + * @var CatalogProductNew + */ + protected $catalogProductNew; + + /** + * Prepare data + * + * @param FixtureFactory $fixtureFactory + * @return void + */ + public function __prepare(FixtureFactory $fixtureFactory) + { + $this->fixtureFactory = $fixtureFactory; + } + + /** + * Inject data + * + * @param CatalogProductIndex $catalogProductIndex + * @param CatalogProductNew $catalogProductNew + * @return void + */ + public function __inject(CatalogProductIndex $catalogProductIndex, CatalogProductNew $catalogProductNew) + { + $this->catalogProductIndex = $catalogProductIndex; + $this->catalogProductNew = $catalogProductNew; + } + + /** + * Run test add up sell entity + * + * @param string $productData + * @param string $upSellProducts + * @return array + */ + public function test($productData, $upSellProducts) + { + $product = $this->createProduct($productData, $upSellProducts); + $dataConfig = $product->getDataConfig(); + $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null; + + $this->catalogProductIndex->open(); + $this->catalogProductIndex->getGridPageActionBlock()->addProduct($typeId); + $this->catalogProductNew->getProductForm()->fill($product); + $this->catalogProductNew->getFormPageActions()->save($product); + + /** @var UpSellProducts $upSellProducts*/ + $upSellProducts = $product->getDataFieldConfig('up_sell_products')['source']; + return [ + 'product' => $product, + 'relatedProducts' => $upSellProducts->getProducts() + ]; + } + + /** + * Create product + * + * @param string $productData + * @param string $upSellProducts + * @return FixtureInterface + */ + protected function createProduct($productData, $upSellProducts) + { + list($fixtureCode, $dataSet) = explode('::', $productData); + return $this->fixtureFactory->createByCode( + $fixtureCode, + [ + 'dataSet' => $dataSet, + 'data' => [ + 'up_sell_products' => [ + 'presets' => $upSellProducts + ] + ] + ] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv new file mode 100644 index 0000000000000000000000000000000000000000..75ba28384650c1199ec0f699fbc800304d5a6d6f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv @@ -0,0 +1,3 @@ +"productData";"upSellProducts";"constraint" +"catalogProductSimple::default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertUpSellsProductsSection" +"configurableProductInjectable::default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertUpSellsProductsSection" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv index bcce9e2518fcedbc7f810f79a5dc47c6e70512b4..a375ddbadc6f5b24edd193b399fd844ed968173a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv @@ -1,19 +1,19 @@ -"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage" -"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage" -"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage" -"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage" -"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage" +"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint";"issue" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage";"" +"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage";"Bug: MAGETWO-28913" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv index cbc73ef8063d886dd04e81380951c882ea9c5a25..00f470fea2cc39bb9d92f40b0b6addd6f0b381b1 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv @@ -1,8 +1,8 @@ -"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku" -"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock" -"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock" +"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint";"issue" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid";"" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku";"" +"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku";"" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory";"" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage";"Bug: MAGETWO-28913" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock";"" +"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock";"" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml index 25e94d915d6ea38b50473d69c70b2d97ef91a1f8..38aee68e4eb912209350934dfdee921909c4701d 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml @@ -455,4 +455,7 @@ <assertProductNotSearchableBySku module="Magento_Catalog"> <severeness>low</severeness> </assertProductNotSearchableBySku> + <assertCategoryRedirect module="Magento_Catalog"> + <severeness>low</severeness> + </assertCategoryRedirect> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml index d4d8cbd51fec8a05412453fab54ee13b84ff8e9a..f7a8cf38cecf7433d55f34363924ad78e215119b 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml @@ -26,8 +26,8 @@ <fixture class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery"> <module>Magento_CatalogSearch</module> <type>flat</type> - <entity_type>catalogsearch_query</entity_type> - <collection>Magento\CatalogSearch\Model\Resource\Query\Collection</collection> + <entity_type>search_query</entity_type> + <collection>Magento\Search\Model\Resource\Query\Collection</collection> <fields> <query_id> <attribute_code>query_id</attribute_code> diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php index 05e7f3cd59386a17f8b04bf200e2714018060920..ccd8be69e378812de050c334e598b5551aa65891 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php @@ -85,7 +85,6 @@ class CreateSearchTermEntityTest extends Injectable */ public function test(CatalogSearchQuery $searchTerm) { - $this->markTestIncomplete('MAGETWO-26170'); // Steps $this->indexPage->open(); $this->indexPage->getGridPageActions()->addNew(); diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php index 9ab5919f49df6e28298f984c66386be7a5e6369d..630d557ed7cb9b1ddb65c71cc4a5d3f5778643f4 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php @@ -100,7 +100,6 @@ class EditSearchTermEntityTest extends Injectable */ public function test(CatalogSearchQuery $searchTerm) { - $this->markTestIncomplete('MAGETWO-26170'); // Preconditions $searchText = $searchTerm->getQueryText(); // Steps diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/fixture.xml index 0ca4f481f402b732108b0ac08634cc94ab3e7518..3126a5b53f199b0931771d39a341abbf7044f3c5 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/fixture.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/fixture.xml @@ -26,7 +26,7 @@ <fixture> <catalogSearchQuery module="Magento_CatalogSearch"> <type>flat</type> - <entity_type>catalogsearch_query</entity_type> - <collection>Magento\CatalogSearch\Model\Resource\Query\Collection</collection> + <entity_type>search_query</entity_type> + <collection>Magento\Search\Model\Resource\Query\Collection</collection> </catalogSearchQuery> </fixture> diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php index c557d720fd3fda0ed93fb01f8ed96bb7955ad3c3..63429989adcdb0bfb4d276b39f09d67260dce529 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php @@ -25,6 +25,8 @@ namespace Magento\Checkout\Test\Block\Cart; use Mtf\Block\Block; use Mtf\Client\Element\Locator; +use Mtf\Fixture\FixtureInterface; +use Magento\Checkout\Test\Block\Cart\Sidebar\Item; /** * Class Sidebar @@ -53,6 +55,20 @@ class Sidebar extends Block */ protected $cartContent = 'div.minicart'; + /** + * Selector for cart item block + * + * @var string + */ + protected $cartItemByProductName = './/*[contains(@class,"products minilist")]//li[.//a[.="%s"]]'; + + /** + * Counter qty locator + * + * @var string + */ + protected $counterQty = './/span[@class="counter qty"]'; + /** * Open mini cart * @@ -60,11 +76,29 @@ class Sidebar extends Block */ public function openMiniCart() { + $this->waitCounterQty(); if (!$this->_rootElement->find($this->cartContent)->isVisible()) { $this->_rootElement->find($this->cartLink)->click(); } } + /** + * Wait counter qty visibility + * + * @return void + */ + protected function waitCounterQty() + { + $browser = $this->browser; + $selector = $this->counterQty; + $browser->waitUntil( + function () use ($browser, $selector) { + $counterQty = $browser->find($selector, Locator::SELECTOR_XPATH); + return $counterQty->isVisible() ? true : null; + } + ); + } + /** * Get product quantity * @@ -77,4 +111,32 @@ class Sidebar extends Block $productQty = sprintf($this->qty, $productName); return $this->_rootElement->find($productQty, Locator::SELECTOR_XPATH)->getText(); } + + /** + * Get cart item block + * + * @param FixtureInterface $product + * @return Item + */ + public function getCartItem(FixtureInterface $product) + { + $dataConfig = $product->getDataConfig(); + $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null; + $cartItem = null; + + if ($this->hasRender($typeId)) { + $cartItem = $this->callRender($typeId, 'getCartItem', ['product' => $product]); + } else { + $cartItemBlock = $this->_rootElement->find( + sprintf($this->cartItemByProductName, $product->getName()), + Locator::SELECTOR_XPATH + ); + $cartItem = $this->blockFactory->create( + 'Magento\Checkout\Test\Block\Cart\Sidebar\Item', + ['element' => $cartItemBlock] + ); + } + + return $cartItem; + } } diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php new file mode 100644 index 0000000000000000000000000000000000000000..03f526fcc1d648bf5b753dab09f4d49434b6c556 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php @@ -0,0 +1,52 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Checkout\Test\Block\Cart\Sidebar; + +use Magento\Checkout\Test\Block\Cart\Sidebar; + +/** + * Class MiniCartItem + * Product item block on mini Cart + */ +class Item extends Sidebar +{ + /** + * Selector for "Remove item" button + * + * @var string + */ + protected $removeItem = '.action.delete'; + + /** + * Remove product item from mini cart + * + * @return void + */ + public function removeItemFromMiniCart() + { + $this->_rootElement->find($this->removeItem)->click(); + $this->_rootElement->acceptAlert(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php new file mode 100644 index 0000000000000000000000000000000000000000..2c06ed1f3fae50a5e4e01e3c0af9c88bacd3478f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php @@ -0,0 +1,70 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Checkout\Test\Constraint; + +use Magento\Cms\Test\Page\CmsIndex; +use Mtf\Constraint\AbstractConstraint; +use Mtf\Fixture\FixtureInterface; + +/** + * Class AssertProductAbsentInMiniShoppingCart + * Check that product is absent in mini shopping cart + */ +class AssertProductAbsentInMiniShoppingCart extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert product is absent on mini shopping cart + * + * @param CmsIndex $cmsIndex + * @param FixtureInterface $deletedProduct + * @return void + */ + public function processAssert(CmsIndex $cmsIndex, FixtureInterface $deletedProduct) + { + $cmsIndex->open(); + $cmsIndex->getCartSidebarBlock()->openMiniCart(); + \PHPUnit_Framework_Assert::assertFalse( + $cmsIndex->getCartSidebarBlock()->getCartItem($deletedProduct)->isVisible(), + 'Product ' . $deletedProduct->getName() . ' is presents in Mini Shopping Cart.' + ); + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Product is absent in Mini Shopping Cart.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php new file mode 100644 index 0000000000000000000000000000000000000000..61c789b5469ec367ae29537c8b49e888d8e57665 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php @@ -0,0 +1,71 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Checkout\Test\Constraint; + +use Magento\Cms\Test\Page\CmsIndex; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AssertProductPresentInMiniShoppingCart + * Check that product is present in mini shopping cart + */ +class AssertProductPresentInMiniShoppingCart extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert product is present on mini shopping cart + * + * @param CmsIndex $cmsIndex + * @param array $products + * @return void + */ + public function processAssert(CmsIndex $cmsIndex, array $products) + { + $cmsIndex->open(); + foreach ($products as $product) { + $cmsIndex->getCartSidebarBlock()->openMiniCart(); + \PHPUnit_Framework_Assert::assertTrue( + $cmsIndex->getCartSidebarBlock()->getCartItem($product)->isVisible(), + 'Product ' . $product->getName() . ' is absent in Mini Shopping Cart.' + ); + } + } + + /** + * Returns a string representation of the object. + * + * @return string + */ + public function toString() + { + return 'Products is presents in Mini Shopping Cart.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php index 74d5c9fc6113bbd9347f09a9cf8f177c6a06d775..7cb10a43e7c1ab40fb082eb08dc45be2b4d391bd 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php @@ -76,14 +76,14 @@ class PlaceOrderStep implements TestStepInterface * @param AssertOrderTotalOnReviewPage $assertOrderTotalOnReviewPage * @param CheckoutOnepageSuccess $checkoutOnepageSuccess * @param string $checkoutMethod - * @param string $grandTotal + * @param string|null $grandTotal */ public function __construct( CheckoutOnepage $checkoutOnepage, AssertOrderTotalOnReviewPage $assertOrderTotalOnReviewPage, CheckoutOnepageSuccess $checkoutOnepageSuccess, $checkoutMethod, - $grandTotal + $grandTotal = null ) { $this->checkoutOnepage = $checkoutOnepage; $this->assertOrderTotalOnReviewPage = $assertOrderTotalOnReviewPage; @@ -99,7 +99,9 @@ class PlaceOrderStep implements TestStepInterface */ public function run() { - $this->assertOrderTotalOnReviewPage->processAssert($this->checkoutOnepage, $this->grandTotal); + if ($this->grandTotal !== null) { + $this->assertOrderTotalOnReviewPage->processAssert($this->checkoutOnepage, $this->grandTotal); + } $this->checkoutOnepage->getReviewBlock()->placeOrder(); return ['orderId' => $this->checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId()]; diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml index 74fa1c3719e75a65a1bae1aeefc2224fb16d0b57..5e1462297e1d23a93b3a1025733bff7b15ffb594 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml @@ -51,4 +51,10 @@ <assertCartItemsOptions module="Magento_Checkout"> <severeness>low</severeness> </assertCartItemsOptions> + <assertProductAbsentInMiniShoppingCart module="Magento_Checkout"> + <severeness>low</severeness> + </assertProductAbsentInMiniShoppingCart> + <assertProductPresentInMiniShoppingCart module="Magento_Checkout"> + <severeness>low</severeness> + </assertProductPresentInMiniShoppingCart> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php index 5ad5aae37b6946a354db9ee10e288bc4865188d5..42ca5af842bad65aa2c39fe6ba2fd836b7a9758c 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php @@ -515,7 +515,7 @@ class ConfigurableProductInjectable extends InjectableFixture 'is_required' => '0', 'default_value' => '', 'input' => 'text', - 'group' => 'autosettings', + 'group' => 'search-engine-optimization', ]; protected $url_path = [ @@ -611,6 +611,13 @@ class ConfigurableProductInjectable extends InjectableFixture 'source' => 'Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData', ]; + protected $up_sell_products = [ + 'attribute_code' => 'up_sell_products', + 'backend_type' => 'virtual', + 'group' => 'upsells', + 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts' + ]; + public function getCategoryIds() { return $this->getData('category_ids'); @@ -920,4 +927,9 @@ class ConfigurableProductInjectable extends InjectableFixture { return $this->getData('checkout_data'); } + + public function getUpSellProducts() + { + return $this->getData('up_sell_products'); + } } diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index 61b74199dbf7ebbd8c7f8e907fd2867a25f21e04..9c9bf96470d5bfaff95f49645f218b745557269f 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -395,6 +395,7 @@ <is_required>0</is_required> <default_value></default_value> <input>text</input> + <group>search-engine-optimization</group> </url_key> <url_path> <attribute_code>url_path</attribute_code> @@ -466,6 +467,12 @@ <group /> <source>Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData</source> </checkout_data> + <up_sell_products> + <attribute_code>cross_sell_products</attribute_code> + <backend_type>virtual</backend_type> + <group>crosssells</group> + <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts</source> + </up_sell_products> </fields> <data_set> <sku></sku> diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php b/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php index 3885d317fb5a4fe3da722b1c9c8d9009c09a5433..1986caa81afa66766f5e5691ece89e3171de235a 100644 --- a/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php +++ b/dev/tests/functional/tests/app/Magento/Core/Test/TestStep/SetupConfigurationStep.php @@ -47,17 +47,26 @@ class SetupConfigurationStep implements TestStepInterface */ protected $configData; + /** + * Rollback + * + * @var bool + */ + protected $rollback; + /** * Preparing step properties * * @constructor * @param FixtureFactory $fixtureFactory * @param string $configData + * @param bool $rollback */ - public function __construct(FixtureFactory $fixtureFactory, $configData) + public function __construct(FixtureFactory $fixtureFactory, $configData, $rollback = false) { $this->fixtureFactory = $fixtureFactory; $this->configData = $configData; + $this->rollback = $rollback; } /** @@ -67,11 +76,16 @@ class SetupConfigurationStep implements TestStepInterface */ public function run() { + if ($this->configData === '-') { + return []; + } + $prefix = ($this->rollback == false) ? '' : '_rollback'; + $configData = array_map('trim', explode(',', $this->configData)); $result = []; foreach ($configData as $configDataSet) { - $config = $this->fixtureFactory->createByCode('configData', ['dataSet' => $configDataSet]); + $config = $this->fixtureFactory->createByCode('configData', ['dataSet' => $configDataSet . $prefix]); $config->persist(); $result[] = $config; diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php new file mode 100644 index 0000000000000000000000000000000000000000..607c3e3ecfd10c177ef7415ca86201519070deb8 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php @@ -0,0 +1,61 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\TestStep; + +use Mtf\TestStep\TestStepInterface; +use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit; + +/** + * Class CreateOrderFromCustomerAccountStep + * Create order from customer page on Backend + */ +class CreateOrderFromCustomerAccountStep implements TestStepInterface +{ + /** + * Customer edit page + * + * @var CustomerIndexEdit + */ + protected $customerIndexEdit; + + /** + * @constructor + * @param CustomerIndexEdit $customerIndexEdit + */ + public function __construct(CustomerIndexEdit $customerIndexEdit) + { + $this->customerIndexEdit = $customerIndexEdit; + } + + /** + * Create new order from customer step + * + * @return void + */ + public function run() + { + $this->customerIndexEdit->getPageActionsBlock()->createOrder(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php new file mode 100644 index 0000000000000000000000000000000000000000..3d0476bdd0fb48b909d4239e47e8e24e83c9c4b7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php @@ -0,0 +1,64 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\TestStep; + +use Mtf\TestStep\TestStepInterface; +use Magento\Cms\Test\Page\CmsIndex; + +/** + * Class LogoutCustomerOnFrontendStep + * Logout customer on frontend + */ +class LogoutCustomerOnFrontendStep implements TestStepInterface +{ + /** + * Cms index page + * + * @var CmsIndex + */ + protected $cmsIndex; + + /** + * @constructor + * @param CmsIndex $cmsIndex + */ + public function __construct(CmsIndex $cmsIndex) + { + $this->cmsIndex = $cmsIndex; + } + + /** + * Logout customer + * + * @return void + */ + public function run() + { + $this->cmsIndex->open(); + if ($this->cmsIndex->getLinksBlock()->isVisible("Log Out")) { + $this->cmsIndex->getLinksBlock()->openLink("Log Out"); + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php new file mode 100644 index 0000000000000000000000000000000000000000..04de0fac095384821c6f4ee1fa0ac219516dba2a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\TestStep; + +use Mtf\TestStep\TestStepInterface; +use Magento\Customer\Test\Fixture\CustomerInjectable; +use Magento\Customer\Test\Page\Adminhtml\CustomerIndex; + +/** + * Class OpenCustomerOnBackendStep + * Open customer account + */ +class OpenCustomerOnBackendStep implements TestStepInterface +{ + /** + * Customer fixture + * + * @var CustomerInjectable + */ + protected $customer; + + /** + * Customer index page + * + * @var CustomerInjectable + */ + protected $customerIndex; + + /** + * @constructor + * @param CustomerInjectable $customer + * @param CustomerIndex $customerIndex + */ + public function __construct(CustomerInjectable $customer, CustomerIndex $customerIndex) + { + $this->customer = $customer; + $this->customerIndex = $customerIndex; + } + + /** + * Open customer account + * + * @return void + */ + public function run() + { + $this->customerIndex->open(); + $this->customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $this->customer->getEmail()]); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index a3397f13c57dc9df6123396cbdaf00b633aec4b7..342534e1f9fdb7d4de3ad9e3a06197a534ec8882 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -62,6 +62,13 @@ class Links extends Form */ protected $title = "//*[@id='downloadable_links_title']"; + /** + * Add new link row button block + * + * @var string + */ + protected $addLinkButtonBlock = '#dd-links .col-actions-add:last-child'; + /** * Get Downloadable link item block * @@ -96,10 +103,12 @@ class Links extends Form ); $this->_fill($mapping); foreach ($fields['downloadable']['link'] as $index => $link) { - if (!$element->find(sprintf($this->rowBlock, $index + 1), Locator::SELECTOR_XPATH)->isVisible()) { + $rowBlock = $this->getRowBlock($index, $element); + if (!$rowBlock->isVisible()) { + $element->find($this->addLinkButtonBlock)->click(); $element->find($this->addNewLinkRow, Locator::SELECTOR_XPATH)->click(); } - $this->getRowBlock($index, $element)->fillLinkRow($link); + $rowBlock->fillLinkRow($link); } } diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php index 51ec5ea134dc3d23e966325d468dacb7467b2c67..4b1ad4b012ab61a18ef20322a4085553be5c5502 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php @@ -122,7 +122,7 @@ class View extends \Magento\Catalog\Test\Block\Product\View $downloadableOptions['downloadable_links'] = [ 'title' => $this->getDownloadableLinksBlock()->getTitle(), 'downloadable' => [ - 'link' => $this->getDownloadableLinksBlock()->getLinks() + 'link' => $this->getDownloadableLinksBlock()->getLinks(), ] ]; } diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php index d622b3b91e463515a6dd00f001abb8501c9d159b..b55efa62251842a30892b798c878856db4a2430f 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php @@ -68,7 +68,7 @@ class Links extends Block * * @var string */ - protected $linkForChoice = './/label/span[1]'; + protected $linkForChoice = '[data-role="link"] label>span:first-child'; /** * Checkbox selector item links @@ -130,7 +130,7 @@ class Links extends Block $choiceLinks = $this->_rootElement->find($this->choiceLink, Locator::SELECTOR_XPATH)->getElements(); foreach ($choiceLinks as $choiceLink) { - $link = $choiceLink->find($this->linkForChoice, Locator::SELECTOR_XPATH); + $link = $choiceLink->find($this->linkForChoice); $sample = $choiceLink->find($this->sampleLinkForChoice); $price = $choiceLink->find($this->priceForChoice); $priceAdjustments = $choiceLink->find($this->priceAdjustmentsForChoice); diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php index 729448141d0302e3ae9b03d02ee17a3aa90cc1f9..e67019c0a499c39a065df1a61ae4307ad773ce82 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php @@ -54,7 +54,6 @@ class CheckoutData extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\Ch ], 'cartItem' => [ 'price' => 23, - 'qty' => 2, 'subtotal' => 46 ] ], diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php index e5eeda697079913050ead3bfd8d28b22df9f9374..d30255ba0abfb61529bda8993fb9abc2a013571f 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php @@ -131,7 +131,9 @@ class Curl extends ProductCurl implements DownloadableProductInjectableInterface preg_match("~Location: [^\s]*\/id\/(\d+)~", $response, $matches); foreach ($data['downloadable']['link'] as $key => $link) { preg_match('`"link_id":"(\d*?)","title":"' . $link['title'] . '"`', $response, $linkId); - $data['product']['checkout_data']['options']['links'][$key]['id'] = $linkId[1]; + if (isset($data['product']['checkout_data']['options']['links'][$key]['label'])) { + $data['product']['checkout_data']['options']['links'][$key]['id'] = $linkId[1]; + } } return ['id' => $matches[1], 'checkout_data' => $data['product']['checkout_data']]; diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php index 27e04d5bbb24fbe510a1ccf8235c3100a1d32600..b11b285b5f7fd874f2ce27121f622994d09066e6 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php @@ -107,8 +107,9 @@ class CreateDownloadableProductEntityTest extends Injectable * @param CatalogCategory $category * @return void */ - public function testCreateDownloadableProduct(DownloadableProductInjectable $product, CatalogCategory $category) + public function test(DownloadableProductInjectable $product, CatalogCategory $category) { + // Steps $this->catalogProductIndex->open(); $this->catalogProductIndex->getGridPageActionBlock()->addProduct('downloadable'); $productBlockForm = $this->catalogProductNew->getProductForm(); diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv old mode 100755 new mode 100644 similarity index 91% rename from dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv rename to dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv index b679a776ea283734d6f680eadb04b0b9911856e4..d92a96a09b3d2e78783b8dcf909d1135ed17517a --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/testCreateDownloadableProduct.csv +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv @@ -1,15 +1,15 @@ -"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/special_price";"product/data/group_price/preset";"product/data/tier_price/preset";"product/data/url_key";"constraint" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"1";"In Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"1";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"33";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"Taxable Goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"50";"Out of Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"Yes";"123";"No";"123";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"98";"None";"5";"In Stock";"Yes";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"This is description for downloadable product";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"10";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"5";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"Taxable Goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"250";"Taxable Goods";"65";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage" +"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/special_price";"product/data/group_price/preset";"product/data/tier_price/preset";"product/data/url_key";"constraint";"issue" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"1";"In Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"1";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"33";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"Taxable Goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"50";"Out of Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm";"Bug: MAGETWO-28450" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"Yes";"123";"No";"123";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"98";"None";"5";"In Stock";"Yes";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData";"Bug: MAGETWO-28905, MAGETWO-28913" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"This is description for downloadable product";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"10";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"5";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"Taxable Goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage";"" +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"250";"Taxable Goods";"65";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage";"" diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php index 9e1150ac5d5015e1d2b9e380ba86d2e942330a8d..d04f1135465330d4a1042fd2e1be62c86bd80e24 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php @@ -117,8 +117,9 @@ class UpdateDownloadableProductEntityTest extends Injectable * @param CatalogCategory $category * @return void */ - public function testUpdateDownloadableProduct(DownloadableProductInjectable $product, CatalogCategory $category) + public function test(DownloadableProductInjectable $product, CatalogCategory $category) { + // Steps $filter = ['sku' => $this->product->getSku()]; $this->catalogProductIndex->open()->getProductGrid()->searchAndOpen($filter); $productBlockForm = $this->catalogProductEdit->getProductForm(); diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv similarity index 87% rename from dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv rename to dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv index be96bcd01890ac6b25cc503f9388da5245cedb17..76855f89835735497ec07514054d1571caab0e4c 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/testUpdateDownloadableProduct.csv +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/test.csv @@ -1,8 +1,8 @@ -"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/weight";"product/data/category";"product/data/description";"product/data/short_description";"product/data/inventory_manage_stock";"product/data/inventory_qty";"product/data/stock_data_use_config_min_qty";"product/data/stock_data_min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/special_price";"isRequired";"product/data/url_key";"constraint" +"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/weight";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/special_price";"isRequired";"product/data/url_key";"constraint" "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"Taxable Goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku" "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"50";"Out of Stock";"Yes";"-";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm" "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"Taxable Goods";"123";"-";"Yes";"-";"Default Category";"-";"-";"Yes";"-";"No";"123";"-";"-";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock" "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"48";"None";"5";"In Stock";"Yes";"-";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage" "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"54";"Taxable Goods";"10";"In Stock";"Yes";"-";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"Yes";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData, assertProductInCategory" "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"Taxable Goods";"10";"In Stock";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid" -"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"43";"Taxable Goods";"10";"In Stock";"No";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"40";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductSpecialPriceOnProductPage, assertProductPage" \ No newline at end of file +"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"43";"Taxable Goods";"10";"In Stock";"No";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"40";"No";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertProductSpecialPriceOnProductPage, assertProductPage" diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php new file mode 100644 index 0000000000000000000000000000000000000000..01715217013e9a062473435256aad15afb228dfb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php @@ -0,0 +1,105 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Block\Message; + +use Magento\GiftMessage\Test\Fixture\GiftMessage; +use Mtf\Block\Form; +use Mtf\Client\Element\Locator; + +/** + * Class Inline + * Checkout add gift options + */ +class Inline extends Form +{ + /** + * Selector for gift message on item form + * + * @var string + */ + protected $giftMessageItemForm = ".//li[@class='item'][contains(.,'%s')]/div[@class='options']"; + + /** + * Selector for gift message on order form + * + * @var string + */ + protected $giftMessageOrderForm = ".gift-messages-order"; + + /** + * Selector for "Gift Message" button on order + * + * @var string + */ + protected $giftMessageItemButton = ".//li[@class='item'][contains(.,'%s')]/div[@class='options']/a"; + + /** + * Selector for "Gift Message" button on item + * + * @var string + */ + protected $giftMessageOrderButton = "#allow-gift-options-for-order-container > a"; + + /** + * Fill gift message form + * + * @param GiftMessage $giftMessage + * @param array $products + * @return void + */ + public function fillGiftMessage(GiftMessage $giftMessage, $products = []) + { + $this->fill($giftMessage); + + /** @var \Magento\GiftMessage\Test\Block\Message\Inline\GiftMessageForm $giftMessageForm */ + if ($giftMessage->getAllowGiftMessagesForOrder() === 'Yes') { + $this->_rootElement->find($this->giftMessageOrderButton)->click(); + $giftMessageForm = $this->blockFactory->create( + 'Magento\GiftMessage\Test\Block\Message\Inline\GiftMessageForm', + ['element' => $this->_rootElement->find($this->giftMessageOrderForm)] + ); + $giftMessageForm->fill($giftMessage); + } + + if ($giftMessage->getAllowGiftOptionsForItems() === 'Yes') { + foreach ($products as $product) { + $this->_rootElement->find( + sprintf($this->giftMessageItemButton, $product->getName()), + Locator::SELECTOR_XPATH + )->click(); + $giftMessageForm = $this->blockFactory->create( + 'Magento\GiftMessage\Test\Block\Message\Inline\GiftMessageForm', + [ + 'element' => $this->_rootElement->find( + sprintf($this->giftMessageItemForm, $product->getName()), + Locator::SELECTOR_XPATH + ) + ] + ); + $giftMessageForm->fill($giftMessage); + } + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.xml new file mode 100644 index 0000000000000000000000000000000000000000..8d65a58abe7098397019d8b83d9d140cf5478303 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<mapping strict="0"> + <fields> + <allow_gift_options> + <input>checkbox</input> + </allow_gift_options> + <allow_gift_messages_for_order> + <input>checkbox</input> + </allow_gift_messages_for_order> + <allow_gift_options_for_items> + <input>checkbox</input> + </allow_gift_options_for_items> + </fields> +</mapping> diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php new file mode 100644 index 0000000000000000000000000000000000000000..07da04410fe78ca84822dbf84799b1221059de4a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php @@ -0,0 +1,36 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Block\Message\Inline; + +use Mtf\Block\Form; + +/** + * Class GiftMessageForm + * Gift Message Form + */ +class GiftMessageForm extends Form +{ + // +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.xml new file mode 100644 index 0000000000000000000000000000000000000000..e3c1d2396b2f0ae4121a055746f749224655481d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<mapping strict="0"> + <fields> + <sender> + <selector>[id^='gift-message'][name$='[from]']</selector> + </sender> + <recipient> + <selector>[id^='gift-message'][name$='[to]']</selector> + </recipient> + <message> + <selector>[id^='gift-message'][name$='[message]']</selector> + </message> + </fields> +</mapping> diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php new file mode 100644 index 0000000000000000000000000000000000000000..7abde9db146f664b9ecf0af4ba6a663812b8aafa --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php @@ -0,0 +1,107 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Block\Message\Order\Items; + +use Mtf\Block\Block; +use Mtf\Client\Element\Locator; + +/** + * Class View + * Gift message block for order's items on order view page + */ +class View extends Block +{ + /** + * Gift message sender selector + * + * @var string + */ + protected $giftMessageSenderSelector = ".gift.sender"; + + /** + * Gift message recipient selector + * + * @var string + */ + protected $giftMessageRecipientSelector = ".gift.recipient"; + + /** + * Gift message text selector + * + * @var string + */ + protected $giftMessageTextSelector = ".message.text"; + + /** + * Selector for "Gift Message" button + * + * @var string + */ + protected $giftMessageButtonSelector = ".//td[contains(., '%s')]//a[contains(@id,'gift-message')]"; + + /** + * Selector for "Gift Message" + * + * @var string + */ + protected $giftMessageForItemSelector = ".//tr[contains(., '%s')]/following-sibling::tr"; + + /** + * Get gift message for item + * + * @param string $itemName + * @return array + */ + public function getGiftMessage($itemName) + { + $message = []; + $this->clickGiftMessageButton($itemName); + $messageElement = $this->_rootElement->find( + sprintf($this->giftMessageForItemSelector, $itemName), + Locator::SELECTOR_XPATH + ); + + $message['sender'] = $messageElement->find($this->giftMessageSenderSelector)->getText(); + $message['recipient'] = $messageElement->find($this->giftMessageRecipientSelector)->getText(); + $message['message'] = $messageElement->find($this->giftMessageTextSelector)->getText(); + $message = preg_replace('@.*?:\s(.*)@', '\1', $message); + + return $message; + } + + /** + * Click "Gift Message" for special item + * + * @param string $itemName + * @return void + */ + protected function clickGiftMessageButton($itemName) + { + $this->_rootElement->find( + sprintf($this->giftMessageButtonSelector, $itemName), + Locator::SELECTOR_XPATH + )->click(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/View.php new file mode 100644 index 0000000000000000000000000000000000000000..9204681b9fc891c0a6866291d77e0f403845da5d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/View.php @@ -0,0 +1,70 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Block\Message\Order; + +/** + * Class View + * Gift message block for order on order view page + */ +class View extends \Magento\Sales\Test\Block\Order\View +{ + /** + * Gift message sender selector + * + * @var string + */ + protected $giftMessageSenderSelector = ".gift-sender"; + + /** + * Gift message recipient selector + * + * @var string + */ + protected $giftMessageRecipientSelector = ".gift-recipient"; + + /** + * Gift message text selector + * + * @var string + */ + protected $giftMessageTextSelector = ".gift-message-text"; + + /** + * Get gift message for order + * + * @return array + */ + public function getGiftMessage() + { + $message = []; + + $message['sender'] = $this->_rootElement->find($this->giftMessageSenderSelector)->getText(); + $message['recipient'] = $this->_rootElement->find($this->giftMessageRecipientSelector)->getText(); + $message['message'] = $this->_rootElement->find($this->giftMessageTextSelector)->getText(); + $message = preg_replace('@.*?:\s(.*)@', '\1', $message); + + return $message; + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php new file mode 100644 index 0000000000000000000000000000000000000000..2e72a37db3eb8c2ede5ab3566b8034f111840d95 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php @@ -0,0 +1,80 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Constraint; + +use Magento\GiftMessage\Test\Fixture\GiftMessage; +use Magento\Sales\Test\Page\OrderHistory; +use Magento\Sales\Test\Page\OrderView; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AssertGiftMessageInFrontendOrder + * Assert that message from dataSet is displayed on order(s) view page on frontend + */ +class AssertGiftMessageInFrontendOrder extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'high'; + + /** + * Assert that message from dataSet is displayed on order(s) view page on frontend + * + * @param GiftMessage $giftMessage + * @param OrderHistory $orderHistory + * @param OrderView $orderView + * @param string $orderId + * @return void + */ + public function processAssert(GiftMessage $giftMessage, OrderHistory $orderHistory, OrderView $orderView, $orderId) + { + $expectedData = [ + 'sender' => $giftMessage->getSender(), + 'recipient' => $giftMessage->getRecipient(), + 'message' => $giftMessage->getMessage(), + ]; + $orderHistory->open(); + $orderHistory->getOrderHistoryBlock()->openOrderById($orderId); + + \PHPUnit_Framework_Assert::assertEquals( + $expectedData, + $orderView->getGiftMessageForOrderBlock()->getGiftMessage(), + 'Wrong gift message is displayed on order.' + ); + } + + /** + * Returns a string representation of successful assertion + * + * @return string + */ + public function toString() + { + return "Gift message is displayed on order(s) view page on frontend correctly."; + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php new file mode 100644 index 0000000000000000000000000000000000000000..ec1e2e09cd47499adeb047f189f41cc191154541 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php @@ -0,0 +1,88 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Constraint; + +use Magento\GiftMessage\Test\Fixture\GiftMessage; +use Magento\Sales\Test\Page\OrderHistory; +use Magento\Sales\Test\Page\OrderView; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AssertGiftMessageInFrontendOrderItems + * Assert that message from dataSet is displayed for each items on order(s) view page on frontend + */ +class AssertGiftMessageInFrontendOrderItems extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'high'; + + /** + * Assert that message from dataSet is displayed for each items on order(s) view page on frontend + * + * @param GiftMessage $giftMessage + * @param OrderHistory $orderHistory + * @param OrderView $orderView + * @param string $orderId + * @param array $products + * @return void + */ + public function processAssert( + GiftMessage $giftMessage, + OrderHistory $orderHistory, + OrderView $orderView, + $orderId, + $products = [] + ) { + $expectedData = [ + 'sender' => $giftMessage->getSender(), + 'recipient' => $giftMessage->getRecipient(), + 'message' => $giftMessage->getMessage(), + ]; + $orderHistory->open(); + $orderHistory->getOrderHistoryBlock()->openOrderById($orderId); + + foreach ($products as $product) { + \PHPUnit_Framework_Assert::assertEquals( + $expectedData, + $orderView->getGiftMessageForItemBlock()->getGiftMessage($product->getName()), + 'Wrong gift message is displayed on "' . $product->getName() . '" item.' + ); + } + } + + /** + * Returns a string representation of successful assertion + * + * @return string + */ + public function toString() + { + return "Gift message is displayed for each items on order(s) view page on frontend correctly."; + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php new file mode 100644 index 0000000000000000000000000000000000000000..1a8b15d841a5a9fef615f57ea13a5af820fc9196 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php @@ -0,0 +1,137 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\Fixture; + +use Mtf\Fixture\InjectableFixture; + +/** + * Class GiftMessage + * Fixture for gift message + */ +class GiftMessage extends InjectableFixture +{ + protected $defaultDataSet = [ + 'allow_gift_options' => 'Yes', + 'allow_gift_messages_for_order' => 'Yes', + 'sender' => 'John Doe', + 'recipient' => 'Jane Doe', + 'message' => 'text_%isolation%', + ]; + + protected $gift_message_id = [ + 'attribute_code' => 'gift_message_id', + 'backend_type' => 'int', + 'is_required' => '1', + 'default_value' => '', + 'input' => '', + ]; + + protected $customer_id = [ + 'attribute_code' => 'customer_id', + 'backend_type' => 'int', + 'is_required' => '', + 'default_value' => '0', + 'input' => '', + ]; + + protected $sender = [ + 'attribute_code' => 'sender', + 'backend_type' => 'varchar', + 'is_required' => '', + 'default_value' => '', + 'input' => '', + ]; + + protected $recipient = [ + 'attribute_code' => 'recipient', + 'backend_type' => 'varchar', + 'is_required' => '', + 'default_value' => '', + 'input' => '', + ]; + + protected $message = [ + 'attribute_code' => 'message', + 'backend_type' => 'text', + 'is_required' => '', + 'default_value' => '', + 'input' => '', + ]; + + protected $allow_gift_options = [ + 'attribute_code' => 'allow_gift_options', + 'backend_type' => 'virtual', + ]; + + protected $allow_gift_messages_for_order = [ + 'attribute_code' => 'allow_gift_messages_for_order', + 'backend_type' => 'virtual', + ]; + + protected $allow_gift_options_for_items = [ + 'attribute_code' => 'allow_gift_options_for_items', + 'backend_type' => 'virtual', + ]; + + public function getGiftMessageId() + { + return $this->getData('gift_message_id'); + } + + public function getCustomerId() + { + return $this->getData('customer_id'); + } + + public function getSender() + { + return $this->getData('sender'); + } + + public function getRecipient() + { + return $this->getData('recipient'); + } + + public function getMessage() + { + return $this->getData('message'); + } + + public function getAllowGiftMessagesForOrder() + { + return $this->getData('allow_gift_messages_for_order'); + } + + public function getAllowGiftOptionsForItems() + { + return $this->getData('allow_gift_options_for_items'); + } + + public function getAllowGiftOptions() + { + return $this->getData('allow_gift_options'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml new file mode 100644 index 0000000000000000000000000000000000000000..4d5134a25248d6e9ccfa7e760289bf1a9457c60f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<fixture class="Magento\GiftMessage\Test\Fixture\GiftMessage"> + <module>Magento_GiftMessage</module> + <type>flat</type> + <entity_type>gift_message</entity_type> + <collection>Magento\GiftMessage\Model\Resource\Message\Collection</collection> + <identifier>gift_message_id</identifier> + <fields> + <gift_message_id> + <attribute_code>gift_message_id</attribute_code> + <backend_type>int</backend_type> + <is_required>1</is_required> + <default_value /> + <input /> + </gift_message_id> + <customer_id> + <attribute_code>customer_id</attribute_code> + <backend_type>int</backend_type> + <is_required /> + <default_value>0</default_value> + <input /> + </customer_id> + <sender> + <attribute_code>sender</attribute_code> + <backend_type>varchar</backend_type> + <is_required /> + <default_value /> + <input /> + </sender> + <recipient> + <attribute_code>recipient</attribute_code> + <backend_type>varchar</backend_type> + <is_required /> + <default_value /> + <input /> + </recipient> + <message> + <attribute_code>message</attribute_code> + <backend_type>text</backend_type> + <is_required /> + <default_value /> + <input /> + </message> + <allow_gift_options> + <attribute_code>allow_gift_options</attribute_code> + <backend_type>virtual</backend_type> + </allow_gift_options> + <allow_gift_messages_for_order> + <attribute_code>allow_gift_messages_for_order</attribute_code> + <backend_type>virtual</backend_type> + </allow_gift_messages_for_order> + <allow_gift_options_for_items> + <attribute_code>allow_gift_options_for_items</attribute_code> + <backend_type>virtual</backend_type> + </allow_gift_options_for_items> + </fields> +</fixture> diff --git a/app/code/Magento/Core/etc/layout_single.xsd b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml similarity index 71% rename from app/code/Magento/Core/etc/layout_single.xsd rename to dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml index c67ef1a8d07a062199524d88910eb6e022e3db0a..59f1088d9ca34ccf5cd6a8b42e196893805f091b 100644 --- a/app/code/Magento/Core/etc/layout_single.xsd +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" ?> <!-- /** * Magento @@ -23,13 +23,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:include schemaLocation="layouts.xsd"/> - - <xs:element name="layout" type="layoutType"> - <xs:unique name="containerKey"> - <xs:selector xpath=".//container"/> - <xs:field xpath="@name"/> - </xs:unique> - </xs:element> -</xs:schema> +<page mca="checkout/onepage"> + <blocks> + <giftMessagesBlock> + <class>Magento\GiftMessage\Test\Block\Message\Inline</class> + <locator>.gift-message</locator> + <strategy>css selector</strategy> + </giftMessagesBlock> + </blocks> +</page> diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml new file mode 100644 index 0000000000000000000000000000000000000000..38f4734ae62e17feb47788086ecfa9f734b27c9d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page mca="customer/sales/order/view"> + <blocks> + <giftMessageForOrderBlock> + <class>Magento\GiftMessage\Test\Block\Message\Order\View</class> + <locator>.block-order-details-additional</locator> + <strategy>css selector</strategy> + </giftMessageForOrderBlock> + <giftMessageForItemBlock> + <class>Magento\GiftMessage\Test\Block\Message\Order\Items\View</class> + <locator>#my-orders-table</locator> + <strategy>css selector</strategy> + </giftMessageForItemBlock> + </blocks> +</page> diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php new file mode 100644 index 0000000000000000000000000000000000000000..41de31ae3e6bdfcc1dc2b8f05284b540348c96a7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php @@ -0,0 +1,159 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\TestCase; + +use Magento\Customer\Test\Page\CustomerAccountLogout; +use Mtf\ObjectManager; +use Mtf\TestCase\Scenario; + +/** + * Test Creation for Checkout with Gift Messages + * + * Test Flow: + * + * Preconditions: + * 1. Enable Gift Messages (Order/Items level) + * 2. Create Product according dataSet + * + * Steps: + * 1. Login as registered customer + * 2. Add product to Cart and start checkout + * 3. On Shipping Method section Click "Add gift option" + * 4. Complete Checkout steps + * 5. Perform all asserts + * + * @group Gift_Messages_(CS) + * @ZephyrId MAGETWO-28978 + */ +class CheckoutWithGiftMessagesTest extends Scenario +{ + /** + * Steps for scenario + * + * @var array + */ + protected $scenario = [ + 'CheckoutWithGiftMessagesTest' => [ + 'methods' => [ + 'test' => [ + 'scenario' => [ + 'setupConfiguration' => [ + 'module' => 'Magento_Core', + 'next' => 'createProducts', + 'arguments' => [ + 'configData' => 'cashondelivery, enableGiftMessages', + ], + ], + 'createProducts' => [ + 'module' => 'Magento_Catalog', + 'next' => 'createCustomer', + ], + 'createCustomer' => [ + 'module' => 'Magento_Customer', + 'next' => 'addProductsToTheCart' + ], + 'addProductsToTheCart' => [ + 'module' => 'Magento_Checkout', + 'next' => 'proceedToCheckout', + ], + 'proceedToCheckout' => [ + 'module' => 'Magento_Checkout', + 'next' => 'selectCheckoutMethod', + ], + 'selectCheckoutMethod' => [ + 'module' => 'Magento_Checkout', + 'next' => 'fillBillingInformation', + ], + 'fillBillingInformation' => [ + 'module' => 'Magento_Checkout', + 'next' => 'addGiftMessage', + ], + 'addGiftMessage' => [ + 'module' => 'Magento_GiftMessage', + 'next' => 'fillShippingMethod', + ], + 'fillShippingMethod' => [ + 'module' => 'Magento_Checkout', + 'next' => 'selectPaymentMethod', + ], + 'selectPaymentMethod' => [ + 'module' => 'Magento_Checkout', + 'next' => 'placeOrder', + ], + 'placeOrder' => [ + 'module' => 'Magento_Checkout', + ], + ] + ] + ] + ] + ]; + + /** + * Configuration data set name + * + * @var string + */ + protected $configuration; + + /** + * Customer logout page + * + * @var CustomerAccountLogout + */ + protected $customerAccountLogout; + + /** + * Preparing configuration for test + * + * @param CustomerAccountLogout $customerAccountLogout + * @return void + */ + public function __prepare( + CustomerAccountLogout $customerAccountLogout + ) { + $this->customerAccountLogout = $customerAccountLogout; + } + + /** + * Runs one page checkout test + * + * @return void + */ + public function test() + { + $this->executeScenario($this->scenario); + } + + /** + * Logout customer + * + * @return void + */ + public function tearDown() + { + $this->customerAccountLogout->open(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv new file mode 100644 index 0000000000000000000000000000000000000000..a11cab46509db9f3299da9623464c9ad3b30681d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv @@ -0,0 +1,3 @@ +"products";"customer/dataSet";"billingAddress/dataSet";"checkoutMethod";"shipping/shipping_service";"shipping/shipping_method";"giftMessage/data/allow_gift_options";"giftMessage/data/allow_gift_messages_for_order";"giftMessage/data/allow_gift_options_for_items";"giftMessage/data/sender";"giftMessage/data/recipient";"giftMessage/data/message";"payment/method";"constraint" +"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"login";"Flat Rate";"Fixed";"Yes";"Yes";"-";"John Doe";"Jane Doe";"text_gift_message";"cashondelivery";"assertOrderSuccessPlacedMessage, assertGiftMessageInFrontendOrder" +"catalogProductSimple::default, catalogProductVirtual::default";"customer_US";"customer_US";"login";"Flat Rate";"Fixed";"Yes";"-";"Yes";"John Doe";"Jane Doe";"text_gift_message";"cashondelivery";"assertOrderSuccessPlacedMessage, assertGiftMessageInFrontendOrderItems" diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php new file mode 100644 index 0000000000000000000000000000000000000000..81796a3f2daaa786ff10dc243e0815fb56bc4460 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php @@ -0,0 +1,80 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\GiftMessage\Test\TestStep; + +use Magento\Checkout\Test\Page\CheckoutOnepage; +use Magento\GiftMessage\Test\Fixture\GiftMessage; +use Mtf\TestStep\TestStepInterface; + +/** + * Class AddGiftMessageStep + * Add gift message to order or item + */ +class AddGiftMessageStep implements TestStepInterface +{ + /** + * Onepage checkout page + * + * @var CheckoutOnepage + */ + protected $checkoutOnepage; + + /** + * Gift message fixture + * + * @var GiftMessage + */ + protected $giftMessage; + + /** + * Array with products + * + * @var array + */ + protected $products; + + /** + * @constructor + * @param CheckoutOnepage $checkoutOnepage + * @param GiftMessage $giftMessage + * @param array $products + */ + public function __construct(CheckoutOnepage $checkoutOnepage, GiftMessage $giftMessage, array $products = []) + { + $this->checkoutOnepage = $checkoutOnepage; + $this->giftMessage = $giftMessage; + $this->products = $products; + } + + /** + * Add gift message to order + * + * @return void + */ + public function run() + { + $this->checkoutOnepage->getGiftMessagesBlock()->fillGiftMessage($this->giftMessage, $this->products); + } +} diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml new file mode 100644 index 0000000000000000000000000000000000000000..2be26c5cec4c4d3c639f8a47c9ae464bc72e78f6 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<constraint> + <assertGiftMessageInFrontendOrderItems module="Magento_GiftMessage"> + <severeness>high</severeness> + </assertGiftMessageInFrontendOrderItems> + <assertGiftMessageInFrontendOrder module="Magento_GiftMessage"> + <severeness>high</severeness> + </assertGiftMessageInFrontendOrder> +</constraint> diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/fixture.xml new file mode 100644 index 0000000000000000000000000000000000000000..a916a14cf3c4fb04b0c432e35f831812aa9fa2dd --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/fixture.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<fixture> + <giftMessage module="Magento_GiftMessage"> + <type>flat</type> + <entity_type>gift_message</entity_type> + <collection>Magento\GiftMessage\Model\Resource\Message\Collection</collection> + <identifier>gift_message_id</identifier> + </giftMessage> +</fixture> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php new file mode 100644 index 0000000000000000000000000000000000000000..9937b4ba01e0ca0dfc003878157a8b4af94e0461 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php @@ -0,0 +1,36 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed; + +use Magento\Reports\Test\Block\Adminhtml\AbstractFilter; + +/** + * Class Filter + * Filter for Sales Report + */ +class Filter extends AbstractFilter +{ + // +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml new file mode 100644 index 0000000000000000000000000000000000000000..23f9fe8ac89a8306e37e4c5375bb4c79b0239772 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<mapping strict="0"> + <fields> + <from> + <input>datepicker</input> + </from> + <to> + <input>datepicker</input> + </to> + <period_type> + <input>select</input> + </period_type> + <report_type> + <input>select</input> + </report_type> + <show_empty_rows> + <input>select</input> + </show_empty_rows> + <show_order_statuses> + <input>select</input> + </show_order_statuses> + <order_statuses> + <selector>[name="order_statuses[]"]</selector> + <input>multiselect</input> + </order_statuses> + <show_actual_columns> + <input>select</input> + </show_actual_columns> + </fields> +</mapping> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php new file mode 100644 index 0000000000000000000000000000000000000000..2bea1a7b484203c4bbca3b2c55df8d108afe740d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php @@ -0,0 +1,102 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed; + +use Magento\Backend\Test\Block\Widget\Grid; +use Mtf\Client\Element\Locator; + +/** + * Class FilterGrid + * Sales Report filter grid + */ +class FilterGrid extends Grid +{ + /** + * Filters row locator + * + * @var string + */ + protected $filterRows = '(//tr[td[contains(@class, "col-orders")]])[last()]/td[contains(@class, "col-%s")]'; + + /** + * Filters row locator + * + * @var string + */ + protected $totalRows = '//tfoot/tr/th[contains(@class, "col-%s")]'; + + /** + * Rows for get sales result + * + * @var array + */ + protected $rows = [ + 'orders', + 'sales-items', + 'sales-total', + 'invoiced', + ]; + + /** + * Get last sales from Sales Report grid + * + * @return array + */ + public function getLastSalesResult() + { + return $this->getResults($this->filterRows); + } + + /** + * Get total sales from Sales Report grid + * + * @return array + */ + public function getSalesTotalResult() + { + return $this->getResults($this->totalRows); + } + + /** + * Get sales data from Sales Report grid + * + * @param array $filterRows + * @return array + */ + protected function getResults($filterRows) + { + $orders = []; + $row = $this->_rootElement->find(sprintf($filterRows, $this->rows[0]), Locator::SELECTOR_XPATH); + if (!$row->isVisible()) { + return array_fill_keys($this->rows, 0); + } + foreach ($this->rows as $row) { + $value = $this->_rootElement->find(sprintf($this->filterRows, $row), Locator::SELECTOR_XPATH)->getText(); + $orders[$row] = preg_replace('`[$,]`', '', $value); + } + + return $orders; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/Action.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Viewed/Action.php similarity index 92% rename from dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/Action.php rename to dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Viewed/Action.php index bccabb9ab184b7da74044e94ffa87ee23caf8476..2b18d5a9e235ade6b0acbe7544c3fd1598ba2c96 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/Action.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Viewed/Action.php @@ -22,13 +22,13 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed; +namespace Magento\Reports\Test\Block\Adminhtml\Viewed; use Magento\Backend\Test\Block\GridPageActions; /** * Class Action - * Action block for Product Views Report + * Action block for Report Filter */ class Action extends GridPageActions { diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php new file mode 100644 index 0000000000000000000000000000000000000000..ff9ee81532abf1a7c00847f338f4561f15fe0979 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php @@ -0,0 +1,97 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Mtf\ObjectManager; +use Magento\Sales\Test\Fixture\OrderInjectable; +use Magento\Reports\Test\Page\Adminhtml\SalesReport; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AbstractAssertSalesReportResult + * Abstract assert for search in sales report grid + */ +abstract class AbstractAssertSalesReportResult extends AbstractConstraint +{ + /** + * Sales report page + * + * @var SalesReport + */ + protected $salesReportPage; + + /** + * Order + * + * @var OrderInjectable + */ + protected $order; + + /** + * @constructor + * @param ObjectManager $objectManager + * @param SalesReport $salesReportPage + */ + public function __construct(ObjectManager $objectManager, SalesReport $salesReportPage) + { + parent::__construct($objectManager); + $this->salesReportPage = $salesReportPage; + } + + /** + * Search in sales report grid + * + * @param array $salesReport + * @return void + */ + protected function searchInSalesReportGrid(array $salesReport) + { + $this->salesReportPage->open(); + $this->salesReportPage->getMessagesBlock()->clickLinkInMessages('notice', 'here'); + $this->salesReportPage->getFilterBlock()->viewsReport($salesReport); + $this->salesReportPage->getActionBlock()->showReport(); + } + + /** + * Prepare expected result + * + * @param array $expectedSalesData + * @return array + */ + protected function prepareExpectedResult(array $expectedSalesData) + { + $salesItems = 0; + $invoice = $this->order->getPrice()[0]['grand_invoice_total']; + $salesTotal = $this->order->getPrice()[0]['grand_order_total']; + foreach ($this->order->getEntityId()['products'] as $product) { + $salesItems += $product->getCheckoutData()['options']['qty']; + } + $expectedSalesData['orders'] += 1; + $expectedSalesData['sales-items'] += $salesItems; + $expectedSalesData['sales-total'] += $salesTotal; + $expectedSalesData['invoiced'] += $invoice; + return $expectedSalesData; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php new file mode 100644 index 0000000000000000000000000000000000000000..cc1319c0dfbd67411b12b07f46fd24629228d3af --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Magento\Sales\Test\Fixture\OrderInjectable; + +/** + * Class AssertSalesReportIntervalResult + * Assert that sales info in report grid is actual + */ +class AssertSalesReportIntervalResult extends AbstractAssertSalesReportResult +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that sales info in report grid is actual + * + * @param OrderInjectable $order + * @param array $salesReport + * @param array $initialSalesResult + * @return void + */ + public function processAssert(OrderInjectable $order, array $salesReport, array $initialSalesResult) + { + $this->order = $order; + $this->searchInSalesReportGrid($salesReport); + $salesResult = $this->salesReportPage->getGridBlock()->getLastSalesResult(); + $prepareInitialResult = $this->prepareExpectedResult($initialSalesResult); + \PHPUnit_Framework_Assert::assertEquals( + $prepareInitialResult, + $salesResult, + "Grand total Sales result is not correct." + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Sales report interval result contains actual data.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php new file mode 100644 index 0000000000000000000000000000000000000000..41f645b21fb62af1b30201ba7eec1dbe97d66225 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Magento\Sales\Test\Fixture\OrderInjectable; + +/** + * Class AssertSalesReportTotalResult + * Assert that total sales info in report grid is actual + */ +class AssertSalesReportTotalResult extends AbstractAssertSalesReportResult +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that total sales info in report grid is actual + * + * @param OrderInjectable $order + * @param array $salesReport + * @param array $initialSalesTotalResult + * @return void + */ + public function processAssert(OrderInjectable $order, array $salesReport, array $initialSalesTotalResult) + { + $this->order = $order; + $this->searchInSalesReportGrid($salesReport); + $salesResult = $this->salesReportPage->getGridBlock()->getSalesTotalResult(); + $prepareInitialResult = $this->prepareExpectedResult($initialSalesTotalResult); + \PHPUnit_Framework_Assert::assertEquals( + $prepareInitialResult, + $salesResult, + "Grand total Sales result is not correct." + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Sales report grand total result contains actual data.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml index 32c82d39a3a778cbc370c92ad52ea27909b4b15e..c9829619c4ae424cf046331bb88c1c8f10b49c65 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml @@ -26,17 +26,17 @@ <page mca="reports/report_product/viewed/" module="Magento_Reports"> <blocks> <actionsBlock> - <class>Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\Action</class> + <class>Magento\Reports\Test\Block\Adminhtml\Viewed\Action</class> <locator>.page-main-actions</locator> <strategy>css selector</strategy> </actionsBlock> <gridBlock> - <class>Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid</class> + <class>Magento\Reports\Test\Block\Adminhtml\Viewed\FilterGrid</class> <locator>.grid</locator> <strategy>css selector</strategy> </gridBlock> <filterBlock> - <class>Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\Filter</class> + <class>Magento\Reports\Test\Block\Adminhtml\Viewed\Filter</class> <locator>#filter_form</locator> <strategy>css selector</strategy> </filterBlock> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml new file mode 100644 index 0000000000000000000000000000000000000000..aba158336cd5036a446449c9b68e6bc8938e4cd7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page mca="reports/report_sales/sales/" module="Magento_Reports"> + <blocks> + <messagesBlock> + <class>Magento\Core\Test\Block\Messages</class> + <locator>#messages .messages</locator> + <strategy>css selector</strategy> + </messagesBlock> + <filterBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\Filter</class> + <locator>#filter_form</locator> + <strategy>css selector</strategy> + </filterBlock> + <actionBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Viewed\Action</class> + <locator>.page-main-actions</locator> + <strategy>css selector</strategy> + </actionBlock> + <gridBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid</class> + <locator>.grid</locator> + <strategy>css selector</strategy> + </gridBlock> + </blocks> +</page> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php new file mode 100644 index 0000000000000000000000000000000000000000..f3bba647870129ae8b6116ffe240deb3a3100dcf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php @@ -0,0 +1,101 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\TestCase; + +use Magento\Reports\Test\Page\Adminhtml\SalesReport; +use Magento\Sales\Test\Fixture\OrderInjectable; +use Mtf\TestCase\Injectable; + +/** + * Test Creation for SalesOrderReportEntity + * + * Test Flow: + * + * Preconditions: + * 1. Open Backend + * 2. Go to Reports > Sales > Orders + * 3. Refresh statistic + * 4. Configure filter + * 5. Click "Show Report" + * 6. Save/remember report result + * 7. Create customer + * 8. Place order + * 9. Create Invoice + * 10. Refresh statistic + * + * Steps: + * 1. Open Backend + * 2. Go to Reports > Sales > Orders + * 3. Configure filter + * 4. Click "Show Report" + * 5. Perform all assertions + * + * @group Reports_(MX) + * @ZephyrId MAGETWO-29136 + */ +class SalesOrderReportEntityTest extends Injectable +{ + /** + * Sales Report page + * + * @var SalesReport + */ + protected $salesReport; + + /** + * Inject page + * + * @param SalesReport $salesReport + * @return void + */ + public function __inject(SalesReport $salesReport) + { + $this->salesReport = $salesReport; + } + + /** + * Sales order report + * + * @param OrderInjectable $order + * @param array $salesReport + * @return array + */ + public function test(OrderInjectable $order, array $salesReport) + { + // Preconditions + $this->salesReport->open(); + $this->salesReport->getMessagesBlock()->clickLinkInMessages('notice', 'here'); + $this->salesReport->getFilterBlock()->viewsReport($salesReport); + $this->salesReport->getActionBlock()->showReport(); + $initialSalesResult = $this->salesReport->getGridBlock()->getLastSalesResult(); + $initialSalesTotalResult = $this->salesReport->getGridBlock()->getSalesTotalResult(); + + $order->persist(); + $invoice = $this->objectManager->create('Magento\Sales\Test\TestStep\CreateInvoiceStep', ['order' => $order]); + $invoice->run(); + + return ['initialSalesResult' => $initialSalesResult, 'initialSalesTotalResult' => $initialSalesTotalResult]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv new file mode 100644 index 0000000000000000000000000000000000000000..6d76088f8995d6d2ddd4f6a76f7dba900483991f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv @@ -0,0 +1,4 @@ +"order/dataSet";"order/data/price/preset";"salesReport/report_type";"salesReport/report_period";"salesReport/from";"salesReport/to";"salesReport/show_order_statuses";"salesReport/order_statuses";"salesReport/show_empty_rows";"salesReport/show_actual_columns";"constraint" +"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"Yes";"assertSalesReportIntervalResult, assertSalesReportTotalResult" +"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult" +"default";"full_invoice";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult" diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php index 58f573b19378ce57ff06744079e117f896ef8aa7..92b5ce26a8a18d66c39f826e732cc739b4eedd08 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php @@ -94,7 +94,6 @@ class SearchTermsReportEntityTest extends Injectable */ public function test(CatalogProductSimple $product, $countProducts, $countSearch) { - $this->markTestIncomplete('MAGETWO-27150'); // Preconditions $productName = $this->createProducts($product, $countProducts); diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml index 176c7b60ecc4d173fb1f7c1be584bcb368cb42b8..a750afef7c46fe5a29773cad3839aef3a06d3b45 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml @@ -84,4 +84,10 @@ <assertDownloadsReportResult module="Magento_Reports"> <severeness>low</severeness> </assertDownloadsReportResult> + <assertSalesReportIntervalResult module="Magento_Reports"> + <severeness>low</severeness> + </assertSalesReportIntervalResult> + <assertSalesReportTotalResult module="Magento_Reports"> + <severeness>low</severeness> + </assertSalesReportTotalResult> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml index e100c4aaf969198b7f80ae6465e09d7403e29680..ff9733f3969278f056605b8ccd24f44129b0a84e 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml @@ -99,4 +99,9 @@ <area>adminhtml</area> <class>Magento\Reports\Test\Page\Adminhtml\DownloadsReport</class> </downloadsReport> + <salesReport> + <mca>reports/report_sales/sales</mca> + <area>adminhtml</area> + <class>Magento\Reports\Test\Page\Adminhtml\SalesReport</class> + </salesReport> </page> diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php index 1857bc345663e1644c4a3b8779e987aaaae2d7cf..1926497f211011c3aed079ed031693811e6f1df5 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php @@ -86,6 +86,13 @@ class Form extends FormInterface */ protected $optionMaskElement = './/*[contains(@class, "mselect-list-item")]//label/span[text()="%s"]'; + /** + * Multi select list items + * + * @var string + */ + protected $maskElement = '.mselect-list-item:first-child label'; + /** * XPath selector for "Add New Tax Rate" button * @@ -162,6 +169,7 @@ class Form extends FormInterface $taxRatesFixture = $taxRatesFixture->getFixture(); $taxRatesData = $taxRule->getTaxRate(); + $this->waitForElementVisible($this->maskElement); foreach ($taxRatesData as $key => $taxRate) { $option = $taxRateBlock->find(sprintf($this->optionMaskElement, $taxRate), Locator::SELECTOR_XPATH); if (!$option->isVisible()) { diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Grid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Grid.php index 2c0674e163229b566a961df2dbb4ee6aee737a53..6e2ec59b8a90eeaee8a2971d49384632b303893e 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Grid.php +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Grid.php @@ -43,6 +43,9 @@ class Grid extends ParentGrid ], 'id_path' => [ 'selector' => '#urlrewriteGrid_filter_id_path' + ], + 'target_path' => [ + 'selector' => 'input[name="target_path"]' ] ]; } diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php new file mode 100644 index 0000000000000000000000000000000000000000..7984b9e8a1e9ae41b697146d771c96e09934cce8 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php @@ -0,0 +1,70 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\UrlRewrite\Test\Constraint; + +use Magento\Catalog\Test\Fixture\CatalogCategory; +use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AssertUrlRewriteCategoryInGrid + * Assert that url category in grid + */ +class AssertUrlRewriteCategoryInGrid extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that url rewrite category in grid + * + * @param CatalogCategory $category + * @param UrlRewriteIndex $urlRewriteIndex + * @return void + */ + public function processAssert(CatalogCategory $category, UrlRewriteIndex $urlRewriteIndex) + { + $urlRewriteIndex->open(); + $filter = ['target_path' => strtolower($category->getUrlKey())]; + \PHPUnit_Framework_Assert::assertTrue( + $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false), + 'URL Rewrite with request path "' . $category->getUrlKey() . '" is absent in grid.' + ); + } + + /** + * URL rewrite category present in grid + * + * @return string + */ + public function toString() + { + return 'URL Rewrite is present in grid.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml index e31fa6d8213999bd4812d253ab70effdf5f17035..2ee0efd91ba1ba02a349f585cfd100a39f6f9e92 100644 --- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml @@ -85,4 +85,7 @@ <categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView"/> </require> </assertUrlRewriteCustomSearchRedirect> + <assertUrlRewriteCategoryInGrid module="Magento_UrlRewrite"> + <severeness>low</severeness> + </assertUrlRewriteCategoryInGrid> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php index 8c0ff30f8efda0169a543ecf5164cd9e6654095a..b11f0a3d560af184cd3e523d0608c035326b94f1 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php @@ -46,6 +46,20 @@ class Product extends Form */ protected $remove = '[data-role="remove"]'; + /** + * Selector for 'View Details' element + * + * @var string + */ + protected $viewDetails = '.details.tooltip'; + + /** + * Selector for 'Options Details' tooltip + * + * @var string + */ + protected $optionsDetails = '.tooltip.content .values'; + /** * Fill item product details * @@ -77,4 +91,25 @@ class Product extends Form { $this->_rootElement->find($this->remove)->click(); } + + /** + * Get product options + * + * @return array|null + */ + public function getOptions() + { + $viewDetails = $this->_rootElement->find($this->viewDetails); + if ($viewDetails->isVisible()) { + $viewDetails->click(); + $values = $this->_rootElement->find($this->optionsDetails)->getElements(); + $data = []; + foreach ($values as $value) { + $data[] = $value->getText(); + } + return $data; + } else { + return null; + } + } } diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php new file mode 100644 index 0000000000000000000000000000000000000000..bba7f2e90f6d970d318a333cbf576e719b699f67 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php @@ -0,0 +1,74 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Wishlist\Test\Constraint; + +use Magento\Wishlist\Test\Page\WishlistIndex; +use Mtf\Constraint\AbstractConstraint; +use Mtf\Fixture\InjectableFixture; + +/** + * Class AssertAddProductToWishlistSuccessMessage + * Assert that success message appears on My Wish List page after adding product to wishlist. + */ +class AssertAddProductToWishlistSuccessMessage extends AbstractConstraint +{ + /** + * Success add message + */ + const SUCCESS_MESSAGE = "%s has been added to your wishlist. Click here to continue shopping."; + + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that success message appears on My Wish List page after adding product to wishlist. + * + * @param WishlistIndex $wishlistIndex + * @param InjectableFixture $product + * @return void + */ + public function processAssert(WishlistIndex $wishlistIndex, $product) + { + \PHPUnit_Framework_Assert::assertEquals( + sprintf(self::SUCCESS_MESSAGE, $product->getName()), + $wishlistIndex->getMessagesBlock()->getSuccessMessages(), + "Expected success message doesn't match actual." + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Success message appears on My Wish List page after adding product to wishlist.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertBundleProductDetailsInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertBundleProductDetailsInWishlist.php new file mode 100644 index 0000000000000000000000000000000000000000..6acd6c80e2f85f7cbb6fcff3be19730e340f51a7 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertBundleProductDetailsInWishlist.php @@ -0,0 +1,109 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Wishlist\Test\Constraint; + +use Mtf\Constraint\AbstractConstraint; +use Magento\Cms\Test\Page\CmsIndex; +use Magento\Customer\Test\Page\CustomerAccountIndex; +use Magento\Wishlist\Test\Page\WishlistIndex; +use Mtf\Fixture\FixtureFactory; +use Mtf\Fixture\InjectableFixture; + +/** + * Class AssertBundleProductDetailsInWishlist + * Assert that the correct option details are displayed on the "View Details" tool tip. + */ +class AssertBundleProductDetailsInWishlist extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that the correct option details are displayed on the "View Details" tool tip. + * + * @param CmsIndex $cmsIndex + * @param CustomerAccountIndex $customerAccountIndex + * @param WishlistIndex $wishlistIndex + * @param InjectableFixture $product + * @param FixtureFactory $fixtureFactory + * @return void + */ + public function processAssert( + CmsIndex $cmsIndex, + CustomerAccountIndex $customerAccountIndex, + WishlistIndex $wishlistIndex, + InjectableFixture $product, + FixtureFactory $fixtureFactory + ) { + $cmsIndex->getLinksBlock()->openLink('My Account'); + $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List'); + $productBlock = $wishlistIndex->getItemsBlock()->getItemProduct($product); + $actualOptions = $this->prepareOptions($productBlock->getOptions()); + $cartFixture = $fixtureFactory->createByCode('cart', ['data' => ['items' => ['products' => [$product]]]]); + $bundleOptions = $cartFixture->getItems()[0]->getData()['options']; + $expectedOptions = []; + foreach ($bundleOptions as $option) { + $expectedOptions[] = $option['value']; + } + + \PHPUnit_Framework_Assert::assertEquals( + $expectedOptions, + $actualOptions, + "Expected bundle options are not equals to actual" + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return "Expected bundle options are equal to actual"; + } + + /** + * Prepare bundle options for comparing + * + * @param array $options + * @return array + */ + protected function prepareOptions($options) + { + foreach ($options as &$option) { + $chunks = explode(' ', $option); + $lastChunk = array_pop($chunks); + $lastChunk = preg_replace("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", '\1', $lastChunk); + array_push($chunks, $lastChunk); + $option = implode(' ', $chunks); + } + return $options; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php new file mode 100644 index 0000000000000000000000000000000000000000..2f23a3a0275e8d444038bf395057b69d5e594adf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php @@ -0,0 +1,84 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Wishlist\Test\Constraint; + +use Magento\Customer\Test\Fixture\CustomerInjectable; +use Magento\Customer\Test\Page\Adminhtml\CustomerIndex; +use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit; +use Mtf\Constraint\AbstractConstraint; +use Mtf\Fixture\InjectableFixture; + +/** + * Class AssertProductIsPresentInCustomerBackendWishlist + * Assert that product added to wishlist is present on Customers account on backend + * - in section Customer Activities - Wishlist + */ +class AssertProductIsPresentInCustomerBackendWishlist extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that products added to wishlist are present on Customers account on backend. + * + * @param CustomerIndex $customerIndex + * @param CustomerInjectable $customer + * @param CustomerIndexEdit $customerIndexEdit + * @param InjectableFixture $product + * @return void + */ + public function processAssert( + CustomerIndex $customerIndex, + CustomerInjectable $customer, + CustomerIndexEdit $customerIndexEdit, + InjectableFixture $product + ) { + $customerIndex->open(); + $customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $customer->getEmail()]); + $customerIndexEdit->getCustomerForm()->openTab('wishlist'); + /** @var \Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid $wishlistGrid */ + $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTabElement('wishlist')->getSearchGridBlock(); + + \PHPUnit_Framework_Assert::assertTrue( + $wishlistGrid->isRowVisible(['product_name' => $product->getName()]), + $product->getName() . " is not visible in customer wishlist on backend." + ); + + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return "Product is visible in customer wishlist on backend."; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php new file mode 100644 index 0000000000000000000000000000000000000000..2628e40b9e1c84823cbc3c03aeccfa6cd10edb29 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php @@ -0,0 +1,79 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Wishlist\Test\Constraint; + +use Magento\Cms\Test\Page\CmsIndex; +use Magento\Customer\Test\Page\CustomerAccountIndex; +use Magento\Wishlist\Test\Page\WishlistIndex; +use Mtf\Constraint\AbstractConstraint; +use Mtf\Fixture\InjectableFixture; + +/** + * Class AssertProductIsPresentInWishlist + * Assert that product is present in default wishlist + */ +class AssertProductIsPresentInWishlist extends AbstractConstraint +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that product is present in default wishlist + * + * @param CmsIndex $cmsIndex + * @param CustomerAccountIndex $customerAccountIndex + * @param WishlistIndex $wishlistIndex + * @param InjectableFixture $product + * @return void + */ + public function processAssert( + CmsIndex $cmsIndex, + CustomerAccountIndex $customerAccountIndex, + WishlistIndex $wishlistIndex, + InjectableFixture $product + ) { + $cmsIndex->getLinksBlock()->openLink('My Account'); + $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List'); + + \PHPUnit_Framework_Assert::assertTrue( + $wishlistIndex->getItemsBlock()->getItemProduct($product)->isVisible(), + $product->getName() . ' is not visible on wishlist page.' + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Product is present in default wishlist'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php new file mode 100644 index 0000000000000000000000000000000000000000..4317988f091e9bd9c40617c4338dc5607d1f878d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php @@ -0,0 +1,187 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Wishlist\Test\TestCase; + +use Magento\Customer\Test\Page\CustomerAccountLogout; +use Mtf\TestCase\Injectable; +use Mtf\Client\Driver\Selenium\Browser; +use Mtf\Fixture\InjectableFixture; +use Mtf\ObjectManager; +use Magento\Catalog\Test\Page\Product\CatalogProductView; +use Magento\Customer\Test\Fixture\CustomerInjectable; + +/** + * Test Creation for AddProductToWishlistEntity + * + * Test Flow: + * + * Preconditions: + * 1. Customer is registered + * 2. Product is created + * + * Steps: + * 1. Login as a customer + * 2. Navigate to catalog page + * 3. Add created product to Wishlist according to dataSet + * 4. Perform all assertions + * + * @group Wishlist_(CS) + * @ZephyrId MAGETWO-29045 + */ +class AddProductToWishlistEntityTest extends Injectable +{ + /** + * Catalog product view page + * + * @var CatalogProductView + */ + protected $catalogProductView; + + /** + * Customer Account Logout page + * + * @var CustomerAccountLogout + */ + protected $customerAccountLogout; + + /** + * Browser object + * + * @var Browser + */ + protected $browser; + + /** + * ObjectManager object + * + * @var ObjectManager + */ + protected $objectManager; + + /** + * Prepare data for test + * + * @param CustomerInjectable $customer + * @param Browser $browser + * @param ObjectManager $objectManager + * @return array + */ + public function __prepare(CustomerInjectable $customer, Browser $browser, ObjectManager $objectManager) + { + $this->browser = $browser; + $this->objectManager = $objectManager; + $customer->persist(); + + return ['customer' => $customer]; + } + + /** + * Injection data + * + * @param CatalogProductView $catalogProductView + * @param CustomerAccountLogout $customerAccountLogout + * @return void + */ + public function __inject( + CatalogProductView $catalogProductView, + CustomerAccountLogout $customerAccountLogout + ) { + $this->catalogProductView = $catalogProductView; + $this->customerAccountLogout = $customerAccountLogout; + } + + /** + * Run Add Product To Wishlist test + * + * @param CustomerInjectable $customer + * @param string $product + * @return array + */ + public function test(CustomerInjectable $customer, $product) + { + $this->markTestIncomplete('Bug: MAGETWO-27949'); + $product = $this->createProduct($product); + + // Steps: + $this->loginCustomer($customer); + $this->addProductToWishlist($product); + + return ['product' => $product]; + } + + /** + * Create product + * + * @param string $product + * @return InjectableFixture + */ + protected function createProduct($product) + { + $createProducts = $this->objectManager->create( + 'Magento\Catalog\Test\TestStep\CreateProductsStep', + ['products' => $product] + ); + return $createProducts->run()['products'][0]; + } + + /** + * Login customer + * + * @param CustomerInjectable $customer + * @return void + */ + protected function loginCustomer(CustomerInjectable $customer) + { + $customerLogin = $this->objectManager->create( + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + ['customer' => $customer] + ); + $customerLogin->run(); + } + + /** + * Add product to wishlist + * + * @param InjectableFixture $product + * @return void + */ + protected function addProductToWishlist($product) + { + $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html'); + $viewBlock = $this->catalogProductView->getViewBlock(); + $viewBlock->fillOptions($product); + $viewBlock->addToWishlist(); + } + + /** + * Logout customer from frontend account + * + * return void + */ + public function tearDown() + { + $this->customerAccountLogout->open(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv new file mode 100644 index 0000000000000000000000000000000000000000..a8d0b3b26f93b2792601fa8e790ebb11929ecbb2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv @@ -0,0 +1,8 @@ +"product";"constraint" +"catalogProductSimple::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" +"catalogProductVirtual::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" +"downloadableProductInjectable::with_two_separately_links";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" +"groupedProductInjectable::three_simple_products";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" +"configurableProductInjectable::default";"assertAddProductToWishlistSuccessMessage, assertProductIsPresentInWishlist, assertProductIsPresentInCustomerBackendWishlist" +"bundleProduct::bundle_dynamic_product";"assertAddProductToWishlistSuccessMessage, assertBundleProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist" +"bundleProduct::bundle_fixed_product";"assertAddProductToWishlistSuccessMessage, assertBundleProductDetailsInWishlist, assertProductIsPresentInCustomerBackendWishlist" \ No newline at end of file diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml index 7d593d1879450e1c6c189b13fab6bbfaa16cf57e..a5bba6d8aea4a8fec1ddde5933a9dae7c87fc805 100644 --- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml @@ -33,4 +33,16 @@ <assertWishlistIsEmpty module="Magento_Wishlist"> <severeness>low</severeness> </assertWishlistIsEmpty> + <assertAddProductToWishlistSuccessMessage module="Magento_Wishlist"> + <severeness>low</severeness> + </assertAddProductToWishlistSuccessMessage> + <assertProductIsPresentInWishlist module="Magento_Wishlist"> + <severeness>low</severeness> + </assertProductIsPresentInWishlist> + <assertProductIsPresentInCustomerBackendWishlist module="Magento_Wishlist"> + <severeness>low</severeness> + </assertProductIsPresentInCustomerBackendWishlist> + <assertBundleProductDetailsInWishlist module="Magento_Wishlist"> + <severeness>low</severeness> + </assertBundleProductDetailsInWishlist> </constraint> diff --git a/dev/tests/functional/utils/generate/factory.php b/dev/tests/functional/utils/generate/factory.php index 279a8d24bcaa17c2e36690e8b9f6c57bac7e148c..0b250cebc2edc6bd744ca41d94870b391ef51bdd 100644 --- a/dev/tests/functional/utils/generate/factory.php +++ b/dev/tests/functional/utils/generate/factory.php @@ -35,6 +35,7 @@ $path = rtrim($path, PATH_SEPARATOR); $path .= PATH_SEPARATOR . MTF_BP; $path .= PATH_SEPARATOR . MTF_BP . '/lib'; $path .= PATH_SEPARATOR . MTF_BP . '/tests/app'; +$path .= PATH_SEPARATOR . MTF_BP . '/generated'; $path .= PATH_SEPARATOR . MTF_BP . '/vendor/magento/mtf'; $path .= PATH_SEPARATOR . MTF_BP . '/vendor/phpunit/phpunit'; set_include_path($path); diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php index 24882bb6b6f204d9db920e6b9f57c6a8d3c5337d..dc17c146e2019dc9f9fb993f5e34c0bceae98cb2 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php @@ -49,7 +49,7 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase public function testConstructor() { $model = $this->objectManager->create('Magento\Backend\Model\Session\AdminConfig'); - $this->assertEquals('/backend', $model->getCookiePath()); + $this->assertEquals('/index.php/backend', $model->getCookiePath()); } /** diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php index 7b09d6c5d39117779c3173dbabdde59b7ffc5541..9f0c4fe52d1f6ca5f6899246aa842cee3b46361b 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php @@ -26,7 +26,6 @@ namespace Magento\Catalog\Controller; /** * Test class for \Magento\Catalog\Controller\Category. * - * @magentoDataFixture Magento/Catalog/_files/categories.php * @magentoAppArea frontend */ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractController @@ -73,10 +72,10 @@ class CategoryTest extends \Magento\TestFramework\TestCase\AbstractController /** * @dataProvider getViewActionDataProvider + * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php */ public function testViewAction($categoryId, array $expectedHandles, array $expectedContent) { - $this->markTestSkipped('MAGETWO-27621'); $this->dispatch("catalog/category/view/id/{$categoryId}"); /** @var $objectManager \Magento\TestFramework\ObjectManager */ diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php index 283efafec1b98b0c88f3cdc5ce942cd5814fa241..bd732dfb7f339f8f24e6c64bf62016f8184e820e 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php @@ -31,7 +31,7 @@ */ namespace Magento\Catalog\Model\Category; -use Magento\Catalog\Model\Category\CategoryImageTest\StubZendLogWriterStreamTest; +use Magento\Catalog\Model\Category\CategoryImageTest\StubZendLogWriterStream; class CategoryImageTest extends \PHPUnit_Framework_TestCase { @@ -89,7 +89,7 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase * Added a quick fix to be able run separate tests with "phpunit --filter testMethod" */ if (class_exists('Magento\Catalog\Model\Category\CategoryImageTest\StubZendLogWriterStreamTest', false)) { - StubZendLogWriterStreamTest::$exceptions = array(); + StubZendLogWriterStream::$exceptions = array(); } } @@ -110,7 +110,7 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase ->registry('_fixture/Magento\Catalog\Model\Category'); $this->assertNotEmpty($category->getId()); - foreach (StubZendLogWriterStreamTest::$exceptions as $exception) { + foreach (StubZendLogWriterStream::$exceptions as $exception) { $this->assertNotContains('$_FILES array is empty', $exception['message']); } } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStreamTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php similarity index 96% rename from dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStreamTest.php rename to dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php index e8a37c5580cdf36386547b0e2028f55df127ea31..094213003849af6e521126dc55da06b5a586e84f 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStreamTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php @@ -39,7 +39,7 @@ namespace Magento\Catalog\Model\Category\CategoryImageTest; 'save_category_without_image.log', \Magento\Store\Model\ScopeInterface::SCOPE_STORE ); -class StubZendLogWriterStreamTest extends \Zend_Log_Writer_Stream +class StubZendLogWriterStream extends \Zend_Log_Writer_Stream { /** @var array */ public static $exceptions = array(); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php index 4fa21ea27b4b4ebea7f2e85c61fb468ba2efd567..5de59c4dddff11a0c03788b549a8b6ea02a206bc 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php @@ -23,6 +23,9 @@ */ namespace Magento\Catalog\Model\Layer\Filter\Price; +use Magento\Framework\Object; +use Magento\TestFramework\Helper\Bootstrap; + /** * Test class for \Magento\Catalog\Model\Layer\Filter\Price. * @@ -31,16 +34,24 @@ namespace Magento\Catalog\Model\Layer\Filter\Price; class AlgorithmAdvancedTest extends \PHPUnit_Framework_TestCase { /** - * Algorithm model - * - * @var \Magento\Catalog\Model\Layer\Filter\Price\Algorithm + * @magentoDbIsolation enabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine Magento\CatalogSearch\Model\Resource\Fulltext\Engine */ - protected $_model; - - protected function setUp() + public function testWithoutLimits() { - $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - 'Magento\Catalog\Model\Layer\Filter\Price\Algorithm' + /** @var $objectManager \Magento\TestFramework\ObjectManager */ + $objectManager = Bootstrap::getObjectManager(); + /** @var $request \Magento\TestFramework\Request */ + $request = $objectManager->get('Magento\TestFramework\Request'); + $request->setParam('price', null); + $model = $this->_prepareFilter(); + $this->assertEquals( + array( + 0 => array('from' => 0, 'to' => 20, 'count' => 3), + 1 => array('from' => 20, 'to' => '', 'count' => 4) + ), + $model->calculateSeparators() ); } @@ -48,24 +59,41 @@ class AlgorithmAdvancedTest extends \PHPUnit_Framework_TestCase * Prepare price filter model * * @param \Magento\TestFramework\Request|null $request + * @return \Magento\Framework\Search\Dynamic\Algorithm */ protected function _prepareFilter($request = null) { /** @var $layer \Magento\Catalog\Model\Layer */ - $layer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() + $layer = Bootstrap::getObjectManager() ->create('Magento\Catalog\Model\Layer\Category'); $layer->setCurrentCategory(4); $layer->setState( - \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Layer\State') + Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Layer\State') ); + $priceResource = Bootstrap::getObjectManager() + ->create('Magento\Catalog\Model\Resource\Layer\Filter\Price', ['layer' => $layer]); + $interval = Bootstrap::getObjectManager() + ->create('Magento\CatalogSearch\Model\Price\Interval', ['resource' => $priceResource]); + $objectManager = $this->getMockBuilder('Magento\Framework\ObjectManager\ObjectManager') + ->setMethods(['create']) + ->disableOriginalConstructor() + ->getMock(); + $objectManager->expects($this->once())->method('create')->willReturn($interval); + $intervalFactory = Bootstrap::getObjectManager() + ->create('Magento\Framework\Search\Dynamic\IntervalFactory', ['objectManager' => $objectManager]); + $model = Bootstrap::getObjectManager() + ->create('Magento\Framework\Search\Dynamic\Algorithm', ['intervalFactory' => $intervalFactory]); /** @var $filter \Magento\Catalog\Model\Layer\Filter\Price */ - $filter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Catalog\Model\Layer\Filter\Price', array('layer' => $layer)); - $filter->setLayer($layer)->setAttributeModel(new \Magento\Framework\Object(array('attribute_code' => 'price'))); + $filter = Bootstrap::getObjectManager() + ->create( + 'Magento\Catalog\Model\Layer\Filter\Price', + array('layer' => $layer, 'resource' => $priceResource, 'priceAlgorithm' => $model) + ); + $filter->setLayer($layer)->setAttributeModel(new Object(array('attribute_code' => 'price'))); if (!is_null($request)) { $filter->apply( $request, - \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + Bootstrap::getObjectManager()->get( 'Magento\Framework\View\LayoutInterface' )->createBlock( 'Magento\Framework\View\Element\Text' @@ -73,52 +101,39 @@ class AlgorithmAdvancedTest extends \PHPUnit_Framework_TestCase ); $interval = $filter->getInterval(); if ($interval) { - $this->_model->setLimits($interval[0], $interval[1]); + $model->setLimits($interval[0], $interval[1]); } } $collection = $layer->getProductCollection(); - $this->_model->setPricesModel( - $filter - )->setStatistics( + $model->setStatistics( $collection->getMinPrice(), $collection->getMaxPrice(), $collection->getPriceStandardDeviation(), $collection->getSize() ); + return $model; } - public function testWithoutLimits() - { - /** @var $objectManager \Magento\TestFramework\ObjectManager */ - $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - /** @var $request \Magento\TestFramework\Request */ - $request = $objectManager->get('Magento\TestFramework\Request'); - $request->setParam('price', null); - $this->_prepareFilter(); - $this->assertEquals( - array( - 0 => array('from' => 0, 'to' => 20, 'count' => 3), - 1 => array('from' => 20, 'to' => '', 'count' => 4) - ), - $this->_model->calculateSeparators() - ); - } - + /** + * @magentoDbIsolation enabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine Magento\CatalogSearch\Model\Resource\Fulltext\Engine + */ public function testWithLimits() { $this->markTestIncomplete('Bug MAGE-6561'); /** @var $objectManager \Magento\TestFramework\ObjectManager */ - $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + $objectManager = Bootstrap::getObjectManager(); /** @var $request \Magento\TestFramework\Request */ $request = $objectManager->get('Magento\TestFramework\Request'); $request->setParam('price', '10-100'); - $this->_prepareFilter($request); + $model = $this->_prepareFilter($request); $this->assertEquals( array( 0 => array('from' => 10, 'to' => 20, 'count' => 2), 1 => array('from' => 20, 'to' => 100, 'count' => 2) ), - $this->_model->calculateSeparators() + $model->calculateSeparators() ); } } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php index 76f092f20b1f884578118df22956490837528a46..3f22fd50e4d4b03f12d076c2c1e40978d1dbdcf6 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php @@ -23,6 +23,8 @@ */ namespace Magento\Catalog\Model\Layer\Filter\Price; +use Magento\TestFramework\Helper\Bootstrap; + /** * Test class for \Magento\Catalog\Model\Layer\Filter\Price. * @@ -30,13 +32,6 @@ namespace Magento\Catalog\Model\Layer\Filter\Price; */ class AlgorithmBaseTest extends \PHPUnit_Framework_TestCase { - /** - * Algorithm model - * - * @var \Magento\Catalog\Model\Layer\Filter\Price\Algorithm - */ - protected $_model; - /** * Layer model * @@ -51,39 +46,49 @@ class AlgorithmBaseTest extends \PHPUnit_Framework_TestCase */ protected $_filter; - protected function setUp() - { - $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Catalog\Model\Layer\Filter\Price\Algorithm'); - $this->_layer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Catalog\Model\Layer\Category'); - $this->_filter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Catalog\Model\Layer\Filter\Price', array('layer' => $this->_layer)); - $this->_filter->setAttributeModel(new \Magento\Framework\Object(array('attribute_code' => 'price'))); - } + /** + * @var \Magento\Catalog\Model\Resource\Layer\Filter\Price + */ + protected $priceResource; /** + * @magentoDbIsolation enabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine Magento\CatalogSearch\Model\Resource\Fulltext\Engine * @dataProvider pricesSegmentationDataProvider */ public function testPricesSegmentation($categoryId, $intervalsNumber, $intervalItems) { - $this->_layer->setCurrentCategory($categoryId); - $collection = $this->_layer->getProductCollection(); + $layer = Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Layer\Category'); + $priceResource = Bootstrap::getObjectManager() + ->create('Magento\Catalog\Model\Resource\Layer\Filter\Price', ['layer' => $layer]); + $interval = Bootstrap::getObjectManager() + ->create('Magento\CatalogSearch\Model\Price\Interval', ['resource' => $priceResource]); + $objectManager = $this->getMockBuilder('Magento\Framework\ObjectManager\ObjectManager') + ->setMethods(['create']) + ->disableOriginalConstructor() + ->getMock(); + $objectManager->expects($this->once())->method('create')->willReturn($interval); + $intervalFactory = Bootstrap::getObjectManager() + ->create('Magento\Framework\Search\Dynamic\IntervalFactory', ['objectManager' => $objectManager]); + $model = Bootstrap::getObjectManager() + ->create('Magento\Framework\Search\Dynamic\Algorithm', ['intervalFactory' => $intervalFactory]); + + $layer->setCurrentCategory($categoryId); + $collection = $layer->getProductCollection(); $memoryUsedBefore = memory_get_usage(); - $this->_model->setPricesModel( - $this->_filter - )->setStatistics( + $model->setStatistics( $collection->getMinPrice(), $collection->getMaxPrice(), $collection->getPriceStandardDeviation(), $collection->getSize() ); if (!is_null($intervalsNumber)) { - $this->assertEquals($intervalsNumber, $this->_model->getIntervalsNumber()); + $this->assertEquals($intervalsNumber, $model->getIntervalsNumber()); } - $items = $this->_model->calculateSeparators(); + $items = $model->calculateSeparators(); $this->assertEquals(array_keys($intervalItems), array_keys($items)); for ($i = 0; $i < count($intervalItems); ++$i) { diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php index 3caa3e17b647a8e6ab2aa7904221eb4b2f258050..004d1f22949c7610a2a46fc53e15ffc661946925 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php @@ -154,7 +154,6 @@ $category->setId(12) /** @var $product \Magento\Catalog\Model\Product */ $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product'); -$product->load(1); $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setId(1) ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default')) @@ -171,7 +170,6 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->save(); $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product'); -$product->load(2); $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setId(2) ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default')) @@ -188,7 +186,6 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->save(); $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product'); -$product->load(3); $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setId(3) ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default')) @@ -206,7 +203,6 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) /** @var $product \Magento\Catalog\Model\Product */ $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product'); -$product->load(4); $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setId(4) ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default')) diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv index f0dcc3da8b4fe713ff88b68e57a126330f9e3022..cce02f6edfc2174746ef825b424c3d85d44a2bce 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv +++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv @@ -5,7 +5,9 @@ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,"Test Date and Time",,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"drop_down","New Select",1,,,,0,"Option 1","3.0000","3-1-select",0 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2","3.0000","3-2-select",0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 1",,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 2",,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"radio","New Radio",1,,,,0,"Option 1","3.0000","4-1-radio",0 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2","3.0000","4-2-radio",0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 1",,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 2",,, diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv index 9d6342ef458c69fafdffbfee9bc5e13d6f636960..20d46670371e621af5b8c337510fd277117bb5d0 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv +++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv @@ -5,7 +5,9 @@ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,"Test Date and Time",,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"drop_down","New Select",1,,,,0,"Option 1","3.0000","3-1-select",0 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2","3.0000","3-2-select",0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 1",,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 2",,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"radio","New Radio",1,,,,0,"Option 1","3.0000","4-1-radio",0 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2","3.0000","4-2-radio",0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 1",,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"default",,,,,,,,"Option 2",,, diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/TermTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/TermTest.php index 31a71f0fc7320f6cdb6a9eda46f2610fd85d5a65..171bca1c7c1415447a5334b76224f4af257b51c9 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/TermTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/TermTest.php @@ -26,7 +26,7 @@ namespace Magento\CatalogSearch\Block; class TermTest extends \PHPUnit_Framework_TestCase { /** - * @var \Magento\CatalogSearch\Block\Term + * @var \Magento\Search\Block\Term */ protected $_block; @@ -35,7 +35,7 @@ class TermTest extends \PHPUnit_Framework_TestCase $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( 'Magento\Framework\View\LayoutInterface' )->createBlock( - 'Magento\CatalogSearch\Block\Term' + 'Magento\Search\Block\Term' ); } diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php index 90444c6427fff7cfd1aa682f48c0a1a3941a2e2c..005de6924720bae419f544458962b4b9337ff374 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php @@ -32,6 +32,11 @@ class DataTest extends \PHPUnit_Framework_TestCase protected function setUp() { + /** @var \Magento\TestFramework\ObjectManager $objectManager */ + $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + /** @var \Magento\Framework\App\Request\Http $request */ + $request = $objectManager->get('\Magento\Framework\App\RequestInterface'); + $request->setParam('q', 'five <words> here <being> tested'); $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( 'Magento\CatalogSearch\Helper\Data' ); @@ -65,26 +70,7 @@ class DataTest extends \PHPUnit_Framework_TestCase $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\CatalogSearch\Helper\Data $catalogSearchHelper */ - $catalogSearchHelper = $this->getMock( - 'Magento\CatalogSearch\Helper\Data', - array('getQueryText'), - array( - $objectManager->get('Magento\Framework\App\Helper\Context'), - $objectManager->get('Magento\Framework\Stdlib\String'), - $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface'), - $objectManager->get('Magento\CatalogSearch\Model\QueryFactory'), - $objectManager->get('Magento\Framework\Escaper'), - $objectManager->get('Magento\Framework\Filter\FilterManager'), - $objectManager->get('Magento\Framework\StoreManagerInterface') - ) - ); - $catalogSearchHelper->expects( - $this->any() - )->method( - 'getQueryText' - )->will( - $this->returnValue('five <words> here <being> tested') - ); + $catalogSearchHelper = $objectManager->create('Magento\CatalogSearch\Helper\Data'); $catalogSearchHelper->checkNotes(); diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php index d2c340f69f85431f4dc3213fbce2e00eb93b0362..0c519efde675f44c43a0b7784223f1a8e056eb7f 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php @@ -49,7 +49,7 @@ class FulltextTest extends \PHPUnit_Framework_TestCase protected $fulltext; /** - * @var \Magento\CatalogSearch\Model\QueryFactory + * @var \Magento\Search\Model\QueryFactory */ protected $queryFactory; @@ -84,7 +84,7 @@ class FulltextTest extends \PHPUnit_Framework_TestCase ); $this->queryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - 'Magento\CatalogSearch\Model\QueryFactory' + 'Magento\Search\Model\QueryFactory' ); $this->productFirst = $this->getProductBySku('fulltext-1'); @@ -189,10 +189,9 @@ class FulltextTest extends \PHPUnit_Framework_TestCase protected function search($text) { $this->resourceFulltext->resetSearchResults(); - $query = $this->queryFactory->create(); - $query->setQueryText($text)->prepare(); + $query = $this->queryFactory->get(); + $query->unsetData()->setQueryText($text)->prepare(); $this->resourceFulltext->prepareResult($this->fulltext, $text, $query); - $query->getResultCollection(); $products = []; foreach ($query->getResultCollection() as $product) { $products[] = $product; diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/query.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/query.php index 0bf79dbd84559e92fc833ed38ab96f2f4a2ecdf8..14e428fbd8a021726d98448208adb91689f0e7fc 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/query.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/query.php @@ -23,8 +23,8 @@ */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -/** @var $query \Magento\CatalogSearch\Model\Query */ -$query = $objectManager->create('Magento\CatalogSearch\Model\Query'); +/** @var $query \Magento\Search\Model\Query */ +$query = $objectManager->create('Magento\Search\Model\Query'); $query->setStoreId(1); $query->setQueryText( 'query_text' diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories.php index 43f25b2c9ebc784829b34e5ffb2f0a2e2a57289e..8fce3413c024202993d065021e7f82a23522d714 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories.php +++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories.php @@ -57,6 +57,7 @@ $category->setId(4) ->setIsAnchor(true) ->setPosition(1) ->save(); + $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Category'); $category->setId(5) ->setName('Category 1.1.1') diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products.php new file mode 100644 index 0000000000000000000000000000000000000000..415102a91c4b2b4e656aa01cbdb421ba13fe5537 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products.php @@ -0,0 +1,62 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + 'Magento\Catalog\Model\Resource\Setup', + array('resourceName' => 'catalog_setup') +); +require __DIR__ . '/categories.php'; + +/** @var $product \Magento\Catalog\Model\Product */ +$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product'); +$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) + ->setId(1) + ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default')) + ->setStoreId(1) + ->setWebsiteIds(array(1)) + ->setName('Simple Product') + ->setSku('simple') + ->setPrice(10) + ->setWeight(18) + ->setStockData(array('use_config_manage_stock' => 0)) + ->setCategoryIds(array(2, 3, 4)) + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->save(); + +$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product'); +$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) + ->setId(2) + ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default')) + ->setStoreId(1) + ->setWebsiteIds(array(1)) + ->setName('Simple Product Two') + ->setSku('12345') // SKU intentionally contains digits only + ->setPrice(45.67) + ->setWeight(56) + ->setStockData(array('use_config_manage_stock' => 0)) + ->setCategoryIds(array(5)) + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->save(); diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml index 4ab78d2a981a60b7003658ec81ff00ad4fb07623..27fd7e1226b8703e167879130d51c28f7efc4bb0 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="layout_test_handle_sample"/> <remove name="header"/> <remove name="menu"/> diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml index daac0d65c2a5c72cad70d29911d7c33c7033664a..5e612c625056544933665afa9568213d2e27c7fc 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Magento Admin</title> <script src="prototype/prototype.js"/> diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/HelloTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/HelloTest.php deleted file mode 100644 index 3c7daefce8b7fbd71aec1b06424fcf48f6370075..0000000000000000000000000000000000000000 --- a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/HelloTest.php +++ /dev/null @@ -1,89 +0,0 @@ -<?php -/** - * Magento - * - * NOTICE OF LICENSE - * - * This source file is subject to the Open Software License (OSL 3.0) - * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magentocommerce.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade Magento to newer - * versions in the future. If you wish to customize Magento for your - * needs please refer to http://www.magentocommerce.com for more information. - * - * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ -namespace Magento\Customer\Block\Account\Dashboard; - -class HelloTest extends \PHPUnit_Framework_TestCase -{ - /** - * The Hello block. - * - * @var Hello - */ - private $block; - - /** - * Session model. - * - * @var \Magento\Customer\Model\Session - */ - private $customerSession; - - /** - * Execute per test initialization. - */ - public function setUp() - { - $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend'); - - $this->customerSession = $objectManager->get('Magento\Customer\Model\Session'); - $this->block = $objectManager->get( - 'Magento\Framework\View\LayoutInterface' - )->createBlock( - 'Magento\Customer\Block\Account\Dashboard\Hello', - '', - array('customerSession' => $this->customerSession) - )->setTemplate( - 'account/dashboard/hello.phtml' - ); - } - - /** - * Execute per test post cleanup. - */ - public function tearDown() - { - $this->customerSession->unsCustomerId(); - } - - /** - * @magentoDataFixture Magento/Customer/_files/customer.php - */ - public function testGetCustomerName() - { - $this->customerSession->setCustomerId(1); - $this->assertEquals('Firstname Lastname', $this->block->getCustomerName()); - } - - /** - * @magentoDataFixture Magento/Customer/_files/customer.php - */ - public function testToHtml() - { - $this->customerSession->setCustomerId(1); - $html = $this->block->toHtml(); - $this->assertContains("<div class=\"block block-dashboard-welcome\">", $html); - $this->assertContains("<strong>Hello, Firstname Lastname!</strong>", $html); - } -} diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php index 2cd653e6033e195621fa1acd054b63dc54b648c1..039fecd5e4f81a2881f725c0d8b56deb565526df 100755 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php @@ -53,8 +53,6 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController $this->dispatch('customer/account/index'); $body = $this->getResponse()->getBody(); - $this->assertContains('<div class="block block-dashboard-welcome">', $body); - $this->assertContains('Hello, Firstname Lastname!', $body); $this->assertContains('Green str, 67', $body); } diff --git a/dev/tests/integration/testsuite/Magento/Customer/Service/V1/CustomerGroupServiceTest.php b/dev/tests/integration/testsuite/Magento/Customer/Service/V1/CustomerGroupServiceTest.php index d6ac2f7158baac0b2751f93e47a09ba05a387050..a5466709f4be24954a10be72f05ccea82fc299bc 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Service/V1/CustomerGroupServiceTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Service/V1/CustomerGroupServiceTest.php @@ -224,7 +224,12 @@ class CustomerGroupServiceTest extends \PHPUnit_Framework_TestCase $nonDefaultStoreId = $nonDefaultStore->getId(); /** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */ $scopeConfig = $this->_objectManager->get('Magento\Framework\App\MutableScopeConfig'); - $scopeConfig->setValue(Group::XML_PATH_DEFAULT_ID, 2, ScopeInterface::SCOPE_STORE, 'secondstore'); + $scopeConfig->setValue( + \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID, + 2, + ScopeInterface::SCOPE_STORE, + 'secondstore' + ); $testGroup = ['id' => 2, 'code' => 'Wholesale', 'tax_class_id' => 3]; $this->assertDefaultGroupMatches($testGroup, $nonDefaultStoreId); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index 5918afc2f332fc37de2e8c788ca8cf65e408efe4..29b4c0399b4432bfd353eaf3110516ee60bf73e8 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -86,13 +86,13 @@ class AdapterTest extends \PHPUnit_Framework_TestCase } /** - * @return \Magento\Framework\Search\QueryResponse + * @return \Magento\Framework\Search\Response\QueryResponse */ private function executeQuery() { $this->reindexAll(); - /** @var \Magento\Framework\Search\Request $queryRequest */ + /** @var \Magento\Framework\Search\Response\QueryResponse $queryRequest */ $queryRequest = $this->requestBuilder->create(); $queryResponse = $this->adapter->query($queryRequest); @@ -112,6 +112,29 @@ class AdapterTest extends \PHPUnit_Framework_TestCase } } + /** + * Sample test + * + * @magentoDbIsolation enabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine Magento\CatalogSearch\Model\Resource\Fulltext\Engine + * @magentoConfigFixture current_store catalog/search/search_type 2 + * @magentoDataFixture Magento/Framework/Search/_files/products.php + */ + public function testAggregationsQuery() + { + $this->requestBuilder->bind('fulltext_search_query', 'peoples'); + $this->requestBuilder->setRequestName('one_aggregations'); + + $queryResponse = $this->executeQuery(); + + $this->assertEquals(2, $queryResponse->count()); + $this->assertEquals( + ['weight_bucket', 'price_bucket', 'dynamic_price'], + $queryResponse->getAggregations()->getBucketNames() + ); + } + /** * Sample test * diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products.php index 93da5cc95ca29f29db6ae719895f36de5f7297d9..8cb5c088d7299f36ec42b0984348e62a40e24d01 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products.php @@ -32,7 +32,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setWebsiteIds(array(1)) ->setName('Unisex green socks') ->setSku('green_socks') - ->setPrice(10) + ->setPrice(12) ->setWeight(1) ->setShortDescription("Unisex green socks for some good peoples at one") ->setTaxClassId(0) @@ -104,7 +104,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setWebsiteIds(array(1)) ->setName('White shorts') ->setSku('white_shorts') - ->setPrice(12) + ->setPrice(14) ->setWeight(2) ->setShortDescription("Small white shorts for your children") ->setTaxClassId(0) @@ -176,7 +176,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setWebsiteIds(array(1)) ->setName('Red trousers') ->setSku('red_trousers') - ->setPrice(14) + ->setPrice(16) ->setWeight(3) ->setShortDescription("Red pants for men") ->setTaxClassId(0) @@ -248,7 +248,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setWebsiteIds(array(1)) ->setName('Blue briefs') ->setSku('blue_briefs') - ->setPrice(14) + ->setPrice(18) ->setWeight(3) ->setShortDescription("Blue briefs for Russian men") ->setTaxClassId(0) @@ -301,7 +301,7 @@ $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) ->setWebsiteIds(array(1)) ->setName('Grey shorts') ->setSku('grey_shorts') - ->setPrice(14) + ->setPrice(20) ->setWeight(3) ->setShortDescription("Grey or green shorts for all peoples at one") ->setTaxClassId(0) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml index c8660552f63abc0f41de7c15d7651524d55c14a4..5b5a4830449ec1ec949e4703e09becac0cf04556 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../lib/internal/Magento/Framework/Search/etc/search_request_merged.xsd"> <request query="one_match" index="catalogsearch_fulltext"> <dimensions> <dimension name="scope" value="default"/> @@ -40,6 +40,40 @@ <from>10</from> <size>10</size> </request> + <request query="one_aggregations" index="catalogsearch_fulltext"> + <dimensions> + <dimension name="scope" value="default"/> + </dimensions> + <queries> + <query xsi:type="boolQuery" name="one_aggregations" boost="2"> + <queryReference clause="must" ref="fulltext_search_query"/> + </query> + + <query xsi:type="matchQuery" name="fulltext_search_query" value="$fulltext_search_query$" boost="5"> + <match field="data_index" boost="2"/> + </query> + </queries> + <aggregations> + <bucket xsi:type="termBucket" name="weight_bucket" field="weight"> + <metrics> + <metric type="count"/> + </metrics> + </bucket> + <bucket xsi:type="rangeBucket" name="price_bucket" field="price"> + <metrics> + <metric type="count"/> + </metrics> + <ranges> + <range from="" to="14"/> + <range from="14" to="18"/> + <range from="18" to=""/> + </ranges> + </bucket> + <bucket xsi:type="dynamicBucket" method="dynamic1" name="dynamic_price" field="price" /> + </aggregations> + <from>10</from> + <size>10</size> + </request> <request query="one_wildcard" index="catalogsearch_fulltext"> <dimensions> <dimension name="scope" value="default"/> @@ -70,13 +104,13 @@ <match field="data_index" boost="2"/> </query> <query xsi:type="filteredQuery" name="filtered_query"> - <filterReference ref="pid"/> + <filterReference clause="must" ref="pid"/> </query> <query xsi:type="filteredQuery" name="filtered_query_rm"> <queryReference ref="fulltext_search_query_rm"/> </query> <query xsi:type="filteredQuery" name="filtered_query_filter_rm"> - <filterReference ref="bool_filter_rm"/> + <filterReference clause="must" ref="bool_filter_rm"/> </query> <query xsi:type="matchQuery" value="$not_bind$" name="fulltext_search_query_rm"> <match field="some"/> @@ -105,7 +139,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="range_filter"> - <filterReference ref="range_filter"/> + <filterReference clause="must" ref="range_filter"/> </query> </queries> <filters> @@ -124,7 +158,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="range_filter_without_from_field"> - <filterReference ref="range_filter_without_from_field"/> + <filterReference clause="must" ref="range_filter_without_from_field"/> </query> </queries> <filters> @@ -142,7 +176,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="range_filter_without_to_field"> - <filterReference ref="range_filter_without_to_field"/> + <filterReference clause="must" ref="range_filter_without_to_field"/> </query> </queries> <filters> @@ -160,7 +194,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="term_filter"> - <filterReference ref="term_filter"/> + <filterReference clause="must" ref="term_filter"/> </query> </queries> <filters> @@ -175,7 +209,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="bool_filter"> - <filterReference ref="bool_filter"/> + <filterReference clause="must" ref="bool_filter"/> </query> </queries> <filters> @@ -227,7 +261,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="bool_filter_with_nested_bool_filter"> - <filterReference ref="bool_filter_with_nested_bool_filter"/> + <filterReference clause="must" ref="bool_filter_with_nested_bool_filter"/> </query> </queries> <filters> @@ -257,7 +291,7 @@ </dimensions> <queries> <query xsi:type="filteredQuery" name="bool_filter_with_range_in_nested_negative_filter"> - <filterReference ref="bool_filter_with_range_in_nested_negative_filter"/> + <filterReference clause="must" ref="bool_filter_with_range_in_nested_negative_filter"/> </query> </queries> <filters> @@ -293,7 +327,7 @@ <match field="data_index" boost="1"/> </query> <query xsi:type="filteredQuery" name="query_filter"> - <filterReference ref="filter"/> + <filterReference clause="must" ref="filter"/> </query> </queries> <filters> diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request.xml b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request.xml index bd707210acd8c9a235aac98da12af52865e0b3a5..e9eeae0f616270ae8d08ff079b195b2ef2281e1e 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../lib/internal/Magento/Framework/Search/etc/search_request_merged.xsd"> <request query="suggested_search_container" index="product"> <dimensions> <dimension name="scope" value="default" /> @@ -40,7 +40,7 @@ </query> <query xsi:type="filteredQuery" name="fulltext_search_query2"> - <filterReference ref="promoted" /> + <filterReference clause="must" ref="promoted" /> </query> </queries> <filters> diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_config.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_config.php index 52f89b75fbec3bf31b351b06f3042a82c9020bdb..9e1912c4158e66b9628403900d062c5096092dfa 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_config.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_config.php @@ -64,6 +64,7 @@ return [ "name" => "fulltext_search_query2", "filterReference" => [ [ + 'clause' => 'must', "ref" => "promoted" ] ], diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php index c35734a149ab9663199ec94cdf3faa1ac274ef5f..14021f309ee629166013fd7c6e082b6d91818fe2 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php @@ -86,7 +86,7 @@ class TranslateTest extends \PHPUnit_Framework_TestCase $objectManager->get('Magento\Framework\View\Design\Theme\FlyweightFactory'), $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface'), $objectManager->get('Magento\Core\Model\ThemeFactory'), - $objectManager->get('Magento\Framework\Locale\ResolverInterface'), + $objectManager->get('Magento\Framework\ObjectManager'), $objectManager->get('Magento\Framework\App\State'), array('frontend' => 'test_default') ) diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/_files/_layout_update.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/_files/_layout_update.xml index 35d6f97a2e3472c26a521f81efcd602867d71f11..4acce4e91e5a9717faba3e66592bd79a7478b81b 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/_files/_layout_update.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/_files/_layout_update.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Magento Admin</title> <script src="prototype/prototype.js"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/Layout.php b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/Layout.php index 0f33340b1556ad58aa16c4df68fb50adbde5009e..cb9332ea06de8ced18d0c7f323e110b52ef1fb3a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/Layout.php +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/Layout.php @@ -68,10 +68,16 @@ class Layout )->will( \PHPUnit_Framework_TestCase::returnValue($files) ); + $pageLayoutFileSource = $this->_testCase->getMockForAbstractClass( + 'Magento\Framework\View\File\CollectorInterface' + ); + $pageLayoutFileSource->expects(\PHPUnit_Framework_TestCase::any()) + ->method('getFiles') + ->willReturn([]); $cache = $this->_testCase->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface'); return $objectManager->create( 'Magento\Framework\View\Layout\ProcessorInterface', - ['fileSource' => $fileSource, 'cache' => $cache] + ['fileSource' => $fileSource, 'pageLayoutFileSource' => $pageLayoutFileSource, 'cache' => $cache] ); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_one.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_one.xml index b2cd1ef670be2f3353fb5b0a0abbd2280d40c9ea..74dc028f16e8c9cc0c2a39960e92e1667c418021 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_one.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_one.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Framework\View\Element\Text" name="some_text_block"> <action method="setText"> <text>Some Default Text</text> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_three.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_three.xml index 8195fce7186775a7feb91451c84a6f4a4d632c68..2d8e25b5b24240b823c57e00edca379d8203afca 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_three.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_three.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page label="Handle Three" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page label="Handle Three" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="handle_one"/> </page> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_two.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_two.xml index b821e8f34841901ce3671572c5f9f12dc1962ead..2879c7fa67bb7ccb57df75c4a81476b9bddb2dde 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_two.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Utility/_files/layout/handle_two.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page label="Handle Two" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page label="Handle Two" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="handle_one"/> <referenceBlock name="some_text_block"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml index f12fd517a5bc12b7cd023b7a14bf49a86b5332e2..0a79ed2959b5b2bc97ec135261c2cbb7b7ed9b45 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Cms/layout_test_handle_extra.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml index 4ab78d2a981a60b7003658ec81ff00ad4fb07623..27fd7e1226b8703e167879130d51c28f7efc4bb0 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_main.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="layout_test_handle_sample"/> <remove name="header"/> <remove name="menu"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml index daac0d65c2a5c72cad70d29911d7c33c7033664a..5e612c625056544933665afa9568213d2e27c7fc 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Magento Admin</title> <script src="prototype/prototype.js"/> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/cacheable.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/cacheable.xml index 30dd480cfb406ca4e01f500ed394047aa681cf00..5bfe3e62e9f499a19a44a97658ba772801f55b38 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/cacheable.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/cacheable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="cachable_container1-1" label="test1" htmlTag="div" htmlId="cachable_container11" htmlClass="class11"> <block class="Magento\Framework\View\Element\Text" name="block-1-in-cacheable-container1"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/container_attributes.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/container_attributes.xml index 768f64e67675aa00932d6e5b804923b4a3101fa6..8e7874f41001bf9c53f1b3d78ab700f0ddf4bdf3 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/container_attributes.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/container_attributes.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="container1" label="test1" htmlTag="div" htmlId="container1-1" htmlClass="class11"> <block class="Magento\Framework\View\Element\Text" name="block11"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/non_cacheable.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/non_cacheable.xml index b87f37c420e405520818954c573d9f7136f32310..32063f2f3876f5ded1e7de15caf21fc505af64b5 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/non_cacheable.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/non_cacheable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="non_cachable_container1-1" label="test1" htmlTag="div" htmlId="non_cachable_container11" htmlClass="class11"> <block class="Magento\Framework\View\Element\Text" name="block-1-in-non-cacheable-container1" cacheable="false"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/action_for_anonymous_parent_block.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/action_for_anonymous_parent_block.xml index 1f7aa013bbf3e0062303fef6ff15a907599d74d5..ed703a762d8f39e02c2997acebbe6d2f36e0ff77 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/action_for_anonymous_parent_block.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/action_for_anonymous_parent_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block name="test.block.insert" class="Magento\Framework\View\Element\Text"/> <block class="Magento\Framework\View\Element\Template"> <action method="insert"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments.xml index 90af43af7ecd0118807189899e0d6d7f834dc7bd..4438da14a0bb51adcb29d4544189fdde6df30c57 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block_with_args"> <arguments> <argument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="one" xsi:type="string">1</argument> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_complex_values.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_complex_values.xml index b1ff861335d8050fdcc43b8250ef65333fc05ff1..eb8203aa9baf8c18bf91023b3e500a5ab9b6d845 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_complex_values.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_complex_values.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block_with_args_complex_values"> <arguments> <argument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="one" xsi:type="array"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type.xml index b9105e1c8fe5c8fbbe867f094c8eb4bb1b0ae6a4..745e731afc0e792c240c06487bf0f3cb466aaf95 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block_with_object_args"> <arguments> <argument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="one" xsi:type="object">Magento\Framework\Data\Collection\Db</argument> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type_updaters.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type_updaters.xml index 7b410c75f49799f6ccc2ebd0f5149b9e90475847..941e9ba3bb54113e6fa368e363dac4985901c541 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type_updaters.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_object_type_updaters.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block_with_object_updater_args"> <arguments> <argument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="one" xsi:type="object">Magento\Core\Model\DataSource</argument> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_url_type.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_url_type.xml index 5343f589476406d15750e39c58e454933003c178..5e0e6672dd00dcf616668abc55be94d687e893d4 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_url_type.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/arguments_url_type.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block_with_url_args"> <arguments> <argument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="one" xsi:type="url" path="customer/account/login"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block.xml index 120bdab29a5b9951157259e8a0b70b127aa94b66..cd6b070866fe72ab2f682071d78ab078af02a5b7 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block name="block1" class="Magento\Framework\View\Element\Text"> <action method="getChildBlock"> <argument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="value" xsi:type="string">block2</argument> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block_exception.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block_exception.xml index ea30952df4566414a796c43d5895499fa4b9a41c..84492d68410f5479f9764049ab8ac29524ffc512 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block_exception.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/get_block_exception.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block name="block1" class="Magento\Framework\View\Element\Text"> <container name="container" label="Container"/> <action method="getChildBlock"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml index 5ac0ad8170460fa8472f4ba3a2a9ac92705d5684..4fb6c789d19a0feb600f81ca23eef88c54a8bbc6 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block1"> <block class="Magento\Framework\View\Element\Text" name="block2" group="group1"> <arguments> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/ifconfig.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/ifconfig.xml index 3f93b10ab650e1b36a30d5c3d364c150a9d1d629..1bdeeb94eb412d66ec2c1294f9ea23abea7a81c3 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/ifconfig.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/ifconfig.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block class="Magento\Framework\View\Element\Text" name="block1" ifconfig="not_exists"> <block class="Magento\Framework\View\Element\Text" name="block2"/> </block> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_broken.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_broken.xml index 0c7fa829611bb02abbcc44a1dd1f88a10c405dc8..2801b0dc9b44b4e8ec4d5dbc0128032f1b4f8149 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_broken.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_broken.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <block name="test.broken.block" type="Magento\Framework\View\Element\Text"/> <remove name="test.broken.block"/> <block class="Magento\Framework\View\Element\Template" name="bug.without.name.action.is.ignored"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/render.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/render.xml index 12b8a2037b463467bc191686b44f11f67d295545..54b3e545a0b3700dbcf9cd31a2cf7c02bffe38a7 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/render.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/render.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <!-- Despite reference element is not declared yet, it will "save this action for later" --> <referenceBlock name="block1"> <action method="addText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_after.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_after.xml index 8e08e02e0dd90dafd3b86158f6fa9f8e0be05f64..18700edf49311b4da9696f2c8366d16361835bb8 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_after.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_after.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root" label="Root"> <block class="Magento\Framework\View\Element\Text" name="element1" after="element3"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_previous.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_previous.xml index 90fedb8fc836dc084e018847f9c4f6fb52586724..36efea724302eb51321223775c3571c171874865 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_previous.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_after_previous.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root" label="Root"> <block class="Magento\Framework\View\Element\Text" name="element1" after="element2"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_after.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_after.xml index 788218339408595b3d9c008d94db6bdb4a47fcdf..97b242b02cf5a4a7a9d005325fc85e05ff082b1a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_after.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_after.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root" label="Root"> <block class="Magento\Framework\View\Element\Text" name="element1" before="element2"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_before.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_before.xml index 554e005e1b8d4039ba86f5fd6798d445431ecdd7..0674e28f01a289bc4b0ef64b4c0fb5e0d27b67d8 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_before.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/sort_before_before.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="root" label="Root"> <block class="Magento\Framework\View\Element\Text" name="element1" before="element3"> <action method="setText"> diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php index f912c1b0b5d15a8fa03cd032edb588511b36d2f1..5c8b0b64dbdd90597e217367aa4ee4d26a02ca50 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php @@ -62,7 +62,8 @@ class CheckoutTest extends \Magento\TestFramework\TestCase\AbstractController $this->getRequest()->setPost('payment', array('method' => 'checkmo')); $this->dispatch('multishipping/checkout/overview'); $html = $this->getResponse()->getBody(); - $this->assertContains('<div class="box method">', $html); + $this->assertContains('<div class="box box-billing-method">', $html); + $this->assertContains('<div class="box box-shipping-method">', $html); $this->assertContains( '<dt class="title">' . $quote->getPayment()->getMethodInstance()->getTitle() . '</dt>', $html diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php new file mode 100644 index 0000000000000000000000000000000000000000..4cc3fbffc533539f3b1084bf647dcdc97be5b3d7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php @@ -0,0 +1,65 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Reports\Controller\Adminhtml\Report\Product; + +/** + * @magentoAppArea adminhtml + */ +class ViewedTest extends \Magento\Backend\Utility\Controller +{ + public function testExecute() + { + $this->dispatch('backend/reports/report_product/viewed/'); + $actual = $this->getResponse()->getBody(); + $this->assertContains('Product Views Report', $actual); + } + + public function testExecuteWithoutError() + { + $this->dispatch('backend/reports/report_product/viewed/filter/' . + 'cGVyaW9kX3R5cGU9ZGF5JmZyb209NDY0NjQmdG89NDY0NjQ2JnNob3dfZW1wdHlfcm93cz0w/'); + $actual = $this->getResponse()->getBody(); + $this->assertContains('Product Views Report', $actual); + $this->assertNotContains('An error occurred while showing the product views report.', $actual); + } + + public function testExecuteWithError() + { + $this->dispatch('backend/reports/report_product/viewed/filter/' . + 'cGVyaW9kX3R5cGU9ZGF5JmZyb209NyUyRjElMkY2NyZ0bz1odG1sJTIwZm90bSZzaG93X2VtcHR5X3Jvd3M9MA=='); + $actual = $this->getResponse()->getBody(); + + $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + + /** @var $messageManager \Magento\Framework\Message\Manager */ + $messageManager = $objectManager->get('Magento\Framework\Message\Manager'); + + $this->assertContains( + 'An error occurred while showing the product views report.', + (string)$messageManager->getMessages()->getLastAddedMessage()->getText() + ); + + $this->assertEquals('', $actual); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php index 5a42d12bde413e1e940c4ec26b57fb25f8b24af0..f45b1e4ff217c6cda156c8b677fe60664e964e38 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php +++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php @@ -112,7 +112,7 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase $typeAttr => 'object', 'value' => 'Magento\ConfigurableProduct\Model\Resource\Product\Collection\AssociatedProduct' ), - array($typeAttr => 'object', 'value' => 'Magento\Search\Model\Resource\Search\Grid\Collection'), + array($typeAttr => 'object', 'value' => 'Magento\Solr\Model\Resource\Search\Grid\Collection'), array($typeAttr => 'object', 'value' => 'Magento\Wishlist\Model\Resource\Item\Collection\Grid'), array( $typeAttr => 'object', @@ -120,7 +120,7 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase ), array($typeAttr => 'helper', 'helper' => 'Magento\Pbridge\Helper\Data::getReviewButtonTemplate'), array($typeAttr => 'helper', 'helper' => 'Magento\Pbridge\Helper\Data::getContinueButtonTemplate'), - array($typeAttr => 'options', 'model' => 'Magento\Search\Model\Adminhtml\Search\Grid\Options'), + array($typeAttr => 'options', 'model' => 'Magento\Solr\Model\Adminhtml\Search\Grid\Options'), array($typeAttr => 'options', 'model' => 'Magento\Logging\Model\Resource\Grid\ActionsGroup'), array($typeAttr => 'options', 'model' => 'Magento\Logging\Model\Resource\Grid\Actions') ); diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php index c184bf9384dac6261edecccdb938109851292ab2..4e05b7687a3c17fcd7c269a34465305a268503b1 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php +++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php @@ -50,8 +50,8 @@ class TemplateFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrit $template, $params ); - $this->assertInternalType('string', $file); - $this->assertFileExists($file); + $this->assertInternalType('string', $file, "Block class: {$class} {$template}"); + $this->assertFileExists($file, "Block class: {$class}"); }, $this->allTemplatesDataProvider() ); diff --git a/dev/tests/integration/testsuite/Magento/ToolkitFramework/ApplicationTest.php b/dev/tests/integration/testsuite/Magento/ToolkitFramework/ApplicationTest.php new file mode 100644 index 0000000000000000000000000000000000000000..1fb26a5f217b435505910308363812c09e340089 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/ToolkitFramework/ApplicationTest.php @@ -0,0 +1,112 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\ToolkitFramework; +/** + * Class Application test + */ +class ApplicationTest extends \Magento\TestFramework\Indexer\TestCase +{ + /** + * Profile generator working directory + * + * @var string + */ + protected static $_generatorWorkingDir; + + /** + * @var \Magento\Framework\ObjectManager + */ + protected $_objectManager; + + public static function setUpBeforeClass() + { + + self::$_generatorWorkingDir = realpath(__DIR__ . '/../../../../../tools/performance-toolkit'); + (new \Magento\Framework\Autoload\IncludePath())->addIncludePath([self::$_generatorWorkingDir . '/framework']); + copy( + self::$_generatorWorkingDir . '/fixtures/tax_rates.csv', + self::$_generatorWorkingDir . '/fixtures/tax_rates.csv.bak' + ); + copy(__DIR__ . '/_files/tax_rates.csv', self::$_generatorWorkingDir . '/fixtures/tax_rates.csv'); + parent::setUpBeforeClass(); + } + + /** + * @magentoAppArea install + */ + public function testTest() + { + $fixturesArray = \Magento\ToolkitFramework\FixtureSet::getInstance()->getFixtures(); + $config = \Magento\ToolkitFramework\Config::getInstance(); + $config->loadConfig(self::$_generatorWorkingDir . '/profiles/small.xml'); + + foreach ($fixturesArray as $fixture) { + $this->applyFixture(self::$_generatorWorkingDir . '/fixtures/' . $fixture['file']); + } + } + + public static function tearDownAfterClass() + { + parent::tearDownAfterClass(); + unlink(self::$_generatorWorkingDir . '/fixtures/tax_rates.csv'); + rename( + self::$_generatorWorkingDir . '/fixtures/tax_rates.csv.bak', + self::$_generatorWorkingDir . '/fixtures/tax_rates.csv' + ); + } + + /** + * Apply fixture file + * + * @param string $fixtureFilename + */ + public function applyFixture($fixtureFilename) + { + require $fixtureFilename; + } + + /** + * Get object manager + * + * @return \Magento\Framework\ObjectManager + */ + public function getObjectManager() + { + if (!$this->_objectManager) { + $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + } + return $this->_objectManager; + } + + /** + * Reset object manager + * + * @return \Magento\Framework\ObjectManager + */ + public function resetObjectManager() + { + $this->_objectManager = null; + return $this; + } +} diff --git a/dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/tax_rates.csv b/dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/tax_rates.csv new file mode 100644 index 0000000000000000000000000000000000000000..01f851f9d70ee0244c2ad3382bea6b05d59e0a24 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/tax_rates.csv @@ -0,0 +1,20 @@ +Code,Country,State,"Zip/Post Code",Rate,"Zip/Post is Range","Range From","Range To",default +US-AK-99547,US,AK,99547,3,,,, +US-AK-99554,US,AK,99554,4,,,, +US-AK-99555,US,AK,99555,5,,,, +US-AK-99556,US,AK,99556,3,,,, +US-AK-99557,US,AK,99557,2,,,, +US-AK-99559,US,AK,99559,6,,,, +US-AK-99561,US,AK,99561,2,,,, +US-AK-99563,US,AK,99563,3,,,, +US-AK-99568,US,AK,99568,3,,,, +US-AK-99569,US,AK,99569,5,,,, +US-AK-99572,US,AK,99572,3,,,, +US-AK-99574,US,AK,99574,6,,,, +US-AK-99576,US,AK,99576,6,,,, +US-AK-99578,US,AK,99578,2,,,, +US-AK-99581,US,AK,99581,3,,,, +US-AK-99583,US,AK,99583,3,,,, +US-AK-99585,US,AK,99585,4,,,, +US-AK-99591,US,AK,99591,3,,,, +US-AK-99603,US,AK,99603,7.5,,,, diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php index 81ce14cbdd9dc2a583f4e1cc98b7bac6a05eb410..0f710cf5316a9598052f5211fc104a46a8ecce76 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php @@ -136,14 +136,21 @@ class FormTest extends \PHPUnit_Framework_TestCase * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Core/_files/store.php - * - * @expectedException \Magento\Framework\Model\Exception - * @expectedExceptionMessage We can't set up a URL rewrite because the product you chose is not associated with */ public function testGetEntityStoresProductStoresException() { - $args = array('product' => new \Magento\Framework\Object(array('id' => 1))); - $this->_getFormInstance($args); + $args = [ + 'product' => $this->objectManager->create( + 'Magento\Catalog\Model\Product', + ['data' => ['entity_id' => 1]] + ) + ]; + $form = $this->_getFormInstance($args); + $this->assertEquals([], $form->getElement('store_id')->getValues()); + $this->assertEquals( + 'We can\'t set up a URL rewrite because the product you chose is not associated with a website.', + $form->getElement('store_id')->getAfterElementHtml() + ); } /** @@ -152,16 +159,25 @@ class FormTest extends \PHPUnit_Framework_TestCase * @magentoAppIsolation enabled * @magentoDataFixture Magento/Core/_files/store.php * - * @expectedException \Magento\Framework\Model\Exception - * @expectedExceptionMessage We can't set up a URL rewrite because the product you chose is not associated with */ public function testGetEntityStoresProductCategoryStoresException() { $args = array( - 'product' => new \Magento\Framework\Object(array('id' => 1, 'store_ids' => array(1))), - 'category' => new \Magento\Framework\Object(array('id' => 1, 'store_ids' => array(3))) + 'product' => $this->objectManager->create( + 'Magento\Catalog\Model\Product', + ['data' => ['entity_id' => 1, 'store_ids' => [1]]] + ), + 'category' => $this->objectManager->create( + 'Magento\Catalog\Model\Category', + ['data' => ['entity_id' => 1, 'store_ids' => [3]]] + ), + ); + $form = $this->_getFormInstance($args); + $this->assertEquals([], $form->getElement('store_id')->getValues()); + $this->assertEquals( + 'We can\'t set up a URL rewrite because the product you chose is not associated with a website.', + $form->getElement('store_id')->getAfterElementHtml() ); - $this->_getFormInstance($args); } /** @@ -169,14 +185,16 @@ class FormTest extends \PHPUnit_Framework_TestCase * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Core/_files/store.php - * - * @expectedException \Magento\Framework\Model\Exception - * @expectedExceptionMessage We can't set up a URL rewrite because the category your chose is not associated with */ public function testGetEntityStoresCategoryStoresException() { $args = array('category' => new \Magento\Framework\Object(array('id' => 1))); - $this->_getFormInstance($args); + $form = $this->_getFormInstance($args); + $this->assertEquals([], $form->getElement('store_id')->getValues()); + $this->assertEquals( + 'We can\'t set up a URL rewrite because the category you chose is not associated with a website.', + $form->getElement('store_id')->getAfterElementHtml() + ); } /** diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php index 0611ba5f1c0a8c5b93dd6b32c08ec60297c172f3..ac49ae499597fc8a7c941b8e1c817c80fb43d179 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php @@ -110,14 +110,16 @@ class FormTest extends \PHPUnit_Framework_TestCase * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Core/_files/store.php - * - * @expectedException \Magento\Framework\App\InitException - * @expectedExceptionMessage Chosen cms page does not associated with any website. */ public function testGetEntityStoresProductStoresException() { $args = array('cms_page' => $this->_getCmsPageWithStoresMock(array())); - $this->_getFormInstance($args); + $form = $this->_getFormInstance($args); + $this->assertEquals([], $form->getElement('store_id')->getValues()); + $this->assertEquals( + 'Chosen cms page does not associated with any website.', + $form->getElement('store_id')->getAfterElementHtml() + ); } /** diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml index ee4ff475dc8b12ef54e1dd216ab34a04a24dbe9b..2758f12bb93145d65103e5f7c879aff13f9a9b7a 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml index ee4ff475dc8b12ef54e1dd216ab34a04a24dbe9b..2758f12bb93145d65103e5f7c879aff13f9a9b7a 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml index 1c0516c6438f64b7425595c35912ea14a49bb641..f5a14b7c80b52ecf74fb8a7ee377d65a44a58626 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="container_three" label="Container Three"/> </layout> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml index ee4ff475dc8b12ef54e1dd216ab34a04a24dbe9b..2758f12bb93145d65103e5f7c879aff13f9a9b7a 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_imported_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_imported_containers.xml index 91689b33c5a8ee0f9b785e9fce9704fe26f5a60b..24e1f47319d215628f1f3c9886c1cf51f3664622 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_imported_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_imported_containers.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="non_page_handle_with_own_containers"/> </layout> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_own_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_own_containers.xml index 2b16891a192e1aaf4155f35e2749e2333bf0c29e..4689e99a9faaab5a93e0bb6c97bc3e709d773040 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_own_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_with_own_containers.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <container name="container_two" label="Container Two"/> </layout> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_containers.xml index ee4ff475dc8b12ef54e1dd216ab34a04a24dbe9b..2758f12bb93145d65103e5f7c879aff13f9a9b7a 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_containers.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_own_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_own_containers.xml index ee4ff475dc8b12ef54e1dd216ab34a04a24dbe9b..2758f12bb93145d65103e5f7c879aff13f9a9b7a 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_own_containers.xml +++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/root_page_without_own_containers.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"/> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"/> diff --git a/dev/tests/js/testsuite/mage/search/regular-search-test.js b/dev/tests/js/testsuite/mage/search/regular-search-test.js index 451105229fc31e3d09c2db931b10fae9d297a23d..5621841d4d1cc70d288b5bad9bc218b2a7334dcb 100644 --- a/dev/tests/js/testsuite/mage/search/regular-search-test.js +++ b/dev/tests/js/testsuite/mage/search/regular-search-test.js @@ -22,7 +22,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ -//Code to be tested for /app/code/Magento/CatalogSearch/view/frontend/form-mini.js (_onSubmit) +//Code to be tested for /app/code/Magento/Search/view/frontend/form-mini.js (_onSubmit) function regularSearch() { if (this.document.getElementById('search').value === this.document.getElementById('search').placeholder || this.document.getElementById('search').value === '') { this.document.getElementById('search').placeholder = 'Please specify at least one search term'; diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/Files.php b/dev/tests/static/framework/Magento/TestFramework/Utility/Files.php index 802a4f0175f4fc8a49e58048aef26abd94a5296f..16754a80c17868fa11401f69afbb964a35e8cc6a 100644 --- a/dev/tests/static/framework/Magento/TestFramework/Utility/Files.php +++ b/dev/tests/static/framework/Magento/TestFramework/Utility/Files.php @@ -882,7 +882,7 @@ class Files '/app/code/', '/lib/internal/', '/dev/tools/', - '/dev/tools/performance_toolkit/framework/', + '/dev/tools/performance-toolkit/framework/', '/dev/tests/api-functional/framework/', '/dev/tests/integration/framework/', '/dev/tests/integration/framework/tests/unit/testsuite/', diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle.xml index 5ee8030c14c85992dc1cd451f845be7ded007753..ba75f6b3a8e472b45c998ae143c6c4014820f804 100644 --- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle.xml +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <any_handle_name /> <singlechunk /> <router_name_action /> diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_parent.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_parent.xml index b6403770721042867102a8844103cb9517e56ab0..bba6eee3eacd7ad2584d4dd11e628fd02955bd44 100644 --- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_parent.xml +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_parent.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <any_node1 parent="any_handle_name" /> <any_node2 parent="singlechunk" /> <any_node3 parent="router_name_action" /> diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_update.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_update.xml index bdded771bf702122b2f3ba98318d8636106aea91..bfb13f0c643a4afc50bf2a288b4326d66014df5b 100644 --- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_update.xml +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_handle_update.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <update handle="any_handle_name" /> <any_node> <update handle="singlechunk"> diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_reference.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_reference.xml index 57db098b2ed19c4bd7cbf0e935d1d82001df21be..4447edd83f5fefd77a672b9467df1125e2569f5f 100644 --- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_reference.xml +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/_files/layout_reference.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <reference name="any_handle_name" /> <any_node> <reference name="singlechunk" /> diff --git a/setup/module/Magento/Setup/src/Model/DatabaseCheck.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerLockTest.php similarity index 60% rename from setup/module/Magento/Setup/src/Model/DatabaseCheck.php rename to dev/tests/static/testsuite/Magento/Test/Integrity/ComposerLockTest.php index f3b7b8fe6180f5527726949bdeadc1d3880e4e2b..fbb277b4596be43002b2871b5284c6c4f3a2b6fc 100644 --- a/setup/module/Magento/Setup/src/Model/DatabaseCheck.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerLockTest.php @@ -21,35 +21,22 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +namespace Magento\Test\Integrity; -namespace Magento\Setup\Model; - -use Magento\Setup\Framework\DB\Adapter\Pdo\Mysql; - -class DatabaseCheck +/** + * A test that enforces composer.lock is up to date with composer.json + */ +class ComposerLockTest extends \PHPUnit_Framework_TestCase { - /** - * @var Mysql - */ - protected $adapter; - - /** - * @var array - */ - protected $config; - /** - * @param array $config - */ - public function __construct( - array $config = array() - ) { - $this->config = $config; - } - - public function checkConnection() + public function testUpToDate() { - $this->adapter = new Mysql($this->config); - $this->adapter->connect(); - return $this->adapter->getDriver()->getConnection()->isConnected(); + $hash = hash_file('md5', BP . '/composer.json'); + $lockFilePath = BP . '/composer.lock'; + if (!file_exists($lockFilePath)) { + $this->markTestSkipped('composer.lock file doesn\'t exist'); + } + $jsonData = file_get_contents($lockFilePath); + $json = json_decode($jsonData); + $this->assertSame($hash, $json->hash, 'composer.lock file is not up to date'); } } diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/ConfigTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/ConfigTest.php index d2176f56aeb7f66db9c37e9b86ac2c0826364f50..fbf4f58fc52dbd996a14ace938b5c5e74555ec52 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/ConfigTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/ConfigTest.php @@ -103,15 +103,16 @@ Element 'queryReference': No match found for key-sequence ['fulltext_search_quer explode( "\n", " -Element 'dimensions': Missing child element(s). Expected is ( dimension ) +Element 'dimensions': Missing child element(s). Expected is ( dimension ). +Element 'queryReference': The attribute 'clause' is required but missing. Element 'queryReference': The attribute 'ref' is required but missing. +Element 'filterReference': The attribute 'clause' is required but missing. Element 'filterReference': The attribute 'ref' is required but missing. Element 'filter': The attribute 'field' is required but missing. -Element 'bucket': Missing child element(s). Expected is ( metrics ). Element 'metric', attribute 'type': [facet 'enumeration'] " . "The value 'sumasdasd' is not an element of the set {'sum', 'count', 'min', 'max'}. Element 'metric', attribute 'type': 'sumasdasd' is not a valid value of the local atomic type. -Element 'bucket': Missing child element(s). Expected is ( ranges ). +Element 'bucket': Missing child element(s). Expected is one of ( metrics, ranges ). Element 'request': Missing child element(s). Expected is ( from )." ) ); diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid.xml index b11a17478f932afa4715a6c92e81dab91c395d63..140bb51cf0e477da1735f3db8162e68b5476c8fe 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid.xml +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/Search/etc/search_request.xsd"> <request query="sugegsted_search_container" index="product"> <queries> <query xsi:type="boolQuery" name="suggested_search_container_dd" boost="2"> diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid_partial.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid_partial.xml index e32e8fd4058c9bff0e5c9bae8c9a90b0556f0643..4699202b40105bdd3c369faf89c4e0b080d6bb82 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid_partial.xml +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/invalid_partial.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/Search/etc/search_request.xsd"> <request query="sugested_search_container" index="product"> <dimensions> </dimensions> @@ -55,7 +55,7 @@ <filter xsi:type="termFilter" name="promoted_boost" field="promoted" value="1"/> <filter xsi:type="rangeFilter" field="promoted" name="price" from="10" to="100"/> </filters> - <aggregation> + <aggregations> <bucket xsi:type="termBucket" name="category_bucket" field="category"> </bucket> @@ -64,6 +64,6 @@ <metric type="sumasdasd"/> </metrics> </bucket> - </aggregation> + </aggregations> </request> </requests> diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid.xml index b7bffe1d03697d03b6b71f030329d8bf6eb530ad..542c3ee1c4ab51d184edae51dfb0df7bd60d0c86 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid.xml +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/Search/etc/search_request.xsd"> <request query="sugegsted_search_container_1" index="product_1"> <dimensions> <dimension name="scope" value="default"/> @@ -41,11 +41,11 @@ </query> <query xsi:type="filteredQuery" name="promoted_documents_boost"> - <queryReference ref="fulltext_search_query"/> + <queryReference clause="must" ref="fulltext_search_query"/> </query> <query xsi:type="filteredQuery" name="query_reference"> - <filterReference ref="price"/> + <filterReference clause="must" ref="price"/> </query> </queries> <filters> @@ -59,7 +59,7 @@ <filter xsi:type="termFilter" name="promoted_boost" field="promoted" value="1"/> <filter xsi:type="rangeFilter" field="promoted" name="price" from="10" to="100"/> </filters> - <aggregation> + <aggregations> <bucket xsi:type="termBucket" name="category_bucket" field="category"> <metrics> <metric type="sum"/> @@ -81,7 +81,7 @@ <range from="100" to=""/> </ranges> </bucket> - </aggregation> + </aggregations> <from>10</from> <size>10</size> </request> @@ -98,7 +98,7 @@ <filters> <filter xsi:type="rangeFilter" field="promoted" name="price_filter" from="10" to="100"/> </filters> - <aggregation> + <aggregations> <bucket xsi:type="termBucket" name="category_bucket" field="category"> <metrics> <metric type="sum"/> @@ -112,7 +112,7 @@ <range from="" to="50"/> </ranges> </bucket> - </aggregation> + </aggregations> <from>0</from> <size>10</size> </request> diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid_partial.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid_partial.xml index 79e56d6079f53dc172c41894aa62a959d48330c6..2a7391abd76a6942c90174971087e665882142b6 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid_partial.xml +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/_files/valid_partial.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/Search/etc/search_request.xsd"> <request query="sugested_search_container_1" index="product_1"> <queries> <query xsi:type="boolQuery" name="sugested_search_container" boost="2"> @@ -41,11 +41,11 @@ </query> <query xsi:type="filteredQuery" name="promoted_documents_boost"> - <queryReference ref="fulltext_search_query" /> + <queryReference clause="must" ref="fulltext_search_query" /> </query> <query xsi:type="filteredQuery" name="promoted_documents_boost2"> - <filterReference ref="promoted_documents_filter" /> + <filterReference clause="must" ref="promoted_documents_filter" /> </query> </queries> <filters> @@ -59,7 +59,7 @@ <filter xsi:type="termFilter" name="promoted_boost" field="promoted" value="1" /> <filter xsi:type="rangeFilter" field="promoted" name="price" from="10" to="100" /> </filters> - <aggregation> + <aggregations> <bucket xsi:type="termBucket" name="category_bucket" field="category"> <metrics> <metric type="sum" /> @@ -81,7 +81,8 @@ <range from="100" to="" /> </ranges> </bucket> - </aggregation> + <bucket xsi:type="dynamicBucket" method="dynamic1" name="dynamic_price" field="price" /> + </aggregations> <from>10</from> <size>10</size> </request> diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php index 3b239cbee08ddbbf25f41e05ea1ec7b0b14cc026..44f059f11423f445e2b11de6224a1041e1f56662 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php @@ -38,6 +38,7 @@ class SchemaTest extends \PHPUnit_Framework_TestCase $xmlFile = file_get_contents($filename); $dom->loadXML($xmlFile); $errors = libxml_get_errors(); + libxml_clear_errors(); $this->assertEmpty($errors, print_r($errors, true)); $schemaLocations = []; diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php index 259e7cbf6ed17905fcf5eeec4a39295d91c1e0c0..553d2482c1e023bb33948f120b902ff4b1ad2d94 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php @@ -117,7 +117,7 @@ return array( 'catalogrule_website' => 'Magento_CatalogRule', 'catalogsearch_fulltext' => 'Magento_CatalogSearch', 'catalogsearch_result' => 'Magento_CatalogSearch', - 'catalogsearch_query' => 'Magento_CatalogSearch', + 'search_query' => 'Magento_CatalogSearch', 'checkout_agreement' => 'Magento_Checkout', 'checkout_agreement_store' => 'Magento_Checkout', 'cms_block' => 'Magento_Cms', diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index ef28f155927f369f12033ef012cd7b1d4aa216d8..3e502d682446752c9c0a48168bfe4dc9e9eb8b74 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -715,35 +715,35 @@ return array( ), array('Magento\CatalogSearch\Model\Layer', 'Magento\Catalog\Model\Layer'), array('Magento\CatalogSearch\Model\Layer\Filter\Attribute'), - array('Magento\Search\Block\Catalog\Layer\View', 'Magento\LayeredNavigation\Block\Navigation'), + array('Magento\Solr\Block\Catalog\Layer\View', 'Magento\LayeredNavigation\Block\Navigation'), array( - 'Magento\Search\Block\Catalog\Layer\Filter\Attribute', + 'Magento\Solr\Block\Catalog\Layer\Filter\Attribute', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer' ), array( - 'Magento\Search\Block\Catalog\Layer\Filter\Category', + 'Magento\Solr\Block\Catalog\Layer\Filter\Category', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer' ), array( - 'Magento\Search\Block\Catalog\Layer\Filter\Decimal', + 'Magento\Solr\Block\Catalog\Layer\Filter\Decimal', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer' ), array( - 'Magento\Search\Block\Catalog\Layer\Filter\Price', + 'Magento\Solr\Block\Catalog\Layer\Filter\Price', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer' ), array( - 'Magento\Search\Block\Catalogsearch\Layer\Filter\Attribute', + 'Magento\Solr\Block\Catalogsearch\Layer\Filter\Attribute', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer' ), - array('Magento\Search\Block\Catalogsearch\Layer', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer'), - array('Magento\Search\Model\Catalog\Layer', 'Magento\Catalog\Model\Layer\Category'), - array('Magento\Search\Model\Catalog\Layer\Filter\Attribute', 'Magento\Catalog\Model\Layer\Filter\Attribute'), - array('Magento\Search\Model\Catalog\Layer\Filter\Category', 'Magento\Catalog\Model\Layer\Filter\Category'), - array('Magento\Search\Model\Catalog\Layer\Filter\Decimal', 'Magento\Catalog\Model\Layer\Filter\Decimal'), - array('Magento\Search\Model\Catalog\Layer\Filter\Price', 'Magento\Catalog\Model\Layer\Filter\Price'), - array('Magento\Search\Model\Search\Layer\Filter\Attribute', 'Magento\Catalog\Model\Layer\Filter\Attribute'), - array('Magento\Search\Model\Search\Layer', 'Magento\Catalog\Model\Layer'), + array('Magento\Solr\Block\Catalogsearch\Layer', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer'), + array('Magento\Solr\Model\Catalog\Layer', 'Magento\Catalog\Model\Layer\Category'), + array('Magento\Solr\Model\Catalog\Layer\Filter\Attribute', 'Magento\Catalog\Model\Layer\Filter\Attribute'), + array('Magento\Solr\Model\Catalog\Layer\Filter\Category', 'Magento\Catalog\Model\Layer\Filter\Category'), + array('Magento\Solr\Model\Catalog\Layer\Filter\Decimal', 'Magento\Catalog\Model\Layer\Filter\Decimal'), + array('Magento\Solr\Model\Catalog\Layer\Filter\Price', 'Magento\Catalog\Model\Layer\Filter\Price'), + array('Magento\Solr\Model\Search\Layer\Filter\Attribute', 'Magento\Catalog\Model\Layer\Filter\Attribute'), + array('Magento\Solr\Model\Search\Layer', 'Magento\Catalog\Model\Layer'), array( 'Magento\Catalog\Model\Product\Type\Configurable', 'Magento\ConfigurableProduct\Model\Product\Type\Configurable' @@ -2807,8 +2807,10 @@ return array( ], ['Magento\Catalog\Block\Product'], ['\Magento\Sales\Model\Observer'], + ['\Magento\Install\Block\Begin'], ['\Magento\Checkout\Service\V1\QuoteLoader', '\Magento\Sales\Model\QuoteRepository'], ['Magento\PageCache\Model\Observer'], + ['Magento\Catalog\Model\Layer\Filter\Price\Algorithm', 'Magento\Framework\Search\Dynamic\Algorithm'], ['Magento\Rss\Block\Order\Info\Buttons\Rss'], ['Magento\Rss\Block\Order\NewOrder'], ['Magento\Rss\Block\Order\Status'], diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php index 7f8f8694513e3823a1c16a092ae97db27699f56e..cd32bee8bb14507243ab1cfb94b14d6874496a20 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php @@ -638,4 +638,7 @@ return array( ['CONTENT_TYPE_PHP', 'Magento\Framework\View\Publisher'], ['CONTENT_TYPE_PHTML', 'Magento\Framework\View\Publisher'], ['CONTENT_TYPE_XML', 'Magento\Framework\View\Publisher'], + ['MAX_QUERY_LEN', 'Magento\CatalogSearch\Helper\Data'], + ['QUERY_VAR_NAME', 'Magento\CatalogSearch\Helper\Data'], + ['XML_PATH_CUSTOMER_VIV_GROUP_AUTO_ASSIGN', 'Magento\Customer\Helper\Data'], ); diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php index 5dc587b191c05f6bdbb29d43f7ff1d41e2a61ce5..9e6c4b2ccbdd5a060be2ac36b0870d6260772a13 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php @@ -1,9 +1,7 @@ <?php /** * Obsolete methods - * * Format: array(<method_name = ''>[, <class_scope> = ''[, <replacement>[, <is_deprecated>]]]) - * * Magento * * NOTICE OF LICENSE @@ -57,11 +55,17 @@ return array( array('_canUseCacheForInit', 'Magento\Core\Model\Config'), array('_canUseLocalModules'), array('_checkCookieStore', 'Magento\Core\Model\App'), - array('_checkCookieStore', 'Magento\Core\Model\Store\Storage\Db', - 'Magento\Store\Model\StorageFactory::_checkCookieStore'), + array( + '_checkCookieStore', + 'Magento\Core\Model\Store\Storage\Db', + 'Magento\Store\Model\StorageFactory::_checkCookieStore' + ), array('_checkGetStore', 'Magento\Core\Model\App'), - array('_checkGetStore', 'Magento\Core\Model\Store\Storage\Db', - 'Magento\Store\Model\StorageFactory::_checkRequestStore'), + array( + '_checkGetStore', + 'Magento\Core\Model\Store\Storage\Db', + 'Magento\Store\Model\StorageFactory::_checkRequestStore' + ), array('_checkUrlSettings', 'Magento\Backend\Controller\Adminhtml\Action'), array('_collectOrigData', 'Magento\Catalog\Model\Resource\AbstractResource'), array('_decodeFilter', 'Magento\Backend\Block\Widget\Grid'), @@ -121,11 +125,17 @@ return array( array('_getSession', 'Magento\Paygate\Model\Authorizenet', 'Magento_Paygate_Model_Authorizenet::_session'), array('_getSHAInSet', '', 'Magento_Ogone_Model_Api::getHash'), array('_getStoreByGroup', 'Magento\Core\Model\App'), - array('_getStoreByGroup', 'Magento\Core\Model\Store\Storage\Db', - 'Magento\Store\Model\StorageFactory::_getStoreByGroup'), + array( + '_getStoreByGroup', + 'Magento\Core\Model\Store\Storage\Db', + 'Magento\Store\Model\StorageFactory::_getStoreByGroup' + ), array('_getStoreByWebsite', 'Magento\Core\Model\App'), - array('_getStoreByWebsite', 'Magento\Core\Model\Store\Storage\Db', - 'Magento\Store\Model\StorageFactory::_getStoreByWebsite'), + array( + '_getStoreByWebsite', + 'Magento\Core\Model\Store\Storage\Db', + 'Magento\Store\Model\StorageFactory::_getStoreByWebsite' + ), array('_getStoreTaxRequest', 'Magento\Tax\Model\Sales\Total\Quote\Shipping'), array('_getUploadMaxFilesize', 'Magento\Catalog\Model\Product\Option\Type\File'), array('_hookQueries', 'Magento\Core\Model\Resource\Setup'), @@ -192,8 +202,11 @@ return array( array('_sendUploadResponse', 'Magento\Newsletter\Controller\Adminhtml\Subscriber'), array('_setAttribteValue'), array('_sort', 'Magento\Backend\Model\Config\Structure\Converter'), - array('_submitRecurringPaymentProfiles', 'Magento\Sales\Model\Service\Quote', - '\Magento\RecurringPayment\Model\Observer\CheckoutManagerObserver::submitRecurringPaymentProfiles'), + array( + '_submitRecurringPaymentProfiles', + 'Magento\Sales\Model\Service\Quote', + '\Magento\RecurringPayment\Model\Observer\CheckoutManagerObserver::submitRecurringPaymentProfiles' + ), array( 'submitOrder', 'Magento\Sales\Model\Service\Quote', @@ -481,7 +494,6 @@ return array( array('getItemRender', 'Magento\Checkout\Block\Cart\AbstractCart'), array('getItemRendererInfo', 'Magento\Checkout\Block\Cart\AbstractCart'), array('getKeyList', 'Magento\Framework\DB\Adapter\Pdo\Mysql'), - array('getLanguages', 'Magento\Install\Block\Begin'), array('getLanguageSelect', 'Magento\Backend\Block\Page\Footer'), array('getLayoutFilename', '', 'getFilename'), array('getLifeTime', 'Magento\Core\Model\Resource\Session'), @@ -606,7 +618,11 @@ return array( array('purgeQueryParams', 'Magento\Framework\Url\QueryParamsResolver', 'Use setQueryParams([]) instead'), array('purgeQueryParams', 'Magento\Framework\Url\QueryParamsResolverInterface', 'Use setQueryParams([]) instead'), array('_getDefaultActionName', 'Magento\Framework\Url', 'Magento\Framework\UrlInterface::DEFAULT_ACTION_NAME'), - array('_getDefaultControllerName', 'Magento\Framework\Url', 'Magento\Framework\UrlInterface::DEFAULT_CONTROLLER_NAME'), + array( + '_getDefaultControllerName', + 'Magento\Framework\Url', + 'Magento\Framework\UrlInterface::DEFAULT_CONTROLLER_NAME' + ), array('_getDefaultUrlType', 'Magento\Framework\Url', 'Magento\Framework\UrlInterface::DEFAULT_URL_TYPE'), array('getSelectionFinalPrice', 'Magento\Bundle\Model\Product\Price'), array('getShipId', 'Magento\Shipping\Block\Tracking\Popup'), @@ -630,7 +646,11 @@ return array( array('getTablePrefix', 'Magento\Core\Model\Config'), array('getTagsByType', 'Magento\Framework\App\Cache', 'Magento_Cache_Frontend_Decorator_TagScope::getTag()'), array('getTagsByType', 'Magento\Framework\App\Cache\Proxy', 'Magento_Cache_Frontend_Decorator_TagScope::getTag()'), - array('getTagsByType', 'Magento\Framework\App\CacheInterface', 'Magento_Cache_Frontend_Decorator_TagScope::getTag()'), + array( + 'getTagsByType', + 'Magento\Framework\App\CacheInterface', + 'Magento_Cache_Frontend_Decorator_TagScope::getTag()' + ), array('getTaxAmount', 'Magento\Sales\Model\Quote\Item\AbstractItem'), array('getTaxRatesByProductClass', '', '_getAllRatesByProductClass'), array('getAllRatesByProductClass', 'Magento\Tax\Helper\Data'), @@ -689,8 +709,11 @@ return array( array('init', 'Magento\Webapi\Controller\Front'), array('initCache'), array('initControllerRouters', 'Magento\Cms\Controller\Router'), - array('initCurrentStore', 'Magento\Store\Model\Storage\Db', - 'Magento\Store\Model\StorageFactory::_reinitStores'), + array( + 'initCurrentStore', + 'Magento\Store\Model\Storage\Db', + 'Magento\Store\Model\StorageFactory::_reinitStores' + ), array('_checkGetStore', 'Magento\Store\Model\Storage\Db'), array('_checkCookieStore', 'Magento\Store\Model\Storage\Db'), array('_getStoreByGroup', 'Magento\Store\Model\Storage\Db'), @@ -737,11 +760,23 @@ return array( array('lockOrderInventoryData', 'Magento\CatalogInventory\Model\Observer'), array('logEncryptionKeySave'), array('logI' . 'nvitationSave'), - array('map', 'Magento\Framework\ObjectManager\Config\Mapper\Dom', 'Magento_ObjectManager_Config_Mapper_Dom::convert'), + array( + 'map', + 'Magento\Framework\ObjectManager\Config\Mapper\Dom', + 'Magento_ObjectManager_Config_Mapper_Dom::convert' + ), array('mergeFiles', 'Magento\Core\Helper\Data', 'Magento\Framework\View\Asset\MergeStrategyInterface'), array('mergeFiles', 'Magento\Core\Model\Design\Package', 'Magento\Framework\View\Asset\MergeStrategyInterface'), - array('mergeFiles', 'Magento\Core\Model\Design\Package\Proxy', 'Magento\Framework\View\Asset\MergeStrategyInterface'), - array('mergeFiles', 'Magento\Core\Model\Design\PackageInterface', 'Magento\Framework\View\Asset\MergeStrategyInterface'), + array( + 'mergeFiles', + 'Magento\Core\Model\Design\Package\Proxy', + 'Magento\Framework\View\Asset\MergeStrategyInterface' + ), + array( + 'mergeFiles', + 'Magento\Core\Model\Design\PackageInterface', + 'Magento\Framework\View\Asset\MergeStrategyInterface' + ), array('order_success_page_view', 'Magento\GoogleAnalytics\Model\Observer'), array('orderedAction', 'Magento\Backend\Controller\Report\Product'), array('output', 'Magento\Framework\Shell'), @@ -1098,7 +1133,11 @@ return array( array('mageDebugBacktrace'), array('mageDelTree'), array('mageParseCsv'), - array('getHttpAuthCredentials', '\Magento\Core\Helper\Http', '\Magento\Framework\HTTP\Authentication::getCredentials'), + array( + 'getHttpAuthCredentials', + '\Magento\Core\Helper\Http', + '\Magento\Framework\HTTP\Authentication::getCredentials' + ), array( 'failHttpAuthentication', '\Magento\Core\Helper\Http', @@ -1111,10 +1150,26 @@ return array( '\Magento\CheckoutAgreements\Model\AgreementsProvider::getRequiredAgreementIds' ), array('validateIpAddr', '\Magento\Core\Helper\Http', '\Zend_Validate_Ip::isValid'), - array('getRemoteAddr', '\Magento\Core\Helper\Http', 'Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::getRemoteAddress'), - array('getServerAddr', '\Magento\Core\Helper\Http', 'Magento\Framework\HTTP\PhpEnvironment\ServerAddress::getServerAddress'), - array('formatDate', 'Magento\Framework\Model\Resource\AbstractResource', '\Magento\Framework\Stdlib\DateTime::formatDate'), - array('mktime', 'Magento\Framework\Model\Resource\AbstractResource', '\Magento\Framework\Stdlib\DateTime::toTimestamp'), + array( + 'getRemoteAddr', + '\Magento\Core\Helper\Http', + 'Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::getRemoteAddress' + ), + array( + 'getServerAddr', + '\Magento\Core\Helper\Http', + 'Magento\Framework\HTTP\PhpEnvironment\ServerAddress::getServerAddress' + ), + array( + 'formatDate', + 'Magento\Framework\Model\Resource\AbstractResource', + '\Magento\Framework\Stdlib\DateTime::formatDate' + ), + array( + 'mktime', + 'Magento\Framework\Model\Resource\AbstractResource', + '\Magento\Framework\Stdlib\DateTime::toTimestamp' + ), array('getPlainTemplateMode', '\Magento\Email\Model\Template\Filter'), array('getMessage', '\Magento\Core\Model\Session\Context', 'getMessageFactory'), array('getMessageFactory', '\Magento\Core\Model\Session\Context', 'getMessagesFactory'), @@ -1123,7 +1178,11 @@ return array( array('formatTime', '\Magento\Core\Helper\Data', '\Magento\Core\Model\Locale::formatTime'), array('getCustomer', 'Magento\Backend\Model\Session\Quote', 'Magento\Backend\Model\Session\Quote::getCustomerId'), array('setCustomer', 'Magento\Backend\Model\Session\Quote', 'Magento\Backend\Model\Session\Quote::setCustomerId'), - array('_getConfigTimezone', '\Magento\Framework\Stdlib\DateTime\DateTime', '\Magento\Core\Model\Locale::getConfigTimezone'), + array( + '_getConfigTimezone', + '\Magento\Framework\Stdlib\DateTime\DateTime', + '\Magento\Core\Model\Locale::getConfigTimezone' + ), array('_filterPostData', '\Magento\Checkout\Controller\Onepage'), array('_filterPostData', '\Magento\Customer\Controller\Account'), array('_filterPostData', '\Magento\Customer\Controller\Adminhtml\Index'), @@ -1131,8 +1190,16 @@ return array( array('noCookiesAction', '\Magento\Core\Controller\Varien\Action'), array('norouteAction', '\Magento\Core\Controller\Varien\Action'), array('getActionMethodName', '\Magento\Core\Controller\Varien\Action'), - array('initLayoutMessages', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\View\Layout::initMessages'), - array('_initLayoutMessages', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\View\Layout::initMessages'), + array( + 'initLayoutMessages', + '\Magento\Core\Controller\Varien\Action', + '\Magento\Framework\View\Layout::initMessages' + ), + array( + '_initLayoutMessages', + '\Magento\Core\Controller\Varien\Action', + '\Magento\Framework\View\Layout::initMessages' + ), array('preDispatch', '\Magento\Core\Controller\Varien\Action'), array('postDispatch', '\Magento\Core\Controller\Varien\Action'), array('hasAction', '\Magento\Core\Controller\Varien\Action'), @@ -1173,7 +1240,11 @@ return array( '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\Stdlib\DateTime\Filter\DateTime::filter' ), - array('_filterDates', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\Stdlib\DateTime\Filter\Date::filter'), + array( + '_filterDates', + '\Magento\Core\Controller\Varien\Action', + '\Magento\Framework\Stdlib\DateTime\Filter\Date::filter' + ), array('_initDesign', '\Magento\Core\Controller\Varien\Action', '\Magento\Core\Model\DesignLoader::load'), array('_firePreDispatchEvents', '\Magento\Core\Controller\Varien\Action'), array('_prepareDownloadResponse', '\Magento\Core\Controller\Varien\Action'), @@ -1182,7 +1253,11 @@ return array( array('getFlag', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ActionFlag::get'), array('setFlag', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ActionFlag::set'), array('loadLayout', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ViewInterface::'), - array('addPageLayoutHandles', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ViewInterface::loadLayout'), + array( + 'addPageLayoutHandles', + '\Magento\Core\Controller\Varien\Action', + '\Magento\Framework\App\ViewInterface::loadLayout' + ), array( 'getDefaultLayoutHandle', '\Magento\Core\Controller\Varien\Action', @@ -1193,7 +1268,11 @@ return array( '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ViewInterface::generateLayoutXml' ), - array('renderLayout', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ViewInterface::renderLayout'), + array( + 'renderLayout', + '\Magento\Core\Controller\Varien\Action', + '\Magento\Framework\App\ViewInterface::renderLayout' + ), array('getLayout', '\Magento\Core\Controller\Varien\Action', '\Magento\Framework\App\ViewInterface::getLayout'), array( 'loadLayoutUpdates', @@ -1272,6 +1351,11 @@ return array( array('getCookie', 'Magento\Framework\View\Element\Js\Cookie'), array('setCopyright', 'Magento\Theme\Block\Html\Footer'), array('setLogo', 'Magento\Theme\Block\Html\Header'), + array('isHomePage', 'Magento\Theme\Block\Html\Header', 'Magento\Theme\Block\Html\Header\Logo::isHomePage'), + array('getLogoSrc', 'Magento\Theme\Block\Html\Header', 'Magento\Theme\Block\Html\Header\Logo::getLogoSrc'), + array('getLogoAlt', 'Magento\Theme\Block\Html\Header', 'Magento\Theme\Block\Html\Header\Logo::getLogoAlt'), + array('_getLogoUrl', 'Magento\Theme\Block\Html\Header', 'Magento\Theme\Block\Html\Header\Logo::_getLogoUrl'), + array('_isFile', 'Magento\Theme\Block\Html\Header', 'Magento\Theme\Block\Html\Header\Logo::_isFile'), array('_beforeCacheUrl', 'Magento\Framework\View\Element\AbstractBlock'), array('_afterCacheUrl', 'Magento\Framework\View\Element\AbstractBlock'), array('_getGroupFor', 'Magento\Framework\View\Asset\GroupedCollection', 'getGroupFor'), @@ -1423,10 +1507,26 @@ return array( ), array('canSkipFilePublication', 'Magento\Framework\View\Publisher'), array('_getExtension', 'Magento\Framework\View\Publisher'), - array('_buildPublishedFilePath', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\FileInterface'), - array('_buildPublicViewRedundantFilename', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\File'), - array('_buildPublicViewSufficientFilename', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\File'), - array('_buildPublicViewFilename', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\FileInterface'), + array( + '_buildPublishedFilePath', + 'Magento\Framework\View\Publisher', + 'Magento\Framework\View\Publisher\FileInterface' + ), + array( + '_buildPublicViewRedundantFilename', + 'Magento\Framework\View\Publisher', + 'Magento\Framework\View\Publisher\File' + ), + array( + '_buildPublicViewSufficientFilename', + 'Magento\Framework\View\Publisher', + 'Magento\Framework\View\Publisher\File' + ), + array( + '_buildPublicViewFilename', + 'Magento\Framework\View\Publisher', + 'Magento\Framework\View\Publisher\FileInterface' + ), array('cleanAction', 'Magento\PageCache\Controller\Adminhtml\PageCache'), array('_isAllowed', 'Magento\PageCache\Controller\Adminhtml\PageCache'), array('_downloadFileAction', 'Magento\Sales\Controller\Download', '\Magento\Sales\Model\Download::downloadFile'), @@ -1479,7 +1579,11 @@ return array( ), ['_detectMimeType', 'Magento\Framework\File\Transfer\Adapter\Http', '\Magento\Framework\File\Mime::getMimeType()'], ['getPublishedFilePath', 'Magento\Framework\View\Publisher'], - ['getPublicFilePath', 'Magento\Framework\View\PublicFilesManagerInterface', 'Magento\Framework\View\AssetInterface'], + [ + 'getPublicFilePath', + 'Magento\Framework\View\PublicFilesManagerInterface', + 'Magento\Framework\View\AssetInterface' + ], ['getPublicFilePath', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\AssetInterface'], ['getPublicViewFile', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\AssetInterface'], array('_getVatRequiredCustomerAddress', 'Magento\Sales\Model\Observer'), @@ -1615,7 +1719,11 @@ return array( array('reindexProductPrices', '\Magento\Catalog\Model\Observer'), array('getCustomer', 'Magento\Checkout\Block\Onepage\AbstractOnepage'), ['getStoreConfig', 'Magento\Framework\View\Context', '\Magento\Framework\View\Context::getScopeConfig'], - ['getStoreConfig', 'Magento\Framework\View\Element\Context', '\Magento\Framework\View\Element\Context::getScopeConfig'], + [ + 'getStoreConfig', + 'Magento\Framework\View\Element\Context', + '\Magento\Framework\View\Element\Context::getScopeConfig' + ], ['setConfig', 'Magento\Store\Model\Store'], ['getConfig', 'Magento\Store\Model\Store'], ['_compareSortOrder', 'Magento\Sales\Model\Config\Ordered'], @@ -1797,7 +1905,11 @@ return array( ['prepareCatalogProductIndexSelect', 'Magento\CatalogInventory\Model\Observer'], ['prepareCatalogProductIndexSelect', 'Magento\CatalogInventory\Model\Resource\Stock\Status'], ['prepareCatalogProductIndexSelect', 'Magento\CatalogInventory\Model\Stock\Status'], - ['getPriceHtml', '\Magento\Catalog\Block\Product\AbstractProduct', '\Magento\Catalog\Block\Product\AbstractProduct::getProductPriceHtml'], + [ + 'getPriceHtml', + '\Magento\Catalog\Block\Product\AbstractProduct', + '\Magento\Catalog\Block\Product\AbstractProduct::getProductPriceHtml' + ], ['getDeleteUrl', '\Magento\Checkout\Block\Cart\Item\Renderer'], ['sendNewOrderEmail', 'Magento\Sales\Model\Order'], ['_getEmails', 'Magento\Sales\Model\Order'], @@ -1902,6 +2014,7 @@ return array( 'updateCategoryIndex', 'Magento\CatalogSearch\Model\Resource\Fulltext', ], + ['_getRestrictedStoresList', 'Magento\UrlRewrite\Block\Edit\Form'], ['removeTag', 'Magento\UrlRewrite\Model\UrlRewrite'], ['addTag', 'Magento\UrlRewrite\Model\UrlRewrite'], ['loadByTags', 'Magento\UrlRewrite\Model\UrlRewrite'], @@ -1913,7 +2026,30 @@ return array( ['formatPrice', 'Magento\Store\Model\Store', 'Magento\Framework\Pricing\PriceCurrencyInterface::format'], ['convertPrice', 'Magento\Store\Model\Store', 'Magento\Framework\Pricing\PriceCurrencyInterface::convert'], ['getPriceFilter', 'Magento\Store\Model\Store'], + ['setPricesModel', 'Magento\Catalog\Model\Layer\Filter\Price\Algorithm'], + ['loadPrices', 'Magento\Catalog\Model\Layer\Filter\Price', 'Magento\CatalogSearch\Model\Price\Interval::load'], + [ + 'loadPreviousPrices', + 'Magento\Catalog\Model\Layer\Filter\Price', + 'Magento\CatalogSearch\Model\Price\Interval::loadPrevious' + ], + [ + 'loadNextPrices', + 'Magento\Catalog\Model\Layer\Filter\Price', + 'Magento\CatalogSearch\Model\Price\Interval::loadNext' + ], + ['getQuery', 'Magento\CatalogSearch\Helper\Data', 'Magento\Search\Model\QueryFactory::get'], + ['getQueryText', 'Magento\CatalogSearch\Helper\Data', 'Magento\Search\Model\Query::getQueryText'], ['_addHeader', 'Magento\Rss\Model\Rss'], ['_addEntries', 'Magento\Rss\Model\Rss'], ['_addEntry', 'Magento\Rss\Model\Rss'], + ['_welcomeCustomer', 'Magento\Customer\Controller\Account'], + ['_addWelcomeMessage', 'Magento\Customer\Controller\Account'], + ['_isVatValidationEnabled', 'Magento\Customer\Controller\Account'], + ['_createUrl', 'Magento\Customer\Controller\Account'], + ['_extractAddress', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::extractAddress'], + ['_loginPostRedirect', 'Magento\Customer\Controller\Account\LoginPost', 'Magento\Customer\Controller\Account\LoginPost::loginPostRedirect'], + ['_getAllowedActions', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account::getAllowedActions'], + ['isRegistrationAllowed', 'Magento\Customer\Controller\Account\CreatePost'], + ['isRegistrationAllowed', 'Magento\Invitation\Controller\Customer\Account\CreatePost'], ); diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php index 69c7b1d5af9cc67798e7d136225913bf5b559282..82d74438a61cbf11a85b29d060e3774cad9885e6 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php @@ -342,4 +342,22 @@ return array( ['_skipModuleUpdate', '\Magento\Framework\Module\Updater'], ['_factory', 'Magento\Framework\Module\Updater'], ['_resourceList', 'Magento\Framework\Module\Updater'], + ['_storeManager', 'Magento\Customer\Controller\Account'], + ['_urlFactory', 'Magento\Customer\Controller\Account'], + ['_addressHelper', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account\Confirm::$addressHelper'], + ['_scopeConfig', 'Magento\Customer\Controller\Account'], + ['_customerAccountService', 'Magento\Customer\Controller\Account'], + ['_formFactory', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::formFactory'], + ['_subscriberFactory', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::subscriberFactory'], + ['_regionBuilder', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::regionBuilder'], + ['_addressBuilder', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::addressBuilder'], + ['_customerDetailsBuilder', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::customerDetailsBuilder'], + ['_customerBuilder', 'Magento\Customer\Controller\Account\Edit', 'Magento\Customer\Controller\Account\Edit::customerBuilder'], + ['_customerBuilder', 'Magento\Customer\Controller\Account\EditPost', 'Magento\Customer\Controller\Account\EditPost::customerBuilder'], + ['_customerDetailsBuilder', 'Magento\Customer\Controller\Account\EditPost', 'Magento\Customer\Controller\Account\EditPost::customerDetailsBuilder'], + ['_formKeyValidator', 'Magento\Customer\Controller\Account\EditPost', 'Magento\Customer\Controller\Account\EditPost::formKeyValidator'], + ['_customerHelperData', 'Magento\Customer\Controller\Account\LoginPost', 'Magento\Customer\Controller\Account\LoginPost::customerHelperData'], + ['_formKeyValidator', 'Magento\Customer\Controller\Account\LoginPost', 'Magento\Customer\Controller\Account\LoginPost::formKeyValidator'], + ['_openActions', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account::openActions'], + ['_session', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account::session'], ); diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt index 482c01bdee07c523950082589acd3f96983fbf96..dbc8b4305996bc5648794b703736f8c9e6134812 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt @@ -118,3 +118,5 @@ lib/internal/Magento/Framework/Simplexml lib/internal/Magento/Framework/System lib/internal/Magento/Framework/Util.php lib/internal/Magento/Framework/Xml +vendor +setup/vendor diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt index a7e453c4e082fa1e2baffe80cd7c193ce1d7e0c1..97cdd137383c958502a80d765e7dfcbb2fa979f4 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt @@ -82,6 +82,7 @@ Magento/Sales/Model/Resource Magento/Sales/Model/Quote/Address/Total Magento/Sales/Model/Resource/Report/Order Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab +Magento/Search/Block/Adminhtml/Dashboard Magento/Shipping/Model/Carrier Magento/Sitemap/Block/Adminhtml/Edit Magento/Sitemap/Model/ @@ -126,3 +127,5 @@ Magento/Ui setup Magento/Sales/Service/V1 Magento/Shipping/Controller/Adminhtml/Order/Shipment +vendor +setup/vendor diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt index d24d1697e0f77e807352505a276d4daf0f32b53c..161f90ea1332a3766e5e770b643c7952ade15f9d 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt @@ -44,3 +44,5 @@ dev/tests/integration/testsuite/Magento dev/tests/unit/testsuite/Magento # Newer version of phpcs does not complain about spacing issue. This appears to be a bug in the phpcs version that is currently run in bamboo. app/code/Magento/Sales/Model/Order/Payment/Transaction.php +vendor +setup/vendor diff --git a/dev/tests/unit/filename b/dev/tests/unit/filename deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/dev/tests/unit/filename.csv b/dev/tests/unit/filename.csv deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/dev/tests/unit/filename.invalid_type b/dev/tests/unit/filename.invalid_type deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Filter/StoreTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Filter/StoreTest.php new file mode 100644 index 0000000000000000000000000000000000000000..1d012d73eadf90b847a5c50548c05dc6daa05351 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Filter/StoreTest.php @@ -0,0 +1,86 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Backend\Block\Widget\Grid\Column\Filter; + +use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper; + +class StoreTest extends \PHPUnit_Framework_TestCase +{ + /** @var \Magento\Backend\Block\Widget\Grid\Column\Filter\Store */ + protected $object; + + /** @var ObjectManagerHelper */ + protected $objectManagerHelper; + + /** @var \Magento\Backend\Block\Context|\PHPUnit_Framework_MockObject_MockObject */ + protected $context; + + /** @var \Magento\Framework\DB\Helper|\PHPUnit_Framework_MockObject_MockObject */ + protected $helper; + + /** @var \Magento\Store\Model\System\Store|\PHPUnit_Framework_MockObject_MockObject */ + protected $store; + + protected function setUp() + { + $this->context = $this->getMock('Magento\Backend\Block\Context', [], [], '', false); + $this->helper = $this->getMock('Magento\Framework\DB\Helper', [], [], '', false); + $this->store = $this->getMock('Magento\Store\Model\System\Store', [], [], '', false); + + $this->objectManagerHelper = new ObjectManagerHelper($this); + $this->store = $this->objectManagerHelper->getObject( + 'Magento\Backend\Block\Widget\Grid\Column\Filter\Store', + [ + 'context' => $this->context, + 'resourceHelper' => $this->helper, + 'systemStore' => $this->store + ] + ); + } + + /** + * @param null|array $expectedCondition + * @param null|int|string $value + * @dataProvider getConditionDataProvider + */ + public function testGetCondition($expectedCondition, $value) + { + $this->store->setValue($value); + $this->assertSame($expectedCondition, $this->store->getCondition()); + } + + /** + * @return array + */ + public function getConditionDataProvider() + { + return [ + [null, null], + [null, \Magento\Backend\Block\Widget\Grid\Column\Filter\Store::ALL_STORE_VIEWS], + [['eq' => 1], 1], + [['null' => true], '_deleted_'], + ]; + } +} \ No newline at end of file diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php index 254530b975cd0709a3330b3b392dc46634759c73..8981053b69ac450cd0d3d326f3399b6a15f7636a 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php @@ -46,6 +46,10 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase */ private $objectManager; + /** + * @var \Magento\Framework\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject + */ + private $storeManagerMock; protected function setUp() { @@ -58,18 +62,21 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase false ); $this->requestMock->expects($this->atLeastOnce())->method('getBasePath')->will($this->returnValue('/')); - $this->requestMock->expects( - $this->atLeastOnce() - )->method( - 'getHttpHost' - )->will( - $this->returnValue('init.host') - ); + $this->requestMock->expects($this->atLeastOnce()) + ->method('getHttpHost') + ->will($this->returnValue('init.host')); $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->validatorFactory = $this->getMockBuilder('Magento\Framework\ValidatorFactory') ->disableOriginalConstructor() ->getMock(); - + + $storeMock = $this->getMockBuilder('\Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->getMock(); + $storeMock->expects($this->once())->method('getBaseUrl')->will($this->returnValue('/')); + $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Framework\StoreManagerInterface'); + $this->storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock)); + } public function testSetCookiePathNonDefault() @@ -100,6 +107,7 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase 'validatorFactory' => $this->validatorFactory, 'request' => $this->requestMock, 'frontNameResolver' => $mockFrontNameResolver, + 'storeManager' => $this->storeManagerMock ] ); @@ -133,8 +141,9 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase 'validatorFactory' => $this->validatorFactory, 'request' => $this->requestMock, 'sessionName' => $sessionName, + 'storeManager' => $this->storeManagerMock ] ); $this->assertSame($sessionName, $adminConfig->getName()); } -} +} \ No newline at end of file diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php index b9eef8dad50eb94e1bd9275d90b054832c19e402..a25e57a172ba0f83ebd68965941a2a89bf8f19ba 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php @@ -64,6 +64,7 @@ abstract class ProductTest extends \PHPUnit_Framework_TestCase $view->expects($this->any())->method('renderLayout')->will($this->returnSelf()); $view->expects($this->any())->method('getLayout')->will($this->returnValue($layout)); $view->expects($this->any())->method('loadLayout')->with(array( + 'default', 'popup', 'catalog_product_new', 'catalog_product_simple' diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/Product/Plugin/ImportTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/Product/Plugin/ImportTest.php new file mode 100644 index 0000000000000000000000000000000000000000..6caf1bbd55a63adc8b89d6a3607dfac65d715408 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/Product/Plugin/ImportTest.php @@ -0,0 +1,50 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin; + +class ImportTest extends \PHPUnit_Framework_TestCase +{ + public function testAfterImportSource() + { + $processorMock = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Category\Product\Processor') + ->disableOriginalConstructor() + ->getMock(); + $processorMock->expects($this->once()) + ->method('markIndexerAsInvalid'); + + + $subjectMock = $this->getMockBuilder('Magento\ImportExport\Model\Import') + ->disableOriginalConstructor() + ->getMock(); + + $import = true; + + $model = new \Magento\CatalogImportExport\Model\Indexer\Category\Product\Plugin\Import($processorMock); + + $this->assertEquals( + $import, + $model->afterImportSource($subjectMock, $import) + ); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Category/Plugin/ImportTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Category/Plugin/ImportTest.php new file mode 100644 index 0000000000000000000000000000000000000000..943bd79ae50d86f8ef4a792c4f48886dcf6d6441 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Category/Plugin/ImportTest.php @@ -0,0 +1,50 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Catalog\Model\Indexer\Product\Category\Plugin; + +class ImportTest extends \PHPUnit_Framework_TestCase +{ + public function testAfterImportSource() + { + $processorMock = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Product\Category\Processor') + ->disableOriginalConstructor() + ->getMock(); + $processorMock->expects($this->once()) + ->method('markIndexerAsInvalid'); + + + $subjectMock = $this->getMockBuilder('Magento\ImportExport\Model\Import') + ->disableOriginalConstructor() + ->getMock(); + + $import = true; + + $model = new \Magento\CatalogImportExport\Model\Indexer\Product\Category\Plugin\Import($processorMock); + + $this->assertEquals( + $import, + $model->afterImportSource($subjectMock, $import) + ); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php index a2ba39af8f323fb50fcbfd64941d15eee5e7b47f..243ccaa75819b1c89e12dae987c638a2ec5edd3b 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php @@ -24,6 +24,8 @@ namespace Magento\Catalog\Model\Layer\Search; +use Magento\CatalogSearch\Model\Layer\Search\CollectionFilter; + class CollectionFilterTest extends \PHPUnit_Framework_TestCase { /** @@ -39,7 +41,7 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $helperMock; + protected $queryFactoryMock; /** * @var \PHPUnit_Framework_MockObject_MockObject @@ -47,7 +49,7 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase protected $storeManagerMock; /** - * @var \Magento\Catalog\Model\Layer\Search\CollectionFilter + * @var \Magento\CatalogSearch\Model\Layer\Search\CollectionFilter */ protected $model; @@ -55,17 +57,23 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase { $this->visibilityMock = $this->getMock('Magento\Catalog\Model\Product\Visibility', array(), array(), '', false); $this->catalogConfigMock = $this->getMock('\Magento\Catalog\Model\Config', array(), array(), '', false); - $this->helperMock = $this->getMock('\Magento\CatalogSearch\Helper\Data', array(), array(), '', false); + $this->queryFactoryMock = $this->getMock( + '\Magento\Search\Model\QueryFactory', + array(), + array(), + '', + false + ); $this->storeManagerMock = $this->getMock('\Magento\Framework\StoreManagerInterface'); $this->model = new CollectionFilter( - $this->catalogConfigMock, $this->helperMock, $this->storeManagerMock, $this->visibilityMock + $this->catalogConfigMock, $this->queryFactoryMock, $this->storeManagerMock, $this->visibilityMock ); } /** - * @covers \Magento\Catalog\Model\Layer\Search\CollectionFilter::filter - * @covers \Magento\Catalog\Model\Layer\Search\CollectionFilter::__construct + * @covers \Magento\CatalogSearch\Model\Layer\Search\CollectionFilter::filter + * @covers \Magento\CatalogSearch\Model\Layer\Search\CollectionFilter::__construct */ public function testFilter() { @@ -86,7 +94,7 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase $this->catalogConfigMock->expects($this->once())->method('getProductAttributes'); $this->visibilityMock->expects($this->once())->method('getVisibleInSearchIds'); - $this->helperMock->expects($this->once())->method('getQuery')->will($this->returnValue($queryMock)); + $this->queryFactoryMock->expects($this->once())->method('get')->will($this->returnValue($queryMock)); $this->storeManagerMock->expects($this->once())->method('getStore'); $collectionMock->expects($this->once())->method('addAttributeToSelect') diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php index 849614cd90346751cd7d463ab86ff3ab7386f924..816d9f6231988784ed4edc94274990d8f10c28a4 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php @@ -24,6 +24,8 @@ namespace Magento\Catalog\Model\Layer\Search; +use Magento\CatalogSearch\Model\Layer\Search\StateKey; + class StateKeyTest extends \PHPUnit_Framework_TestCase { /** @@ -39,10 +41,10 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $helperMock; + protected $queryFactoryMock; /** - * @var \Magento\Catalog\Model\Layer\Search\StateKey + * @var \Magento\CatalogSearch\Model\Layer\Search\StateKey */ protected $model; @@ -50,14 +52,20 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase { $this->storeManagerMock = $this->getMock('\Magento\Framework\StoreManagerInterface'); $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', array(), array(), '', false); - $this->helperMock = $this->getMock('\Magento\CatalogSearch\Helper\Data', array(), array(), '', false); + $this->queryFactoryMock = $this->getMock( + '\Magento\Search\Model\QueryFactory', + array(), + array(), + '', + false + ); - $this->model = new StateKey($this->storeManagerMock, $this->customerSessionMock, $this->helperMock); + $this->model = new StateKey($this->storeManagerMock, $this->customerSessionMock, $this->queryFactoryMock); } /** - * @covers \Magento\Catalog\Model\Layer\Search\StateKey::toString - * @covers \Magento\Catalog\Model\Layer\Search\StateKey::__construct + * @covers \Magento\CatalogSearch\Model\Layer\Search\StateKey::toString + * @covers \Magento\CatalogSearch\Model\Layer\Search\StateKey::__construct */ public function testToString() { @@ -72,7 +80,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase $queryMock = $this->getMock('\Magento\CatalogSearch\Helper\Query', array('getId'), array(), '', false); $queryMock->expects($this->once())->method('getId')->will($this->returnValue('4')); - $this->helperMock->expects($this->once())->method('getQuery')->will($this->returnValue($queryMock)); + $this->queryFactoryMock->expects($this->once())->method('get')->will($this->returnValue($queryMock)); $this->assertEquals('Q_4_STORE_2_CAT_1_CUSTGROUP_3', $this->model->toString($categoryMock)); } diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php new file mode 100644 index 0000000000000000000000000000000000000000..e7ef051a1c09e97b3764d6e8d803650ae58134c8 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php @@ -0,0 +1,154 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Model\Layout; + +use Magento\TestFramework\Helper\ObjectManager; + +class DepersonalizePluginTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Catalog\Model\Layout\DepersonalizePlugin + */ + protected $plugin; + + /** + * @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $layoutMock; + + /** + * @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject + */ + protected $catalogSessionMock; + + /** + * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $requestMock; + + /** + * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject + */ + protected $moduleManagerMock; + + /** + * @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject + */ + protected $cacheConfigMock; + + /** + * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject + */ + protected $resultLayout; + + public function setUp() + { + $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false); + $this->catalogSessionMock = $this->getMock('Magento\Catalog\Model\Session', + ['clearStorage'], + [], + '', + false + ); + $this->requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); + $this->moduleManagerMock = $this->getMock('Magento\Framework\Module\Manager', [], [], '', false); + $this->cacheConfigMock = $this->getMock('Magento\PageCache\Model\Config', [], [], '', false); + $this->resultLayout = $this->getMock('Magento\Framework\View\Layout', array(), array(), '', false); + + $this->plugin = (new ObjectManager($this))->getObject('Magento\Catalog\Model\Layout\DepersonalizePlugin', [ + 'catalogSession' => $this->catalogSessionMock, + 'moduleManager' => $this->moduleManagerMock, + 'request' => $this->requestMock, + 'cacheConfig' => $this->cacheConfigMock + ]); + } + + public function testAfterGenerateXml() + { + $this->moduleManagerMock->expects($this->once())->method('isEnabled')->with('Magento_PageCache') + ->willReturn(true); + $this->cacheConfigMock->expects($this->once())->method('isEnabled')->willReturn(true); + $this->requestMock->expects($this->once($this->once()))->method('isAjax')->willReturn(false); + $this->layoutMock->expects($this->once())->method('isCacheable')->willReturn(true); + $this->catalogSessionMock->expects($this->once())->method('clearStorage'); + + $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout); + $this->assertEquals($this->resultLayout, $actualResult); + } + + public function testPageCacheModuleIsDisabled() + { + $this->moduleManagerMock->expects($this->once()) + ->method('isEnabled') + ->with($this->equalTo('Magento_PageCache')) + ->willReturn(false); + $this->catalogSessionMock->expects($this->never())->method('clearStorage'); + + $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout); + $this->assertEquals($this->resultLayout, $actualResult); + } + + public function testCacheIsDisabledInConfig() + { + $this->moduleManagerMock->expects($this->once()) + ->method('isEnabled') + ->with($this->equalTo('Magento_PageCache')) + ->willReturn(true); + $this->cacheConfigMock->expects($this->once())->method('isEnabled')->willReturn(false); + $this->catalogSessionMock->expects($this->never())->method('clearStorage'); + + $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout); + $this->assertEquals($this->resultLayout, $actualResult); + } + + public function testIsAjax() + { + $this->moduleManagerMock->expects($this->once()) + ->method('isEnabled') + ->with($this->equalTo('Magento_PageCache')) + ->willReturn(true); + $this->cacheConfigMock->expects($this->once())->method('isEnabled')->willReturn(true); + $this->requestMock->expects($this->once($this->once()))->method('isAjax')->willReturn(true); + $this->catalogSessionMock->expects($this->never())->method('clearStorage'); + + $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout); + $this->assertEquals($this->resultLayout, $actualResult); + } + + public function testLayoutIsNotCacheable() + { + $this->moduleManagerMock->expects($this->once()) + ->method('isEnabled') + ->with($this->equalTo('Magento_PageCache')) + ->willReturn(true); + $this->cacheConfigMock->expects($this->once())->method('isEnabled')->willReturn(true); + $this->requestMock->expects($this->once($this->once()))->method('isAjax')->willReturn(false); + $this->layoutMock->expects($this->once())->method('isCacheable')->willReturn(false); + $this->catalogSessionMock->expects($this->never())->method('clearStorage'); + + $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout); + $this->assertEquals($this->resultLayout, $actualResult); + } +} diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php index fadb811e3443fb1229a20fe7698fca6ccbc915dd..849726b3b2309a6ea2921a303338b7670ffc2431 100644 --- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php +++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php @@ -43,7 +43,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase * * @var array */ - protected $_testStores = array('admin' => 0); + protected $_testStores = array('admin' => 0, 'new_store_view' => 1); /** * Tables array to inject into model @@ -80,10 +80,11 @@ class OptionTest extends \PHPUnit_Framework_TestCase * @var array */ protected $_expectedTitles = array( + array('option_id' => 2, 'store_id' => 0, 'title' => 'Test Field Title'), array('option_id' => 3, 'store_id' => 0, 'title' => 'Test Date and Time Title'), array('option_id' => 4, 'store_id' => 0, 'title' => 'Test Select'), array('option_id' => 5, 'store_id' => 0, 'title' => 'Test Radio'), - array('option_id' => 1, 'store_id' => 0, 'title' => 'Test Field Title') + array('option_id' => 5, 'store_id' => 1, 'title' => 'Option New Store View') ); /** @@ -116,7 +117,9 @@ class OptionTest extends \PHPUnit_Framework_TestCase array('option_type_id' => 2, 'store_id' => 0, 'title' => 'Option 1'), array('option_type_id' => 3, 'store_id' => 0, 'title' => 'Option 2'), array('option_type_id' => 4, 'store_id' => 0, 'title' => 'Option 1'), - array('option_type_id' => 5, 'store_id' => 0, 'title' => 'Option 2') + array('option_type_id' => 4, 'store_id' => 1, 'title' => 'Option 1 New Store View'), + array('option_type_id' => 5, 'store_id' => 0, 'title' => 'Option 2'), + array('option_type_id' => 5, 'store_id' => 1, 'title' => 'Option 2 New Store View') ); /** @@ -703,6 +706,8 @@ class OptionTest extends \PHPUnit_Framework_TestCase $behavior = null, $numberOfValidations = 1 ) { + $this->_testStores = array('admin' => 0); + $this->setUp(); if ($behavior) { $this->_model->setParameters(array('behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND)); } diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/_files/product_with_custom_options.csv b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/_files/product_with_custom_options.csv index 6dd31ced170f4037061046b914e29d5c244cc484..f95fd0df04c8eac0b0583540ccb6132040ce3aed 100644 --- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/_files/product_with_custom_options.csv +++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/_files/product_with_custom_options.csv @@ -1,9 +1,12 @@ -sku,_store,_attribute_set,_type,_category,_root_category,_product_websites,color,cost,country_of_manufacture,created_at,custom_design,custom_design_from,custom_design_to,custom_layout_update,description,enable_googlecheckout,gallery,gift_message_available,gift_wrapping_available,gift_wrapping_price,has_options,image,image_label,is_returnable,manufacturer,media_gallery,meta_description,meta_keyword,meta_title,minimal_price,msrp,msrp_display_actual_price_type,msrp_enabled,name,news_from_date,news_to_date,options_container,page_layout,price,related_tgtr_position_behavior,related_tgtr_position_limit,required_options,short_description,small_image,small_image_label,special_from_date,special_price,special_to_date,status,tax_class_id,thumbnail,thumbnail_label,updated_at,upsell_tgtr_position_behavior,upsell_tgtr_position_limit,url_key,url_path,visibility,weight,qty,min_qty,use_config_min_qty,is_qty_decimal,backorders,use_config_backorders,min_sale_qty,use_config_min_sale_qty,max_sale_qty,use_config_max_sale_qty,is_in_stock,notify_stock_qty,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,_related_sku,_related_position,_crosssell_sku,_crosssell_position,_upsell_sku,_upsell_position,_associated_sku,_associated_default_qty,_associated_position,_tier_price_website,_tier_price_customer_group,_tier_price_qty,_tier_price_price,_group_price_website,_group_price_customer_group,_group_price_price,_media_attribute_id,_media_image,_media_label,_media_position,_media_is_disabled,_custom_option_store,_custom_option_type,_custom_option_title,_custom_option_is_required,_custom_option_price,_custom_option_sku,_custom_option_max_characters,_custom_option_sort_order,_custom_option_row_title,_custom_option_row_price,_custom_option_row_sku,_custom_option_row_sort -simple,,Default,simple,,,base,,,,,,,,,,1,,,,,1,,,"Use config",,,,,,,,,,"New Product",,,"Block after Info Column",,10.0000,,,1,,,,,,,1,,,,"2012-07-13 12:04:17",,,new-product,new-product.html,4,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,,,,,,,,,,,,,,,,,,,,,,,field,"Test Field Title",1,,1-text,100,0,,,, -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,date_time,"Test Date and Time Title",1,2.0000,2-date,,0,,,, -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,drop_down,"Test Select",1,,,,0,"Option 1",3.0000,3-1-select,0 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2",3.0000,3-2-select,0 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,,,,,,,"Option 2",,, -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,radio,"Test Radio",1,,,,0,"Option 1",3.0000,4-1-radio,0 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2",3.0000,4-2-radio,0 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,,,,,,,"Option 2",,, +sku,_store,_attribute_set,_type,_category,_root_category,_product_websites,color,cost,country_of_manufacture,created_at,custom_design,custom_design_from,custom_design_to,custom_layout_update,description,enable_googlecheckout,gallery,gift_message_available,gift_wrapping_available,gift_wrapping_price,has_options,image,image_label,is_returnable,manufacturer,media_gallery,meta_description,meta_keyword,meta_title,minimal_price,msrp,msrp_display_actual_price_type,msrp_enabled,name,news_from_date,news_to_date,options_container,page_layout,price,related_tgtr_position_behavior,related_tgtr_position_limit,required_options,short_description,small_image,small_image_label,special_from_date,special_price,special_to_date,status,tax_class_id,thumbnail,thumbnail_label,updated_at,upsell_tgtr_position_behavior,upsell_tgtr_position_limit,url_key,url_path,visibility,weight,qty,min_qty,use_config_min_qty,is_qty_decimal,backorders,use_config_backorders,min_sale_qty,use_config_min_sale_qty,max_sale_qty,use_config_max_sale_qty,is_in_stock,notify_stock_qty,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,_related_sku,_related_position,_crosssell_sku,_crosssell_position,_upsell_sku,_upsell_position,_associated_sku,_associated_default_qty,_associated_position,_tier_price_website,_tier_price_customer_group,_tier_price_qty,_tier_price_price,_group_price_website,_group_price_customer_group,_group_price_price,_media_attribute_id,_media_image,_media_label,_media_position,_media_is_disabled,_custom_option_store,_custom_option_type,_custom_option_title,_custom_option_is_required,_custom_option_price,_custom_option_sku,_custom_option_max_characters,_custom_option_sort_order,_custom_option_row_title,_custom_option_row_price,_custom_option_row_sku,_custom_option_row_sort +simple,,Default,simple,,,base,,,,,,,,,,1,,,,,1,,,"Use config",,,,,,,,,,"New Product",,,"Block after Info Column",,10.0000,,,1,,,,,,,1,,,,"2012-07-13 12:04:17",,,new-product,new-product.html,4,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,,,,,,,,,,,,,,,,,,,,,,,field,"Test Field Title",1,,1-text,100,0,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,date_time,"Test Date and Time Title",1,2.0000,2-date,,0,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,drop_down,"Test Select",1,,,,0,"Option 1",3.0000,3-1-select,0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2",3.0000,3-2-select,0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,,,,,,,"Option 2",,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,radio,"Test Radio",1,,,,0,"Option 1",3.0000,4-1-radio,0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Option 2",3.0000,4-2-radio,0 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,,,,,,,"Option 1",,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,default,,,,,,,,"Option 2",,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,new_store_view,,"Option New Store View",,,,,,"Option 1 New Store View",,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,new_store_view,,,,,,,,"Option 2 New Store View",,, diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Block/ResultTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Block/ResultTest.php index 5ea11893ac2030f4b4ff646a77e0a8d1c9f4bfd6..f1cf7ccd2d177cb8d88b37cd12585db22184b053 100644 --- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Block/ResultTest.php +++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Block/ResultTest.php @@ -28,6 +28,12 @@ namespace Magento\CatalogSearch\Block; */ class ResultTest extends \PHPUnit_Framework_TestCase { + /** @var \Magento\Search\Model\Query|\PHPUnit_Framework_MockObject_MockObject */ + private $queryMock; + + /** @var \Magento\Search\Model\QueryFactory|\PHPUnit_Framework_MockObject_MockObject */ + private $queryFactoryMock; + /** @var \Magento\CatalogSearch\Block\Result */ protected $model; @@ -50,7 +56,14 @@ class ResultTest extends \PHPUnit_Framework_TestCase $this->contextMock = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false); $this->layerMock = $this->getMock('Magento\Catalog\Model\Layer\Search', [], [], '', false); $this->dataMock = $this->getMock('Magento\CatalogSearch\Helper\Data', [], [], '', false); - $this->model = new Result($this->contextMock, $this->layerMock, $this->dataMock); + $this->queryMock = $this->getMockBuilder('Magento\Search\Model\Query') + ->disableOriginalConstructor() + ->getMock(); + $this->queryFactoryMock = $this->getMockBuilder('Magento\Search\Model\QueryFactory') + ->disableOriginalConstructor() + ->setMethods(['get']) + ->getMock(); + $this->model = new Result($this->contextMock, $this->layerMock, $this->dataMock, $this->queryFactoryMock); } public function testGetSearchQueryText() @@ -80,10 +93,10 @@ class ResultTest extends \PHPUnit_Framework_TestCase $this->returnValue($isMinQueryLength) ); if ($isMinQueryLength) { - $queryMock = $this->getMock('Magento\CatalogSearch\Model\Query', array(), array(), '', false); + $queryMock = $this->getMock('Magento\Search\Model\Query', array(), array(), '', false); $queryMock->expects($this->once())->method('getMinQueryLength')->will($this->returnValue('5')); - $this->dataMock->expects($this->once())->method('getQuery')->will($this->returnValue($queryMock)); + $this->queryFactoryMock->expects($this->once())->method('get')->will($this->returnValue($queryMock)); } $this->assertEquals($expectedResult, $this->model->getNoResultText()); } diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php index 92993c9df6b8684c340ed3bd6bb51d009d37e81c..066d564179578f0053749540352b14b7737d7ad0 100644 --- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php +++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php @@ -72,7 +72,7 @@ class DataTest extends \PHPUnit_Framework_TestCase { $this->_contextMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false); $this->_stringMock = $this->getMock('Magento\Framework\Stdlib\String'); - $this->_queryFactoryMock = $this->getMock('Magento\CatalogSearch\Model\QueryFactory', [], [], '', false); + $this->_queryFactoryMock = $this->getMock('Magento\Search\Model\QueryFactory', [], [], '', false); $this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'); $this->_escaperMock = $this->getMock('Magento\Framework\Escaper'); $this->_filterManagerMock = $this->getMock('Magento\Framework\Filter\FilterManager', [], [], '', false); @@ -105,7 +105,7 @@ class DataTest extends \PHPUnit_Framework_TestCase $this->_scopeConfigMock->expects($this->once()) ->method('getValue') ->with( - \Magento\CatalogSearch\Model\Query::XML_PATH_MIN_QUERY_LENGTH, + \Magento\Search\Model\Query::XML_PATH_MIN_QUERY_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null ) @@ -119,7 +119,7 @@ class DataTest extends \PHPUnit_Framework_TestCase $this->_scopeConfigMock->expects($this->once()) ->method('getValue') ->with( - \Magento\CatalogSearch\Model\Query::XML_PATH_MAX_QUERY_LENGTH, + \Magento\Search\Model\Query::XML_PATH_MAX_QUERY_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null ) @@ -133,7 +133,7 @@ class DataTest extends \PHPUnit_Framework_TestCase $this->_scopeConfigMock->expects($this->once()) ->method('getValue') ->with( - \Magento\CatalogSearch\Model\Query::XML_PATH_MAX_QUERY_WORDS, + \Magento\Search\Model\Query::XML_PATH_MAX_QUERY_WORDS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null ) diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/EngineProviderTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/EngineProviderTest.php index 9aecdfac54b8ae0075c04ecb3558d569ccda297b..2e70e87082b17af4f0b7605d4f7ee59464e308f1 100644 --- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/EngineProviderTest.php +++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/EngineProviderTest.php @@ -90,38 +90,4 @@ class EngineProviderTest extends \PHPUnit_Framework_TestCase $this->assertEquals($engineMock, $this->_model->get()); } - - public function testGetNegative() - { - $engineMock = $this->getMock( - 'Magento\CatalogSearch\Model\Resource\Fulltext\Engine', - array('test', '__wakeup'), - array(), - '', - false - ); - $engineMock->expects($this->never())->method('test'); - - $this->_scopeConfigMock->expects( - $this->once() - )->method( - 'getValue' - )->with( - 'catalog/search/engine' - )->will( - $this->returnValue('') - ); - - $this->_engineFactoryMock->expects( - $this->once() - )->method( - 'create' - )->with( - 'Magento\CatalogSearch\Model\Resource\Fulltext\Engine' - )->will( - $this->returnValue($engineMock) - ); - - $this->assertEquals($engineMock, $this->_model->get()); - } } diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php index 6be6a06216aaa265849644542c569b85721624a9..71e4e879d07a03b5005da4f9efdafd805442a030 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php +++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php @@ -84,6 +84,9 @@ class MergeTest extends \PHPUnit_Framework_TestCase $fileSource = $this->getMockForAbstractClass('Magento\Framework\View\File\CollectorInterface'); $fileSource->expects($this->any())->method('getFiles')->will($this->returnValue($files)); + $pageLayoutFileSource = $this->getMockForAbstractClass('Magento\Framework\View\File\CollectorInterface'); + $pageLayoutFileSource->expects($this->any())->method('getFiles')->willReturn([]); + $design = $this->getMockForAbstractClass('Magento\Framework\View\DesignInterface'); $this->_store = $this->getMock('Magento\Store\Model\Store', array(), array(), '', false); @@ -138,6 +141,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase 'design' => $design, 'storeManager' => $storeManager, 'fileSource' => $fileSource, + 'pageLayoutFileSource' => $pageLayoutFileSource, 'resource' => $this->_resource, 'appState' => $this->_appState, 'cache' => $this->_cache, diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php index 5fae5c12f0bc0acad67e2728af537146e498022b..fae5f317b3c5bd15ef9b9959f73cc60d72d7ef49 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php +++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php @@ -42,16 +42,13 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase */ protected function _createValidator($layoutUpdate, $isSchemaValid = true) { - $modulesReader = $this->getMockBuilder('Magento\Framework\Module\Dir\Reader') + $filesystem = $this->getMockBuilder('Magento\Framework\App\Filesystem') ->disableOriginalConstructor() ->getMock(); - $modulesReader->expects( + $filesystem->expects( $this->exactly(2) )->method( - 'getModuleDir' - )->with( - 'etc', - 'Magento_Core' + 'getPath' )->will( $this->returnValue('dummyDir') ); @@ -64,7 +61,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase 'xml' => '<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . trim( $layoutUpdate ) . '</layout>', - 'schemaFile' => 'dummyDir/layout_single.xsd' + 'schemaFile' => 'dummyDir/Magento/Framework/View/Layout/etc/page_layout.xsd' ); $exceptionMessage = 'validation exception'; @@ -82,7 +79,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $model = $this->_objectHelper->getObject( 'Magento\Core\Model\Layout\Update\Validator', - array('modulesReader' => $modulesReader, 'domConfigFactory' => $domConfigFactory) + array('filesystem' => $filesystem, 'domConfigFactory' => $domConfigFactory) ); return $model; @@ -99,12 +96,12 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase { $model = $this->_createValidator($layoutUpdate, $isValid); $this->assertEquals( + $expectedResult, $model->isValid( $layoutUpdate, - \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE, + \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_PAGE_HANDLE, false - ), - $expectedResult + ) ); $this->assertEquals($model->getMessages(), $messages); } @@ -140,7 +137,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase $this->assertEquals( $model->isValid( $layoutUpdate, - \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE, + \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_PAGE_HANDLE, true ), $expectedResult diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/XsdTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/XsdTest.php index 56a3baa6c73ae2cad8e29a3ffdcd941d8af4df3d..e1aa2be225fea9d38377ac80dc10ba3028dfd62a 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/XsdTest.php +++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/XsdTest.php @@ -38,7 +38,7 @@ class XsdTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->_xsdSchema = BP . '/app/code/Magento/Core/etc/page.xsd'; + $this->_xsdSchema = BP . '/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd'; $this->_xsdValidator = new \Magento\TestFramework\Utility\XsdValidator(); } diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/arguments.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/arguments.xml index f16de148fa1830c324b356fcf6025e26d0ca1e6b..86af1c575d1fad72ea383db88398177620f2da14 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/arguments.xml +++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/arguments.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <block class="Magento\Test\Block" name="test.block"> <arguments> <argument name="testHelperWithParams" xsi:type="helper" helper="Magento\Core\Model\Layout\Argument\Handler\TestHelper::testMethod"> diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php index 12c28eeb16171effbb0ccd102cb883eba1f1dd88..229be7005933449aa4e54c5ffda00c39c56fad69 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php +++ b/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php @@ -26,9 +26,9 @@ namespace Magento\Core\Model\View; class DesignTest extends \PHPUnit_Framework_TestCase { /** - * @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\ObjectManager|\PHPUnit_Framework_MockObject_MockObject */ - private $locale; + private $objectManager; /** * @var \Magento\Core\Model\View\Design::__construct @@ -43,20 +43,24 @@ class DesignTest extends \PHPUnit_Framework_TestCase ); $config = $this->getMockForAbstractClass('\Magento\Framework\App\Config\ScopeConfigInterface'); $themeFactory = $this->getMock('\Magento\Core\Model\ThemeFactory'); - $this->locale = $this->getMockForAbstractClass('\Magento\Framework\Locale\ResolverInterface'); + $this->objectManager = $this->getMockForAbstractClass('\Magento\Framework\ObjectManager'); $state = $this->getMock('\Magento\Framework\App\State', array(), array(), '', false); $themes = array(); $this->model = new \Magento\Core\Model\View\Design( - $storeManager, $flyweightThemeFactory, $config, $themeFactory, $this->locale, $state, $themes + $storeManager, $flyweightThemeFactory, $config, $themeFactory, $this->objectManager, $state, $themes ); } public function testGetLocale() { $expected = 'locale'; - $this->locale->expects($this->once()) + $localeMock = $this->getMockForAbstractClass('\Magento\Framework\Locale\ResolverInterface'); + $localeMock->expects($this->once()) ->method('getLocaleCode') ->will($this->returnValue($expected)); + $this->objectManager->expects($this->once()) + ->method('get') + ->will($this->returnValue($localeMock)); $actual = $this->model->getLocale(); $this->assertSame($expected, $actual); } diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php index cd77186b769a402d6f042cfa916db929911e9d8a..8c9a3b28281bcec69073c2cf32325a26cb4c8a6c 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php @@ -24,8 +24,11 @@ namespace Magento\Customer\Block\Adminhtml\Edit\Tab; -use \Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper; -use \Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Framework\Service\Data\AbstractExtensibleObject; +use Magento\Framework\Service\Data\AttributeValue; +use Magento\Framework\Service\ExtensibleDataObjectConverter; class AccountTest extends \PHPUnit_Framework_TestCase { @@ -186,7 +189,10 @@ class AccountTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue(['Suf1', 'Suf2'])); $this->formFactoryMock->expects($this->any())->method('create') ->will($this->returnValue($accountForm)); - $this->customerFormFactoryMock->expects($this->any())->method('create')->with('customer', 'adminhtml_customer') + $this->customerFormFactoryMock + ->expects($this->any()) + ->method('create') + ->with('customer', 'adminhtml_customer', ExtensibleDataObjectConverter::toFlatArray($customerObject)) ->will($this->returnValue($customerForm)); $this->customerAccountServiceInterfaceMock->expects($this->any())->method('canModify')->withAnyParameters() ->will($this->returnValue($canModifyCustomer)); @@ -228,7 +234,17 @@ class AccountTest extends \PHPUnit_Framework_TestCase array([], true, true), array(['id' => 1], true, true), array([], false, false), - array(['id' => 1], false, false), + array( + [ + 'id' => 1, + AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY => [ + [AttributeValue::ATTRIBUTE_CODE => 'test_attribute1', AttributeValue::VALUE => 'test_value1'], + [AttributeValue::ATTRIBUTE_CODE => 'test_attribute2', AttributeValue::VALUE => 'test_value2'] + ] + ], + false, + false + ), ); } } diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php index 71ecdf4a58e8c65827860dc6dd9cb3391e74436b..46e39cff31ceacef2578cff7c5a6b37b9ff82671 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php @@ -122,7 +122,8 @@ class DobTest extends \PHPUnit_Framework_TestCase $this->_block = new Dob( $context, $this->getMock('Magento\Customer\Helper\Address', array(), array(), '', false), - $this->_metadataService + $this->_metadataService, + $this->getMock('Magento\Framework\View\Element\Html\Date', array(), array(), '', false) ); } diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php new file mode 100644 index 0000000000000000000000000000000000000000..4cd17defe0ec57d202f047bad02a113554e91af4 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php @@ -0,0 +1,412 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Controller\Account; + +use Magento\Customer\Helper\Address; +use Magento\Customer\Helper\Data as CustomerData; +use Magento\Store\Model\ScopeInterface; + +class ConfirmTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Customer\Controller\Account + */ + protected $model; + + /** + * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $requestMock; + + /** + * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $responseMock; + + /** + * @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $viewMock; + + /** + * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerSessionMock; + + /** + * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $redirectMock; + + /** + * @var \Magento\Framework\UrlFactory|\PHPUnit_Framework_MockObject_MockObject + */ + protected $urlFactoryMock; + + /** + * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject + */ + protected $urlMock; + + /** + * @var \Magento\Customer\Service\V1\CustomerAccountServiceInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerAccountServiceMock; + + /** + * @var \Magento\Customer\Service\V1\Data\Customer|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerServiceDataMock; + + /** + * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $messageManagerMock; + + /** + * @var \Magento\Customer\Helper\Address|\PHPUnit_Framework_MockObject_MockObject + */ + protected $addressHelperMock; + + /** + * @var \Magento\Store\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeManagerMock; + + /** + * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeMock; + + /** + * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $scopeConfigMock; + + /** + * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject + */ + protected $contextMock; + + protected function setUp() + { + $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false); + $this->requestMock = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false); + $this->responseMock = $this->getMock( + 'Magento\Framework\App\Response\Http', ['setRedirect', '__wakeup'], [], '', false + ); + $this->viewMock = $this->getMock('Magento\Framework\App\ViewInterface'); + $this->redirectMock = $this->getMock('Magento\Framework\App\Response\RedirectInterface'); + + $this->urlMock = $this->getMock('Magento\Framework\Url', [], [], '', false); + $this->urlFactoryMock = $this->getMock('Magento\Framework\UrlFactory', [], [], '', false); + $this->urlFactoryMock->expects($this->any()) + ->method('create') + ->will($this->returnValue($this->urlMock)); + + $this->customerAccountServiceMock = + $this->getMockForAbstractClass('Magento\Customer\Service\V1\CustomerAccountServiceInterface'); + $this->customerServiceDataMock = $this->getMock( + 'Magento\Customer\Service\V1\Data\Customer', [], [], '', false + ); + + $this->messageManagerMock = $this->getMock('Magento\Framework\Message\Manager', [], [], '', false); + $this->addressHelperMock = $this->getMock('Magento\Customer\Helper\Address', [], [], '', false); + $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false); + $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false); + + $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'); + $this->contextMock = $this->getMock('Magento\Framework\App\Action\Context', [], [], '', false); + $this->contextMock->expects($this->any()) + ->method('getRequest') + ->will($this->returnValue($this->requestMock)); + $this->contextMock->expects($this->any()) + ->method('getResponse') + ->will($this->returnValue($this->responseMock)); + $this->contextMock->expects($this->any()) + ->method('getRedirect') + ->will($this->returnValue($this->redirectMock)); + $this->contextMock->expects($this->any()) + ->method('getView') + ->will($this->returnValue($this->viewMock)); + $this->contextMock->expects($this->any()) + ->method('getMessageManager') + ->will($this->returnValue($this->messageManagerMock)); + + $this->model = new \Magento\Customer\Controller\Account\Confirm( + $this->contextMock, + $this->customerSessionMock, + $this->scopeConfigMock, + $this->storeManagerMock, + $this->customerAccountServiceMock, + $this->addressHelperMock, + $this->urlFactoryMock + ); + } + + public function testIsLoggedIn() + { + $this->customerSessionMock->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(true)); + + $this->redirectMock->expects($this->once()) + ->method('redirect') + ->with($this->responseMock, '*/*/', []) + ->will($this->returnValue(false)); + + $this->model->execute(); + } + + /** + * @dataProvider getParametersDataProvider + */ + public function testNoCustomerIdInRequest($customerId, $key) + { + $this->customerSessionMock->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(false)); + + $this->requestMock->expects($this->at(0)) + ->method('getParam') + ->with($this->equalTo('id'), false) + ->will($this->returnValue($customerId)); + $this->requestMock->expects($this->at(1)) + ->method('getParam') + ->with($this->equalTo('key'), false) + ->will($this->returnValue($key)); + + $exception = new \Exception('Bad request.'); + $this->messageManagerMock->expects($this->once()) + ->method('addException') + ->with($this->equalTo($exception), $this->equalTo('There was an error confirming the account')); + + $testUrl = 'http://example.com'; + $this->urlMock->expects($this->once()) + ->method('getUrl') + ->with($this->equalTo('*/*/index'), ['_secure' => true]) + ->will($this->returnValue($testUrl)); + + $this->redirectMock->expects($this->once()) + ->method('error') + ->with($this->equalTo($testUrl)) + ->will($this->returnValue($testUrl)); + + $this->responseMock->expects($this->once()) + ->method('setRedirect') + ->with($this->equalTo($testUrl)) + ->will($this->returnSelf()); + + $this->model->execute(); + } + + /** + * @return array + */ + public function getParametersDataProvider() + { + return [ + [true, false], + [false, true], + ]; + } + + /** + * @param $customerId + * @param $key + * @param $vatValidationEnabled + * @param $addressType + * @param $successMessage + * + * @dataProvider getSuccessMessageDataProvider + */ + public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $addressType, $successMessage) + { + $this->customerSessionMock->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(false)); + + $this->requestMock->expects($this->any()) + ->method('getParam') + ->willReturnMap([ + ['id', false, $customerId], + ['key', false, $key], + ]); + + $this->customerAccountServiceMock->expects($this->once()) + ->method('activateCustomer') + ->with($this->equalTo($customerId), $this->equalTo($key)) + ->will($this->returnValue($this->customerServiceDataMock)); + + $this->customerSessionMock->expects($this->any()) + ->method('setCustomerDataAsLoggedIn') + ->with($this->equalTo($this->customerServiceDataMock)) + ->will($this->returnSelf()); + + $this->messageManagerMock->expects($this->any()) + ->method('addSuccess') + ->with($this->stringContains($successMessage)) + ->will($this->returnSelf()); + + $this->addressHelperMock->expects($this->once()) + ->method('isVatValidationEnabled') + ->will($this->returnValue($vatValidationEnabled)); + $this->addressHelperMock->expects($this->any()) + ->method('getTaxCalculationAddressType') + ->will($this->returnValue($addressType)); + + $this->storeMock->expects($this->any()) + ->method('getFrontendName') + ->will($this->returnValue('frontend')); + $this->storeManagerMock->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($this->storeMock)); + + $this->model->execute(); + } + + /** + * @return array + */ + public function getSuccessMessageDataProvider() + { + return [ + [1, 1, false, null, __('Thank you for registering with')], + [1, 1, true, Address::TYPE_BILLING, __('enter you billing address for proper VAT calculation')], + [1, 1, true, Address::TYPE_SHIPPING, __('enter you shipping address for proper VAT calculation')], + ]; + } + + /** + * @param $customerId + * @param $key + * @param $backUrl + * @param $successUrl + * @param $resultUrl + * @param $isSetFlag + * @param $successMessage + * + * @dataProvider getSuccessRedirectDataProvider + */ + public function testSuccessRedirect( + $customerId, + $key, + $backUrl, + $successUrl, + $resultUrl, + $isSetFlag, + $successMessage + ) { + $this->customerSessionMock->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(false)); + + $this->requestMock->expects($this->any()) + ->method('getParam') + ->willReturnMap([ + ['id', false, $customerId], + ['key', false, $key], + ['back_url', false, $backUrl], + ]); + + $this->customerAccountServiceMock->expects($this->once()) + ->method('activateCustomer') + ->with($this->equalTo($customerId), $this->equalTo($key)) + ->will($this->returnValue($this->customerServiceDataMock)); + + $this->customerSessionMock->expects($this->any()) + ->method('setCustomerDataAsLoggedIn') + ->with($this->equalTo($this->customerServiceDataMock)) + ->will($this->returnSelf()); + + $this->messageManagerMock->expects($this->any()) + ->method('addSuccess') + ->with($this->stringContains($successMessage)) + ->will($this->returnSelf()); + + $this->storeMock->expects($this->any()) + ->method('getFrontendName') + ->will($this->returnValue('frontend')); + $this->storeManagerMock->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($this->storeMock)); + + $this->urlMock->expects($this->any()) + ->method('getUrl') + ->with($this->equalTo('*/*/index'), ['_secure' => true]) + ->will($this->returnValue($successUrl)); + + $this->redirectMock->expects($this->once()) + ->method('success') + ->with($this->equalTo($resultUrl)) + ->will($this->returnValue($resultUrl)); + + $this->scopeConfigMock->expects($this->once()) + ->method('isSetFlag') + ->with( + $this->equalTo(CustomerData::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD), + $this->equalTo(ScopeInterface::SCOPE_STORE) + ) + ->will($this->returnValue($isSetFlag)); + + $this->model->execute(); + } + + /** + * @return array + */ + public function getSuccessRedirectDataProvider() + { + return [ + [ + 1, + 1, + 'http://example.com/back', + null, + 'http://example.com/back', + true, + __('Thank you for registering with') + ], + [ + 1, + 1, + null, + 'http://example.com/success', + 'http://example.com/success', + true, + __('Thank you for registering with') + ], + [ + 1, + 1, + null, + 'http://example.com/success', + 'http://example.com/success', + false, + __('Thank you for registering with') + ], + ]; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php index c4e1925ed7e68e5bf145595e5ef435b2c2bf177e..0db0601dc8a11f6f4f72a1665c181e328df91925 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php @@ -24,80 +24,229 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Customer\Service\V1\CustomerAccountServiceInterface; +use Magento\Customer\Helper\Address; +use Magento\Customer\Helper\Data as CustomerData; +use Magento\Store\Model\ScopeInterface; + class CreatePostTest extends \PHPUnit_Framework_TestCase { /** * @var \Magento\Customer\Controller\Account\CreatePost */ - protected $object; + protected $model; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */ - protected $customerSession; + protected $customerSessionMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Customer\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */ protected $customerHelperMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $redirectMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Customer\Service\V1\CustomerAccountServiceInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $accountServiceMock; + protected $customerAccountServiceMock; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $response; + protected $responseMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */ - protected $request; + protected $requestMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\UrlFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $urlFactoryMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject */ protected $urlMock; + /** + * @var \Magento\Customer\Model\CustomerExtractor|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerExtractorMock; + + /** + * @var \Magento\Customer\Service\V1\Data\Customer|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerServiceDataMock; + + /** + * @var \Magento\Customer\Service\V1\Data\CustomerDetails|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerDetailsMock; + + /** + * @var \Magento\Customer\Service\V1\Data\CustomerDetailsBuilder|\PHPUnit_Framework_MockObject_MockObject + */ + protected $customerDetailsBuilderMock; + + /** + * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject + */ + protected $contextMock; + + /** + * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $scopeConfigMock; + + /** + * @var \Magento\Store\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeManagerMock; + + /** + * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeMock; + + /** + * @var \Magento\Customer\Helper\Address|\PHPUnit_Framework_MockObject_MockObject + */ + protected $addressHelperMock; + + /** + * @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject + */ + protected $formFactoryMock; + + /** + * @var \Magento\Newsletter\Model\Subscriber|\PHPUnit_Framework_MockObject_MockObject + */ + protected $subscriberMock; + + /** + * @var \Magento\Newsletter\Model\SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject + */ + protected $subscriberFactoryMock; + + /** + * @var \Magento\Customer\Service\V1\Data\RegionBuilder|\PHPUnit_Framework_MockObject_MockObject + */ + protected $regionBuilderMock; + + /** + * @var \Magento\Customer\Service\V1\Data\AddressBuilder|\PHPUnit_Framework_MockObject_MockObject + */ + protected $addressBuilderMock; + + /** + * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject + */ + protected $escaperMock; + + /** + * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject + */ + protected $messageManagerMock; + + /** + * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $eventManagerMock; + protected function setUp() { - $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->customerSession = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false); - $this->customerHelperMock = $this->getMock('\Magento\Customer\Helper\Data', [], [], '', false); + $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false); $this->redirectMock = $this->getMock('Magento\Framework\App\Response\RedirectInterface'); - $this->accountServiceMock = $this->getMock('Magento\Customer\Service\V1\CustomerAccountServiceInterface'); - $this->response = $this->getMock('Magento\Webapi\Controller\Response'); - $this->request = $this->getMockBuilder('Magento\Webapi\Controller\Request') - ->disableOriginalConstructor() - ->getMock(); - $this->urlFactoryMock = $this->getMockBuilder('\Magento\Framework\UrlFactory') - ->disableOriginalConstructor() - ->getMock(); - $this->urlMock = $this->getMockBuilder('\Magento\Backend\Model\Url') - ->disableOriginalConstructor() - ->getMock(); - $this->object = $objectManager->getObject('Magento\Customer\Controller\Account\CreatePost', - [ - 'response' => $this->response, - 'customerSession' => $this->customerSession, - 'customerHelperData' => $this->customerHelperMock, - 'redirect' => $this->redirectMock, - 'customerAccountService' => $this->accountServiceMock, - 'request' => $this->request, - 'urlFactory' => $this->urlFactoryMock, - ] + $this->responseMock = $this->getMock('Magento\Webapi\Controller\Response'); + $this->requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); + + $this->urlMock = $this->getMock('Magento\Framework\Url', [], [], '', false); + $this->urlFactoryMock = $this->getMock('Magento\Framework\UrlFactory', [], [], '', false); + $this->urlFactoryMock->expects($this->once()) + ->method('create') + ->will($this->returnValue($this->urlMock)); + + $this->customerServiceDataMock = $this->getMock('Magento\Customer\Service\V1\Data\Customer', [], [], '', false); + $this->customerDetailsMock = $this->getMock( + 'Magento\Customer\Service\V1\Data\CustomerDetails', [], [], '', false + ); + $this->customerDetailsBuilderMock = $this->getMock( + 'Magento\Customer\Service\V1\Data\CustomerDetailsBuilder', [], [], '', false + ); + + $this->messageManagerMock = $this->getMock('Magento\Framework\Message\Manager', [], [], '', false); + $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'); + + $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false); + $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false); + + $this->customerAccountServiceMock = $this->getMock( + 'Magento\Customer\Service\V1\CustomerAccountServiceInterface' + ); + $this->addressHelperMock = $this->getMock('Magento\Customer\Helper\Address', [], [], '', false); + $this->formFactoryMock = $this->getMock('Magento\Customer\Model\Metadata\FormFactory', [], [], '', false); + + $this->subscriberMock = $this->getMock('Magento\Newsletter\Model\Subscriber', [], [], '', false); + $this->subscriberFactoryMock = $this->getMock( + 'Magento\Newsletter\Model\SubscriberFactory', ['create'], [], '', false + ); + $this->subscriberFactoryMock->expects($this->any()) + ->method('create') + ->will($this->returnValue($this->subscriberMock)); + + $this->regionBuilderMock = $this->getMock( + 'Magento\Customer\Service\V1\Data\RegionBuilder', [], [], '', false + ); + $this->addressBuilderMock = $this->getMock( + 'Magento\Customer\Service\V1\Data\AddressBuilder', [], [], '', false + ); + $this->customerHelperMock = $this->getMock('Magento\Customer\Helper\Data', [], [], '', false); + $this->escaperMock = $this->getMock('Magento\Framework\Escaper', [], [], '', false); + $this->customerExtractorMock = $this->getMock('Magento\Customer\Model\CustomerExtractor', [], [], '', false); + + $this->eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false); + + $this->contextMock = $this->getMock('Magento\Framework\App\Action\Context', [], [], '', false); + $this->contextMock->expects($this->any()) + ->method('getRequest') + ->will($this->returnValue($this->requestMock)); + $this->contextMock->expects($this->any()) + ->method('getResponse') + ->will($this->returnValue($this->responseMock)); + $this->contextMock->expects($this->any()) + ->method('getRedirect') + ->will($this->returnValue($this->redirectMock)); + $this->contextMock->expects($this->any()) + ->method('getMessageManager') + ->will($this->returnValue($this->messageManagerMock)); + $this->contextMock->expects($this->any()) + ->method('getEventManager') + ->will($this->returnValue($this->eventManagerMock)); + + $this->model = new \Magento\Customer\Controller\Account\CreatePost( + $this->contextMock, + $this->customerSessionMock, + $this->scopeConfigMock, + $this->storeManagerMock, + $this->customerAccountServiceMock, + $this->addressHelperMock, + $this->urlFactoryMock, + $this->formFactoryMock, + $this->subscriberFactoryMock, + $this->regionBuilderMock, + $this->addressBuilderMock, + $this->customerDetailsBuilderMock, + $this->customerHelperMock, + $this->escaperMock, + $this->customerExtractorMock ); } @@ -106,7 +255,7 @@ class CreatePostTest extends \PHPUnit_Framework_TestCase */ public function testCreatePostActionRegistrationDisabled() { - $this->customerSession->expects($this->once()) + $this->customerSessionMock->expects($this->once()) ->method('isLoggedIn') ->will($this->returnValue(false)); @@ -116,32 +265,309 @@ class CreatePostTest extends \PHPUnit_Framework_TestCase $this->redirectMock->expects($this->once()) ->method('redirect') - ->with($this->response, '*/*/', array()) + ->with($this->responseMock, '*/*/', array()) ->will($this->returnValue(false)); - $this->accountServiceMock->expects($this->never()) + $this->customerAccountServiceMock->expects($this->never()) ->method('createCustomer'); - $this->object->execute(); + $this->model->execute(); } public function testRegenerateIdOnExecution() { - $this->customerSession->expects($this->once()) + $this->customerSessionMock->expects($this->once()) ->method('regenerateId'); - $this->customerSession->expects($this->once()) + $this->customerSessionMock->expects($this->once()) ->method('isLoggedIn') ->will($this->returnValue(false)); $this->customerHelperMock->expects($this->once()) ->method('isRegistrationAllowed') ->will($this->returnValue(true)); - $this->request->expects($this->once()) + $this->requestMock->expects($this->once()) ->method('isPost') ->will($this->returnValue(true)); - $this->urlFactoryMock->expects($this->once()) + + $this->model->execute(); + } + + /** + * @param $customerId + * @param $customerEmail + * @param $password + * @param $confirmationStatus + * @param $vatValidationEnabled + * @param $addressType + * @param $successMessage + * + * @dataProvider getSuccessMessageDataProvider + */ + public function testSuccessMessage( + $customerId, + $customerEmail, + $password, + $confirmationStatus, + $vatValidationEnabled, + $addressType, + $successMessage + ) { + $this->customerSessionMock->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(false)); + + $this->customerHelperMock->expects($this->once()) + ->method('isRegistrationAllowed') + ->will($this->returnValue(true)); + $this->customerHelperMock->expects($this->once()) + ->method('getEmailConfirmationUrl') + ->will($this->returnValue($customerEmail)); + + $this->customerSessionMock->expects($this->once()) + ->method('regenerateId'); + + $this->customerServiceDataMock->expects($this->any()) + ->method('getId') + ->will($this->returnValue($customerId)); + $this->customerServiceDataMock->expects($this->any()) + ->method('getEmail') + ->will($this->returnValue($customerEmail)); + + $this->customerExtractorMock->expects($this->any()) + ->method('extract') + ->with($this->equalTo('customer_account_create'), $this->equalTo($this->requestMock)) + ->will($this->returnValue($this->customerServiceDataMock)); + + $this->requestMock->expects($this->once()) + ->method('isPost') + ->will($this->returnValue(true)); + $this->requestMock->expects($this->any()) + ->method('getPost') + ->will($this->returnValue(false)); + + $this->requestMock->expects($this->any()) + ->method('getParam') + ->willReturnMap([ + ['password', null, $password], + ['is_subscribed', false, true], + ]); + + $this->customerDetailsBuilderMock->expects($this->once()) + ->method('setCustomer') + ->with($this->equalTo($this->customerServiceDataMock)) + ->will($this->returnSelf()); + $this->customerDetailsBuilderMock->expects($this->once()) + ->method('setAddresses') + ->with($this->equalTo([])) + ->will($this->returnSelf()); + $this->customerDetailsBuilderMock->expects($this->once()) ->method('create') - ->will($this->returnValue($this->urlMock)); - $this->object->execute(); + ->will($this->returnValue($this->customerDetailsMock)); + + $this->customerAccountServiceMock->expects($this->once()) + ->method('createCustomer') + ->with($this->equalTo($this->customerDetailsMock), $this->equalTo($password), '') + ->will($this->returnValue($this->customerServiceDataMock)); + $this->customerAccountServiceMock->expects($this->once()) + ->method('getConfirmationStatus') + ->with($this->equalTo($customerId)) + ->will($this->returnValue($confirmationStatus)); + + $this->subscriberMock->expects($this->once()) + ->method('subscribeCustomerById') + ->with($this->equalTo($customerId)); + + $this->messageManagerMock->expects($this->any()) + ->method('addSuccess') + ->with($this->stringContains($successMessage)) + ->will($this->returnSelf()); + + $this->addressHelperMock->expects($this->any()) + ->method('isVatValidationEnabled') + ->will($this->returnValue($vatValidationEnabled)); + $this->addressHelperMock->expects($this->any()) + ->method('getTaxCalculationAddressType') + ->will($this->returnValue($addressType)); + + $this->model->execute(); + } + + /** + * @return array + */ + public function getSuccessMessageDataProvider() + { + return [ + [ + 1, + 'customer@example.com', + '123123q', + CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_REQUIRED, + false, + Address::TYPE_SHIPPING, + 'Account confirmation is required', + ], + [ + 1, + 'customer@example.com', + '123123q', + CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_REQUIRED, + false, + Address::TYPE_SHIPPING, + 'Thank you for registering with', + ], + [ + 1, + 'customer@example.com', + '123123q', + CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_REQUIRED, + true, + Address::TYPE_SHIPPING, + 'enter you shipping address for proper VAT calculation', + ], + [ + 1, + 'customer@example.com', + '123123q', + CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_REQUIRED, + true, + Address::TYPE_BILLING, + 'enter you billing address for proper VAT calculation', + ], + ]; + } + + /** + * @param $customerId + * @param $password + * @param $confirmationStatus + * @param $successUrl + * @param $isSetFlag + * @param $successMessage + * + * @dataProvider getSuccessRedirectDataProvider + */ + public function testSuccessRedirect( + $customerId, + $password, + $confirmationStatus, + $successUrl, + $isSetFlag, + $successMessage + ) { + $this->customerSessionMock->expects($this->once()) + ->method('isLoggedIn') + ->will($this->returnValue(false)); + + $this->customerHelperMock->expects($this->once()) + ->method('isRegistrationAllowed') + ->will($this->returnValue(true)); + + $this->customerSessionMock->expects($this->once()) + ->method('regenerateId'); + + $this->customerServiceDataMock->expects($this->any()) + ->method('getId') + ->will($this->returnValue($customerId)); + + $this->customerExtractorMock->expects($this->any()) + ->method('extract') + ->with($this->equalTo('customer_account_create'), $this->equalTo($this->requestMock)) + ->will($this->returnValue($this->customerServiceDataMock)); + + $this->requestMock->expects($this->once()) + ->method('isPost') + ->will($this->returnValue(true)); + $this->requestMock->expects($this->any()) + ->method('getPost') + ->will($this->returnValue(false)); + + $this->requestMock->expects($this->any()) + ->method('getParam') + ->willReturnMap([ + ['password', null, $password], + ['is_subscribed', false, true], + ]); + + $this->customerDetailsBuilderMock->expects($this->once()) + ->method('setCustomer') + ->with($this->equalTo($this->customerServiceDataMock)) + ->will($this->returnSelf()); + $this->customerDetailsBuilderMock->expects($this->once()) + ->method('setAddresses') + ->with($this->equalTo([])) + ->will($this->returnSelf()); + $this->customerDetailsBuilderMock->expects($this->once()) + ->method('create') + ->will($this->returnValue($this->customerDetailsMock)); + + $this->customerAccountServiceMock->expects($this->once()) + ->method('createCustomer') + ->with($this->equalTo($this->customerDetailsMock), $this->equalTo($password), '') + ->will($this->returnValue($this->customerServiceDataMock)); + $this->customerAccountServiceMock->expects($this->once()) + ->method('getConfirmationStatus') + ->with($this->equalTo($customerId)) + ->will($this->returnValue($confirmationStatus)); + + $this->subscriberMock->expects($this->once()) + ->method('subscribeCustomerById') + ->with($this->equalTo($customerId)); + + $this->messageManagerMock->expects($this->any()) + ->method('addSuccess') + ->with($this->stringContains($successMessage)) + ->will($this->returnSelf()); + + $this->urlMock->expects($this->any()) + ->method('getUrl') + ->willReturnMap([ + ['*/*/index', ['_secure' => true], $successUrl], + ['*/*/create', ['_secure' => true], $successUrl], + ]); + + $this->redirectMock->expects($this->once()) + ->method('success') + ->with($this->equalTo($successUrl)) + ->will($this->returnValue($successUrl)); + + $this->scopeConfigMock->expects($this->once()) + ->method('isSetFlag') + ->with( + $this->equalTo(CustomerData::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD), + $this->equalTo(ScopeInterface::SCOPE_STORE) + ) + ->will($this->returnValue($isSetFlag)); + + $this->storeMock->expects($this->any()) + ->method('getFrontendName') + ->will($this->returnValue('frontend')); + $this->storeManagerMock->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($this->storeMock)); + + $this->model->execute(); + } + + public function getSuccessRedirectDataProvider() + { + return [ + [ + 1, + '123123q', + CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_NOT_REQUIRED, + 'http://example.com/success', + true, + 'Thank you for registering with', + ], + [ + 1, + '123123q', + CustomerAccountServiceInterface::ACCOUNT_CONFIRMATION_NOT_REQUIRED, + 'http://example.com/success', + false, + 'Thank you for registering with', + ], + ]; } } diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php index 0df060f96a4130565349022e6de90ed80e06fac1..45826bd7b257925dace24a7df218bba954133bc5 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php @@ -183,16 +183,16 @@ class LoginPostTest extends \PHPUnit_Framework_TestCase } /** - * @covers \Magento\Customer\Controller\Account::_getAllowedActions + * @covers \Magento\Customer\Controller\Account::getAllowedActions */ public function testGetAllowedActions() { - $this->assertAttributeEquals($this->openActions, '_openActions', $this->object); + $this->assertAttributeEquals($this->openActions, 'openActions', $this->object); /** - * @TODO: [TD] Protected methods must be tested via public. Eliminate _getAllowedActions method and write test + * @TODO: [TD] Protected methods must be tested via public. Eliminate getAllowedActions method and write test * for dispatch method using this property instead. */ - $method = new \ReflectionMethod('Magento\Customer\Controller\Account', '_getAllowedActions'); + $method = new \ReflectionMethod('Magento\Customer\Controller\Account', 'getAllowedActions'); $method->setAccessible(true); $this->assertEquals($this->openActions, $method->invoke($this->object)); } diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/DataTest.php index 3974dd8b380bdbcace40c15a23d9a504b0bcc519..69d065804b52033c9b141f1813e99bbecb24e7f2 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Helper/DataTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/DataTest.php @@ -50,14 +50,14 @@ class DataTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Customer\Model\Metadata\Form|\PHPUnit_Framework_MockObject_MockObject */ protected $_mockMetadataForm; + /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */ + protected $scopeConfigMock; + + /** @var \Magento\Customer\Helper\Data */ + protected $model; + public function setUp() { - $this->_dataHelper = $this->getMockBuilder( - '\Magento\Customer\Helper\Data' - )->disableOriginalConstructor()->setMethods( - array('__construct') - )->getMock(); - $this->_mockRequest = $this->getMock( 'Magento\Framework\App\RequestInterface', ['getPost', 'getModuleName', 'setModuleName', 'getActionName', 'setActionName', 'getParam', 'getCookie'], @@ -70,6 +70,23 @@ class DataTest extends \PHPUnit_Framework_TestCase '\Magento\Customer\Model\Metadata\Form' )->disableOriginalConstructor()->getMock(); + $this->scopeConfigMock = $this->getMock( + 'Magento\Framework\App\Config\ScopeConfigInterface', + ['getValue', 'isSetFlag'], + [], + '', + false + ); + } + + protected function prepareExtractCustomerData() + { + $this->_dataHelper = $this->getMockBuilder( + '\Magento\Customer\Helper\Data' + )->disableOriginalConstructor()->setMethods( + array('__construct') + )->getMock(); + $filteredData = array( 'filter_key' => 'filter_value', 'attribute_is_not_front_end_input' => false, @@ -145,6 +162,7 @@ class DataTest extends \PHPUnit_Framework_TestCase public function testExtractCustomerData() { + $this->prepareExtractCustomerData(); $this->assertEquals( $this->_expected, $this->_dataHelper->extractCustomerData( @@ -160,6 +178,7 @@ class DataTest extends \PHPUnit_Framework_TestCase public function testExtractCustomerDataWithFactory() { + $this->prepareExtractCustomerData(); /** @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject */ $mockFormFactory = $this->getMockBuilder( '\Magento\Customer\Model\Metadata\FormFactory' @@ -196,4 +215,146 @@ class DataTest extends \PHPUnit_Framework_TestCase ) ); } + + public function testGetCustomerGroupIdBasedOnVatNumberWithoutAutoAssign() + { + $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this); + $arguments = array( + 'scopeConfig' => $this->scopeConfigMock + ); + $this->model = $objectManagerHelper->getObject('Magento\Customer\Helper\Data', $arguments); + + $this->scopeConfigMock->expects($this->once()) + ->method('isSetFlag') + ->with( + \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store' + )->will($this->returnValue(false)); + + $vatResult = $this->getMock( + 'Magento\Framework\Object', + [], + [], + '', + false + ); + + $this->assertNull($this->model->getCustomerGroupIdBasedOnVatNumber('GB', $vatResult, 'store')); + } + + /** + * @param string $countryCode + * @param bool $resultValid + * @param bool $resultSuccess + * @param string $merchantCountryCode + * @param int $vatDomestic + * @param int $vatIntra + * @param int $vatInvalid + * @param int $vatError + * @param int|null $groupId + * @dataProvider dataProviderGetCustomerGroupIdBasedOnVatNumber + */ + public function testGetCustomerGroupIdBasedOnVatNumber( + $countryCode, + $resultValid, + $resultSuccess, + $merchantCountryCode, + $vatDomestic, + $vatIntra, + $vatInvalid, + $vatError, + $groupId + ) { + $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this); + $arguments = [ + 'scopeConfig' => $this->scopeConfigMock + ]; + $this->model = $objectManagerHelper->getObject('Magento\Customer\Helper\Data', $arguments); + + $this->scopeConfigMock->expects($this->once()) + ->method('isSetFlag') + ->with( + \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store' + )->will($this->returnValue(true)); + + $configMap = [ + [ + \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_VIV_DOMESTIC_GROUP, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store', + $vatDomestic + ], + [ + \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_VIV_INTRA_UNION_GROUP, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store', + $vatIntra + ], + [ + \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_VIV_INVALID_GROUP, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store', + $vatInvalid + ], + [ + \Magento\Customer\Helper\Data::XML_PATH_CUSTOMER_VIV_ERROR_GROUP, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store', + $vatError + ], + [ + \Magento\Customer\Helper\Data::XML_PATH_MERCHANT_COUNTRY_CODE, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'store', + $merchantCountryCode + ], + ]; + $this->scopeConfigMock->expects($this->any()) + ->method('getValue') + ->will($this->returnValueMap($configMap)); + + $vatResult = $this->getMock( + 'Magento\Framework\Object', + ['getIsValid', 'getRequestSuccess'], + [], + '', + false + ); + $vatResult->expects($this->any()) + ->method('getIsValid') + ->will($this->returnValue($resultValid)); + $vatResult->expects($this->any()) + ->method('getRequestSuccess') + ->will($this->returnValue($resultSuccess)); + + $this->assertEquals( + $groupId, + $this->model->getCustomerGroupIdBasedOnVatNumber($countryCode, $vatResult, 'store') + ); + } + + public function dataProviderGetCustomerGroupIdBasedOnVatNumber() + { + return [ + ['US', false, false, 'US', null, null, null, null, 0], + ['US', false, false, 'GB', null, null, null, null, 0], + ['US', true, false, 'US', null, null, null, null, 0], + ['US', false, true, 'US', null, null, null, null, 0], + ['GB', false, false, 'GB', 3, 4, 5, 6, 6], + ['GB', false, false, 'DE', 3, 4, 5, 6, 6], + ['GB', true, true, 'GB', 3, 4, 5, 6, 3], + ['GB', true, true, 'DE', 3, 4, 5, 6, 4], + ['GB', false, true, 'DE', 3, 4, 5, 6, 5], + ['GB', false, true, 'GB', 3, 4, 5, 6, 5], + ['GB', false, false, 'GB', null, null, null, null, 0], + ['GB', false, false, 'DE', null, null, null, null, 0], + ['GB', true, true, 'GB', null, null, null, null, 0], + ['GB', true, true, 'DE', null, null, null, null, 0], + ['GB', false, true, 'DE', null, null, null, null, 0], + ['GB', false, true, 'GB', null, null, null, null, 0], + ]; + } } diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php new file mode 100644 index 0000000000000000000000000000000000000000..9041ff8aeac7bca5bf4cb5a7648348e808fe07ed --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php @@ -0,0 +1,270 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Model\Resource; + +use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper; + +class AddressTest extends \PHPUnit_Framework_TestCase +{ + /** @var \Magento\Customer\Model\Resource\Address */ + protected $addressResource; + + /** @var \Magento\Customer\Model\CustomerFactory|\PHPUnit_Framework_MockObject_MockObject */ + protected $customerFactory; + + protected function setUp() + { + $this->addressResource = (new ObjectManagerHelper($this))->getObject( + 'Magento\Customer\Model\Resource\Address', + [ + 'resource' => $this->prepareResource(), + 'eavConfig' => $this->prepareEavConfig(), + 'validatorFactory' => $this->prepareValidatorFactory(), + 'customerFactory' => $this->prepareCustomerFactory() + ] + ); + } + + /** + * @param $addressId + * @param $isDefaultBilling + * @param $isDefaultShipping + * + * @dataProvider getSaveDataProvider + */ + public function testSave($addressId, $isDefaultBilling, $isDefaultShipping) + { + /** @var $customer \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject */ + $customer = $this->getMock( + 'Magento\Customer\Model\Customer', + ['__wakeup', 'setDefaultBilling', 'setDefaultShipping', 'save', 'load'], + [], + '', + false + ); + $customer->expects($this->any()) + ->method('load') + ->willReturnSelf(); + + $this->customerFactory->expects($this->any()) + ->method('create') + ->willReturn($customer); + + /** @var $address \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject */ + $address = $this->getMock( + 'Magento\Customer\Model\Address', + [ + '__wakeup', + 'getId', + 'getEntityTypeId', + 'getIsDefaultBilling', + 'getIsDefaultShipping', + ], + [], + '', + false + ); + $address->expects($this->any())->method('getEntityTypeId')->willReturn('3'); + $address->expects($this->any())->method('getId')->willReturn($addressId); + $address->expects($this->any())->method('getIsDefaultShipping')->willReturn($isDefaultShipping); + $address->expects($this->any())->method('getIsDefaultBilling')->willReturn($isDefaultBilling); + if ($addressId && ($isDefaultBilling || $isDefaultShipping)) { + if ($isDefaultBilling) { + $customer->expects($this->once())->method('setDefaultBilling')->with($addressId); + } + if ($isDefaultShipping) { + $customer->expects($this->once())->method('setDefaultShipping')->with($addressId); + } + $customer->expects($this->once())->method('save'); + } else { + $customer->expects($this->never())->method('setDefaultBilling'); + $customer->expects($this->never())->method('setDefaultShipping'); + $customer->expects($this->never())->method('save'); + } + $this->addressResource->setType('customer_address'); + $this->addressResource->save($address); + } + + /** + * Data provider for testSave method + * + * @return array + */ + public function getSaveDataProvider() + { + return [ + [null, true, true], + [1, true, true], + [1, true, false], + [1, false, true], + [1, false, false], + ]; + } + + /** + * Prepare resource mock object + * + * @return \Magento\Framework\App\Resource|\PHPUnit_Framework_MockObject_MockObject + */ + protected function prepareResource() + { + $dbSelect = $this->getMock('Magento\Framework\DB\Select', [], [], '', false); + $dbSelect->expects($this->any())->method('from')->willReturnSelf(); + $dbSelect->expects($this->any())->method('where')->willReturnSelf(); + + $dbAdapter = $this->getMock('Magento\Framework\DB\Adapter\Pdo\Mysql', [], [], '', false); + $dbAdapter->expects($this->any()) + ->method('describeTable') + ->with('customer_address_entity') + ->willReturn( + [ + 'entity_type_id', + 'attribute_set_id', + 'created_at', + 'updated_at', + 'parent_id', + 'increment_id', + 'entity_id' + ] + ); + $dbAdapter->expects($this->any())->method('lastInsertId'); + $dbAdapter->expects($this->any())->method('select')->willReturn($dbSelect); + + $resource = $this->getMock('Magento\Framework\App\Resource', [], [], '', false); + $resource->expects($this->any())->method('getConnection')->will($this->returnValue($dbAdapter)); + $resource->expects($this->any())->method('getTableName')->will($this->returnValue('customer_address_entity')); + + return $resource; + } + + /** + * Prepare Eav config mock object + * + * @return \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject + */ + protected function prepareEavConfig() + { + $attributeMock = $this->getMock( + 'Magento\Eav\Model\Entity\Attribute\AbstractAttribute', + ['getAttributeCode', 'getBackend', '__wakeup'], + [], + '', + false + ); + $attributeMock->expects($this->any()) + ->method('getAttributeCode') + ->willReturn('entity_id'); + $attributeMock->expects($this->any()) + ->method('getBackend') + ->willReturn( + $this->getMock( + 'Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend', [], [], '', false + ) + ); + + $eavConfigType = $this->getMock( + 'Magento\Eav\Model\Entity\Type', + ['getEntityIdField', 'getId', 'getEntityTable', '__wakeup'], + [], + '', + false + ); + $eavConfigType->expects($this->any())->method('getEntityIdField')->willReturn(false); + $eavConfigType->expects($this->any())->method('getId')->willReturn(false); + $eavConfigType->expects($this->any())->method('getEntityTable')->willReturn('customer_address_entity'); + + $eavConfig = $this->getMock( + 'Magento\Eav\Model\Config', + ['getEntityType', 'getEntityAttributeCodes', 'getAttribute'], + [], + '', + false + ); + $eavConfig->expects($this->any()) + ->method('getEntityType') + ->with('customer_address') + ->willReturn($eavConfigType); + $eavConfig->expects($this->any()) + ->method('getEntityAttributeCodes') + ->with($eavConfigType) + ->willReturn( + [ + 'entity_type_id', + 'attribute_set_id', + 'created_at', + 'updated_at', + 'parent_id', + 'increment_id', + 'entity_id' + ] + ); + $eavConfig->expects($this->any()) + ->method('getAttribute') + ->willReturnMap([ + [$eavConfigType, 'entity_type_id', $attributeMock], + [$eavConfigType, 'attribute_set_id', $attributeMock], + [$eavConfigType, 'created_at', $attributeMock], + [$eavConfigType, 'updated_at', $attributeMock], + [$eavConfigType, 'parent_id', $attributeMock], + [$eavConfigType, 'increment_id', $attributeMock], + [$eavConfigType, 'entity_id', $attributeMock], + ]); + + return $eavConfig; + } + + /** + * Prepare validator mock object + * + * @return \Magento\Core\Model\Validator\Factory|\PHPUnit_Framework_MockObject_MockObject + */ + protected function prepareValidatorFactory() + { + $validatorMock = $this->getMock('Magento\Framework\Validator', ['isValid'], [], '', false); + $validatorMock->expects($this->any()) + ->method('isValid') + ->willReturn(true); + + $validatorFactory = $this->getMock( + 'Magento\Core\Model\Validator\Factory', + ['createValidator'], + [], + '', + false + ); + $validatorFactory->expects($this->any()) + ->method('createValidator') + ->with('customer_address', 'save') + ->willReturn($validatorMock); + + return $validatorFactory; + } + + protected function prepareCustomerFactory() + { + $this->customerFactory = $this->getMock('Magento\Customer\Model\CustomerFactory', ['create'], [], '', false); + return $this->customerFactory; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php new file mode 100644 index 0000000000000000000000000000000000000000..a14abe61dcc04a85611195b4b8573bb4e4dd57f6 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php @@ -0,0 +1,199 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Framework\App\Cache; + +class ManagerAppTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $cacheTypeList; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $cacheState; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $response; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $frontendPool; + + protected function setUp() + { + $this->cacheTypeList = $this->getMockForAbstractClass('Magento\Framework\App\Cache\TypeListInterface'); + $this->cacheState = $this->getMockForAbstractClass('Magento\Framework\App\Cache\StateInterface'); + $this->response = $this->getMock('Magento\Framework\App\Console\Response', [], [], '', false); + $this->frontendPool = $this->getMock('Magento\Framework\App\Cache\Type\FrontendPool', [], [], '', false); + } + + public function testEmptyRequest() + { + $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn(['foo' => '', 'bar' => '']); + $this->cacheState->expects($this->never())->method('setEnabled'); + $this->cacheState->expects($this->never())->method('persist'); + $this->frontendPool->expects($this->never())->method('get'); + $model = $this->createModel([]); + $model->launch(); + } + + /** + * Test setting all cache types to true + * + * In this fixture, there are 2 of 3 cache types disabled, but will be enabled + * so persist() should be invoked once, then clean() for each of those which changed + */ + public function testSetAllTrue() + { + $this->prepareCachesFixture(); + $this->cacheState->expects($this->exactly(2)) + ->method('setEnabled') + ->will($this->returnValueMap([['bar', true], ['baz', true]])); + $this->cacheState->expects($this->once())->method('persist'); + // pretend that all cache types use the same frontend + $frontend = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface'); + $this->frontendPool->expects($this->exactly(2))->method('get')->will($this->returnValueMap([ + ['bar', $frontend], + ['baz', $frontend], + ])); + $frontend->expects($this->exactly(2))->method('clean'); + $model = $this->createModel([ManagerApp::KEY_SET => '1']); + $this->assertSame($this->response, $model->launch()); + } + + /** + * Test setting all cache types to true + * + * Fixture is the same as in previous test, but here the intent to disable all of them. + * Since only one of them is enabled, the setter should be invoked only once. + * Also the operation of deactivating cache does not need cleanup (it is relevant when you enable it). + */ + public function testSetAllFalse() + { + $this->prepareCachesFixture(); + $this->cacheState->expects($this->once())->method('setEnabled')->with('foo', false); + $this->cacheState->expects($this->once())->method('persist'); + $this->frontendPool->expects($this->never())->method('get'); + $model = $this->createModel([ManagerApp::KEY_SET => '0']); + $model->launch(); + } + + /** + * Test setting certain cache types to true + * + * In the fixture, one of them is currently true and another false + * So only one of them will be changed (and cleaned up) + */ + public function testSetTwoTrue() + { + $this->prepareCachesFixture(2, [['foo', true], ['baz', false]]); + $this->cacheState->expects($this->once())->method('setEnabled')->with('baz', true); + $this->cacheState->expects($this->once())->method('persist'); + $frontend = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface'); + $this->frontendPool->expects($this->once())->method('get')->with('baz')->willReturn($frontend); + $frontend->expects($this->once())->method('clean'); + $model = $this->createModel([ManagerApp::KEY_SET => '1', ManagerApp::KEY_TYPES => 'foo,baz']); + $model->launch(); + } + + /** + * A fixture for testing setting enabled/disabled + * + * @param int $qty + * @param array $map + * @return void + */ + private function prepareCachesFixture($qty = 3, $map = [['foo', true], ['bar', false], ['baz', false]]) + { + $typeList = ['foo' => '', 'bar' => '', 'baz' => '']; + $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($typeList); + $this->cacheState->expects($this->exactly($qty))->method('isEnabled')->will($this->returnValueMap($map)); + } + + /** + * Test flushing all cache types + * + * Emulates situation when some cache frontends reuse the same backend + * Asserts that the flush is invoked is only once per affected storage + */ + public function testFlushAll() + { + $typeList = ['foo' => '', 'bar' => '', 'baz' => '']; + $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($typeList); + $frontendFoo = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface'); + $frontendBar = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface'); + $frontendBaz = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface'); + $this->frontendPool->expects($this->exactly(3))->method('get')->will($this->returnValueMap([ + ['foo', $frontendFoo], + ['bar', $frontendBar], + ['baz', $frontendBaz], + ])); + $backendOne = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface'); + $backendTwo = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface'); + $frontendFoo->expects($this->once())->method('getBackend')->willReturn($backendOne); + $frontendBar->expects($this->once())->method('getBackend')->willReturn($backendOne); + $frontendBaz->expects($this->once())->method('getBackend')->willReturn($backendTwo); + $backendOne->expects($this->once())->method('clean'); + $backendTwo->expects($this->once())->method('clean'); + $model = $this->createModel([ManagerApp::KEY_FLUSH => '']); + $model->launch(); + } + + public function testGetStatusSummary() + { + $types = [ + ['id' => 'foo', 'status' => true], + ['id' => 'bar', 'status' => false], + ]; + $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($types); + $model = $this->createModel([]); + $this->assertSame(['foo' => true, 'bar' => false], $model->getStatusSummary()); + } + + public function testCatchException() + { + $model = $this->createModel([]); + $this->assertFalse($model->catchException( + $this->getMock('Magento\Framework\App\Bootstrap', [], [], '', false), + new \Exception + )); + } + + /** + * Creates the model with mocked dependencies + * + * @param array $request + * @return ManagerApp + */ + private function createModel($request) + { + return new ManagerApp($this->cacheTypeList, $this->cacheState, $this->response, $this->frontendPool, $request); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Autoload/IncludePathTest.php b/dev/tests/unit/testsuite/Magento/Framework/Autoload/IncludePathTest.php index 6ff364f46ada6940d13d5e4d667bef3473d835be..3e120e7efebfcc66edfdbe641de3babf3a15d267 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Autoload/IncludePathTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Autoload/IncludePathTest.php @@ -114,4 +114,15 @@ class IncludePathTest extends \PHPUnit_Framework_TestCase $this->assertFalse(class_exists($class, false)); } } + + public function testGetFilePath() + { + $original = '\Magento\Framework\ObjectManager\Factory\Factory'; + $result = 'Magento/Framework/ObjectManager/Factory/Factory.php'; + $this->assertEquals((new \Magento\Framework\Autoload\IncludePath())->getFilePath($original), $result); + + $original = 'Zend_Acl_Role_Registry_Exception'; + $result = 'Zend/Acl/Role/Registry/Exception.php'; + $this->assertEquals((new \Magento\Framework\Autoload\IncludePath())->getFilePath($original), $result); + } } diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index 11d63cf587545b5344ffabd45a0a9e0fa6d64a49..197d4ef7e42f7419f93e259e3482d042710b264e 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -24,8 +24,12 @@ namespace Magento\Framework\Search\Adapter\Mysql; -use Magento\Framework\App\Resource\Config; use Magento\Framework\App\Resource; +use Magento\Framework\App\Resource\Config; +use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container as AggregationContainer; +use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer; +use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface; +use Magento\Framework\Search\Request\BucketInterface; use Magento\TestFramework\Helper\ObjectManager; class AdapterTest extends \PHPUnit_Framework_TestCase @@ -71,12 +75,22 @@ class AdapterTest extends \PHPUnit_Framework_TestCase */ private $resource; + /** + * @var BucketInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $bucket; + + /** + * @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder|\PHPUnit_Framework_MockObject_MockObject + */ + private $aggregatioBuilder; + protected function setUp() { $this->objectManager = new ObjectManager($this); $this->request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') - ->setMethods([]) + ->setMethods(['getAggregation']) ->disableOriginalConstructor() ->getMockForAbstractClass(); @@ -92,7 +106,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase ->setMethods(['fetchAssoc']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $this->resource->expects($this->once()) + $this->resource->expects($this->any()) ->method('getConnection') ->with(Resource::DEFAULT_READ_RESOURCE) ->will($this->returnValue($this->connectionAdapter)); @@ -107,12 +121,23 @@ class AdapterTest extends \PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); + $this->aggregatioBuilder = $this->getMockBuilder('Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder') + ->setMethods(['build']) + ->disableOriginalConstructor() + ->getMock(); + + $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->setMethods(['getType', 'getName']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $this->adapter = $this->objectManager->getObject( '\Magento\Framework\Search\Adapter\Mysql\Adapter', [ 'mapper' => $this->mapper, 'responseFactory' => $this->responseFactory, 'resource' => $this->resource, + 'aggregationBuilder' => $this->aggregatioBuilder ] ); } @@ -121,13 +146,20 @@ class AdapterTest extends \PHPUnit_Framework_TestCase { $selectResult = [ 'documents' => [ - 'id' => 1, - 'sku' => 'Product' + [ + 'product_id' => 1, + 'sku' => 'Product' + ] ], - 'aggregations' => [] + 'aggregations' => [ + 'aggregation_name' => [ + 'aggregation1' => [1, 3], + 'aggregation2' => [2, 4] + ] + ] ]; - $this->connectionAdapter->expects($this->once()) + $this->connectionAdapter->expects($this->at(0)) ->method('fetchAssoc') ->will($this->returnValue($selectResult['documents'])); $this->mapper->expects($this->once()) @@ -138,6 +170,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase ->method('create') ->with($selectResult) ->will($this->returnArgument(0)); + $this->aggregatioBuilder->expects($this->once())->method('build')->willReturn($selectResult['aggregations']); $response = $this->adapter->query($this->request); $this->assertEquals($selectResult, $response); } diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/ContainerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/ContainerTest.php new file mode 100644 index 0000000000000000000000000000000000000000..59b2fc9c0baff87b2199b4a2c31a6c6f10c5c1cc --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/ContainerTest.php @@ -0,0 +1,51 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\TestFramework\Helper\ObjectManager; + +class ContainerTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var ObjectManager + */ + private $objectManager; + + protected function setUp() + { + $this->objectManager = new ObjectManager($this); + } + + public function testGet() + { + $bucketName = 'providerName'; + $bucketValue = 'dataProvider'; + /** @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container $provider */ + $provider = $this->objectManager->getObject( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container', + ['buckets' => [$bucketName => $bucketValue]] + ); + $this->assertEquals($bucketValue, $provider->get($bucketName)); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/MetricsTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/MetricsTest.php new file mode 100644 index 0000000000000000000000000000000000000000..a116f1e6216a0ed38389e6f9173bf913abc719c4 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/MetricsTest.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\TestFramework\Helper\ObjectManager; +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; + +class MetricsTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Metrics + */ + private $metrics; + + /** + * @var RequestBucketInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $requestBucket; + + /** + * @var \Magento\Framework\Search\Request\Aggregation\Metric|\PHPUnit_Framework_MockObject_MockObject + */ + private $metric; + + protected function setUp() + { + $helper = new ObjectManager($this); + + $this->requestBucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->setMethods(['getMetrics']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->metric = $this->getMockBuilder('Magento\Framework\Search\Request\Aggregation\Metric') + ->setMethods(['getType']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->metrics = $helper->getObject('Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Metrics'); + } + + public function testBuild() + { + $expectedResult = ['count' => 'count(main_table.value)']; + $this->requestBucket->expects($this->once())->method('getMetrics')->willReturn([$this->metric]); + $this->metric->expects($this->once())->method('getType')->willReturn('count'); + $metrics = $this->metrics->build($this->requestBucket); + + $this->assertEquals($expectedResult, $metrics); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/RangeTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/RangeTest.php new file mode 100644 index 0000000000000000000000000000000000000000..a40a34e2b76da91d459b29d6290ca8d31f6798db --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/RangeTest.php @@ -0,0 +1,128 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\TestFramework\Helper\ObjectManager; + +class RangeTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var Metrics|\PHPUnit_Framework_MockObject_MockObject + */ + private $metricsBuilder; + + /** + * @var \Magento\Framework\App\Resource|\PHPUnit_Framework_MockObject_MockObject + */ + private $resource; + + /** + * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $adapter; + + /** + * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject + */ + private $select; + + /** + * @var \Magento\Framework\Search\Request\BucketInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $bucket; + + /** + * @var \Magento\Framework\Search\Request\Aggregation\Range|\PHPUnit_Framework_MockObject_MockObject + */ + private $range; + + /** + * @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Range + */ + private $builder; + + protected function setUp() + { + $helper = new ObjectManager($this); + + $this->metricsBuilder = $this->getMockBuilder( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Metrics' + ) + ->setMethods(['build']) + ->disableOriginalConstructor() + ->getMock(); + + $this->select = $this->getMockBuilder('Magento\Framework\DB\Select') + ->disableOriginalConstructor() + ->getMock(); + + $this->adapter = $this->getMockBuilder('Magento\Framework\DB\Adapter\AdapterInterface') + ->setMethods(['fetchAssoc', 'select', 'getCaseSql']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $this->adapter->expects($this->any())->method('select')->willReturn($this->select); + + $this->resource = $this->getMockBuilder('Magento\Framework\App\Resource') + ->setMethods(['getConnection']) + ->disableOriginalConstructor() + ->getMock(); + $this->resource->expects($this->any())->method('getConnection')->willReturn($this->adapter); + + $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->setMethods(['getName', 'getRanges']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->range = $this->getMockBuilder('Magento\Framework\Search\Request\Aggregation\Range') + ->setMethods(['getFrom', 'getTo']) + ->disableOriginalConstructor() + ->getMock(); + + $this->builder = $helper->getObject( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Range', + ['metricsBuilder' => $this->metricsBuilder, 'resource' => $this->resource] + ); + } + + public function testBuild() + { + $this->metricsBuilder->expects($this->once())->method('build')->willReturn(['metrics']); + $this->bucket->expects($this->once())->method('getRanges')->willReturn( + [$this->range, $this->range, $this->range] + ); + $this->range->expects($this->at(0))->method('getFrom')->willReturn(''); + $this->range->expects($this->at(1))->method('getTo')->willReturn(50); + $this->range->expects($this->at(2))->method('getFrom')->willReturn(50); + $this->range->expects($this->at(3))->method('getTo')->willReturn(100); + $this->range->expects($this->at(4))->method('getFrom')->willReturn(100); + $this->range->expects($this->at(5))->method('getTo')->willReturn(''); + $this->adapter->expects($this->once())->method('getCaseSql')->withConsecutive( + [''], + [['`value` < 50' => "'*_50'", '`value` BETWEEN 50 AND 100' => "'50_100'", '`value` >= 100' => "'100_*'"]] + ); + + $result = $this->builder->build($this->select, $this->bucket, [1, 2, 3]); + $this->assertInstanceOf('Magento\Framework\DB\Select', $result); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/TermTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/TermTest.php new file mode 100644 index 0000000000000000000000000000000000000000..401ac7b829160ea4181b5760ca70ffbd5df1af25 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/TermTest.php @@ -0,0 +1,94 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; +use Magento\TestFramework\Helper\ObjectManager; + +class TermTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var Term + */ + private $term; + + /** + * @var Metrics|\PHPUnit_Framework_MockObject_MockObject + */ + private $metricsBuilder; + + /** + * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject + */ + private $select; + + /** + * @var RequestBucketInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $bucket; + + protected function setUp() + { + $helper = new ObjectManager($this); + + $this->metricsBuilder = $this->getMockBuilder( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Metrics' + ) + ->setMethods(['build']) + ->disableOriginalConstructor() + ->getMock(); + + $this->select = $this->getMockBuilder('Magento\Framework\DB\Select') + ->setMethods(['where', 'columns', 'group']) + ->disableOriginalConstructor() + ->getMock(); + + $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->term = $helper->getObject( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Term', + ['metricsBuilder' => $this->metricsBuilder] + ); + } + + public function testBuild() + { + $productIds = [1, 2, 3]; + $metrics = ['count' => 'count(*)']; + + $this->select->expects($this->once())->method('where')->withConsecutive( + ['main_table.entity_id IN (?)', $productIds] + ); + $this->select->expects($this->once())->method('columns')->withConsecutive([$metrics]); + $this->select->expects($this->once())->method('group')->withConsecutive(['value']); + + $this->metricsBuilder->expects($this->once())->method('build')->willReturn($metrics); + + $result = $this->term->build($this->select, $this->bucket, $productIds); + + $this->assertEquals($this->select, $result); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/BuilderTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/BuilderTest.php new file mode 100644 index 0000000000000000000000000000000000000000..4bbd81c7caf4d73e6f88b5a8f84068af523e5805 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/BuilderTest.php @@ -0,0 +1,181 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation; + +use Magento\TestFramework\Helper\ObjectManager; + +class BuilderTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Framework\Search\EntityMetadata|\PHPUnit_Framework_MockObject_MockObject + */ + private $entityMetadata; + + /** + * @var \Magento\Framework\App\Resource|\PHPUnit_Framework_MockObject_MockObject + */ + private $resource; + + /** + * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $adapter; + + /** + * @var \Magento\Framework\Search\RequestInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $request; + + /** + * @var \Magento\Framework\Search\Request\BucketInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $bucket; + + /** + * @var DataProviderContainer|\PHPUnit_Framework_MockObject_MockObject + */ + private $dataProviderContainer; + + /** + * @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $dataProvider; + + /** + * @var Builder\Container|\PHPUnit_Framework_MockObject_MockObject + */ + private $aggregationContainer; + + /** + * @var Builder\BucketInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $bucketBuilder; + + /** + * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject + */ + private $select; + + /** + * @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder + */ + private $builder; + + protected function setUp() + { + $helper = new ObjectManager($this); + + $this->entityMetadata = $this->getMockBuilder('Magento\Framework\Search\EntityMetadata') + ->setMethods(['getEntityId']) + ->disableOriginalConstructor() + ->getMock(); + + $this->request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + ->setMethods(['getAggregation']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->setMethods(['getName']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->select = $this->getMockBuilder('Magento\Framework\DB\Select') + ->disableOriginalConstructor() + ->getMock(); + + $this->bucketBuilder = $this->getMockBuilder( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\BucketInterface' + ) + ->setMethods(['build']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->aggregationContainer = $this->getMockBuilder( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container' + ) + ->setMethods(['get']) + ->disableOriginalConstructor() + ->getMock(); + $this->aggregationContainer->expects($this->any())->method('get')->willReturn($this->bucketBuilder); + + $this->adapter = $this->getMockBuilder('Magento\Framework\DB\Adapter\AdapterInterface') + ->setMethods(['fetchAssoc']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->dataProvider = $this->getMockBuilder( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface' + ) + ->setMethods(['getDataSet']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->dataProviderContainer = $this->getMockBuilder( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer' + ) + ->setMethods(['get']) + ->disableOriginalConstructor() + ->getMock(); + $this->dataProviderContainer->expects($this->any())->method('get')->willReturn($this->dataProvider); + + $this->resource = $this->getMockBuilder('Magento\Framework\App\Resource') + ->setMethods(['getConnection']) + ->disableOriginalConstructor() + ->getMock(); + $this->resource->expects($this->once())->method('getConnection')->willReturn($this->adapter); + + $this->builder = $helper->getObject( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder', + [ + 'entityMetadata' => $this->entityMetadata, + 'dataProviderContainer' => $this->dataProviderContainer, + 'resource' => $this->resource, + 'aggregationContainer' => $this->aggregationContainer + ] + ); + } + + public function testBuild() + { + $fetchResult = ['name' => ['some', 'result']]; + $documents = [ + [ + 'product_id' => 1, + 'sku' => 'Product' + ] + ]; + + $this->bucket->expects($this->once())->method('getName')->willReturn('name'); + $this->dataProvider->expects($this->once())->method('getDataSet')->willReturn($this->select); + $this->entityMetadata->expects($this->once())->method('getEntityId')->willReturn('product_id'); + $this->adapter->expects($this->once())->method('fetchAssoc')->willReturn($fetchResult['name']); + $this->request->expects($this->once())->method('getAggregation')->willReturn([$this->bucket]); + $this->bucketBuilder->expects($this->once())->method('build')->willReturn($this->select); + + $result = $this->builder->build($this->request, $documents); + + $this->assertEquals($result, $fetchResult); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainerTest.php new file mode 100644 index 0000000000000000000000000000000000000000..533173fde4958532e189b6bcbc8111fb756f2be0 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainerTest.php @@ -0,0 +1,51 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation; + +use Magento\TestFramework\Helper\ObjectManager; + +class DataProviderContainerTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var ObjectManager + */ + private $objectManager; + + protected function setUp() + { + $this->objectManager = new ObjectManager($this); + } + + public function testGet() + { + $bucketName = 'providerName'; + $bucketValue = 'dataProvider'; + /** @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer $provider */ + $provider = $this->objectManager->getObject( + 'Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer', + ['dataProviders' => [$bucketName => $bucketValue]] + ); + $this->assertEquals($bucketValue, $provider->get($bucketName)); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php index 272bc41b340702e91acf7e06e8b8bf4d4c408986..d3babccbaa80b7aa18cb523403ff94ca3d197a37 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php @@ -94,7 +94,7 @@ class ResponseFactoryTest extends \PHPUnit_Framework_TestCase $this->objectManager->expects($this->once())->method('create') ->with( - $this->equalTo('\Magento\Framework\Search\QueryResponse'), + $this->equalTo('\Magento\Framework\Search\Response\QueryResponse'), $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => null]) ) ->will($this->returnValue('QueryResponseObject')); diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/BuilderTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/BuilderTest.php index cd13b6cff5a5e719055d45cb0ced97d35909740f..2671a55431c6f53c0e3286425192db7a91c05779 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/BuilderTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/BuilderTest.php @@ -106,6 +106,14 @@ class BuilderTest extends \PHPUnit_Framework_TestCase ); } + /** + * @expectedException \InvalidArgumentException + */ + public function testCreateInvalidArgumentExceptionNotDefined() + { + $this->requestBuilder->create(); + } + /** * @expectedException \InvalidArgumentException * @expectedExceptionMessage Request name 'rn' doesn't exist. diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/AggregationTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Response/AggregationTest.php similarity index 61% rename from dev/tests/unit/testsuite/Magento/Framework/Search/AggregationTest.php rename to dev/tests/unit/testsuite/Magento/Framework/Search/Response/AggregationTest.php index 9e911c43a10735b5910cc7c678f6e4c3d10fbb8f..ced7e8ff48fd32bb081b95615864fd9780c983e4 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/AggregationTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Response/AggregationTest.php @@ -21,14 +21,14 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Framework\Search; +namespace Magento\Framework\Search\Response; use Magento\TestFramework\Helper\ObjectManager; class AggregationTest extends \PHPUnit_Framework_TestCase { /** - * @var \Magento\Framework\Search\Aggregation |\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Search\Response\Aggregation |\PHPUnit_Framework_MockObject_MockObject */ private $aggregation; @@ -37,18 +37,16 @@ class AggregationTest extends \PHPUnit_Framework_TestCase $helper = new ObjectManager($this); $buckets = []; - for ($count = 0; $count < 5; $count++) { - $bucket = $this->getMockBuilder('Magento\Framework\Search\Bucket') - ->disableOriginalConstructor() - ->getMock(); + $bucket = $this->getMockBuilder('Magento\Framework\Search\Response\Bucket') + ->disableOriginalConstructor() + ->getMock(); - $bucket->expects($this->any())->method('getName')->will($this->returnValue("$count")); - $bucket->expects($this->any())->method('getValue')->will($this->returnValue($count)); - $buckets[] = $bucket; - } + $bucket->expects($this->any())->method('getName')->will($this->returnValue('1')); + $bucket->expects($this->any())->method('getValues')->will($this->returnValue(1)); + $buckets[1] = $bucket; $this->aggregation = $helper->getObject( - '\Magento\Framework\Search\Aggregation', + 'Magento\Framework\Search\Response\Aggregation', [ 'buckets' => $buckets, ] @@ -57,11 +55,9 @@ class AggregationTest extends \PHPUnit_Framework_TestCase public function testGetIterator() { - $count = 0; foreach ($this->aggregation as $bucket) { - $this->assertEquals($bucket->getName(), "$count"); - $this->assertEquals($bucket->getValue(), $count); - $count++; + $this->assertEquals($bucket->getName(), "1"); + $this->assertEquals($bucket->getValues(), 1); } } @@ -69,14 +65,14 @@ class AggregationTest extends \PHPUnit_Framework_TestCase { $this->assertEquals( $this->aggregation->getBucketNames(), - ['0', '1', '2', '3', '4'] + ['1'] ); } public function testGetBucket() { - $bucket = $this->aggregation->getBucket('3'); - $this->assertEquals($bucket->getName(), '3'); - $this->assertEquals($bucket->getValue(), 3); + $bucket = $this->aggregation->getBucket('1'); + $this->assertEquals($bucket->getName(), '1'); + $this->assertEquals($bucket->getValues(), 1); } } diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/QueryResponseTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Response/QueryResponseTest.php similarity index 85% rename from dev/tests/unit/testsuite/Magento/Framework/Search/QueryResponseTest.php rename to dev/tests/unit/testsuite/Magento/Framework/Search/Response/QueryResponseTest.php index f88a20bc67e58b3e6389e3968d42958058711a64..6ceaa803ad4ff1d9ceb56f9713b624f9374b405a 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/QueryResponseTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Response/QueryResponseTest.php @@ -21,7 +21,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Framework\Search; +namespace Magento\Framework\Search\Response; use Magento\TestFramework\Helper\ObjectManager; @@ -33,12 +33,12 @@ class QueryResponseTest extends \PHPUnit_Framework_TestCase private $documents = []; /** - * @var \Magento\Framework\Search\Aggregation + * @var \Magento\Framework\Search\Response\Aggregation */ private $aggregations = []; /** - * @var \Magento\Framework\Search\QueryResponse | \PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Search\Response\QueryResponse | \PHPUnit_Framework_MockObject_MockObject */ private $queryResponse; @@ -55,12 +55,12 @@ class QueryResponseTest extends \PHPUnit_Framework_TestCase $this->documents[] = $document; } - $this->aggregations = $this->getMockBuilder('Magento\Framework\Search\Aggregation') + $this->aggregations = $this->getMockBuilder('Magento\Framework\Search\Response\Aggregation') ->disableOriginalConstructor() ->getMock(); $this->queryResponse = $helper->getObject( - 'Magento\Framework\Search\QueryResponse', + 'Magento\Framework\Search\Response\QueryResponse', [ 'documents' => $this->documents, 'aggregations' => $this->aggregations, @@ -85,6 +85,6 @@ class QueryResponseTest extends \PHPUnit_Framework_TestCase public function testGetAggregations() { $aggregations = $this->queryResponse->getAggregations(); - $this->assertInstanceOf('Magento\Framework\Search\Aggregation', $aggregations); + $this->assertInstanceOf('Magento\Framework\Search\Response\Aggregation', $aggregations); } } diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php index b93f8e87cd10b1405a23e0b842aaf5fcb1f62c36..a4fafc8e98f3b80c3274887efd64d9a64ca70f51 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php @@ -264,7 +264,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase 'themeModel' => $defaultTheme, 'locale' => 'locale', ); - $this->design->expects($this->once())->method('getDesignParams')->will($this->returnValue($defaults)); + $this->design->expects($this->atLeastOnce())->method('getDesignParams')->will($this->returnValue($defaults)); $this->design->expects($this->once()) ->method('getConfigurationDesignTheme') ->with('custom_area') diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_body.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_body.xml index a6eb7c93f8a50b1bf5e385caa57a35bedf79d190..adea8dae4ed09fe52752ed2f0fa3c125378c6647 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_body.xml +++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_body.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <body> <attribute name="body_attribute_name" value="body_attribute_value" /> </body> diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_head.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_head.xml index d5aeeba16e4cf647c430c77c0e0a6b779d401b3c..2dee8c519306947543c1391a0af679493dc98a11 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_head.xml +++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_head.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <head> <title>Test title</title> <meta name="meta_name" content="meta_content"/> diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_html.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_html.xml index 0561c11140b132e5db222e21b30a8ab55dac971b..aab0f4539edcc07eb0e758d0ebdcf0639ac1fbf5 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_html.xml +++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/_files/template_html.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Core/etc/page.xsd"> +<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <html> <attribute name="html_attribute_name" value="html_attribute_value" /> </html> diff --git a/dev/tests/unit/testsuite/Magento/Install/Block/BeginTest.php b/dev/tests/unit/testsuite/Magento/Install/Block/BeginTest.php deleted file mode 100644 index c4ca9c0073a21ebc101ea0cdb90b822cf9e3a2b9..0000000000000000000000000000000000000000 --- a/dev/tests/unit/testsuite/Magento/Install/Block/BeginTest.php +++ /dev/null @@ -1,114 +0,0 @@ -<?php -/** - * Magento - * - * NOTICE OF LICENSE - * - * This source file is subject to the Open Software License (OSL 3.0) - * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magentocommerce.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade Magento to newer - * versions in the future. If you wish to customize Magento for your - * needs please refer to http://www.magentocommerce.com for more information. - * - * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Test class for \Magento\Install\Block\Begin - */ -namespace Magento\Install\Block; - -class BeginTest extends \PHPUnit_Framework_TestCase -{ - /** - * @var \Magento\TestFramework\Helper\ObjectManager - */ - protected $_objectManager; - - protected function setUp() - { - $this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - } - - /** - * @dataProvider getLicenseHtmlWhenFileExistsDataProvider - * - * @param $fileName - * @param $expectedTxt - */ - public function testGetLicenseHtmlWhenFileExists($fileName, $expectedTxt) - { - $directoryMock = $this->getMock('Magento\Framework\Filesystem\Directory\Read', array(), array(), '', false); - $directoryMock->expects( - $this->once() - )->method( - 'readFile' - )->with( - $this->equalTo($fileName) - )->will( - $this->returnValue($expectedTxt) - ); - - $fileSystem = $this->getMock('Magento\Framework\App\Filesystem', array(), array(), '', false); - $fileSystem->expects($this->once())->method('getDirectoryRead')->will($this->returnValue($directoryMock)); - - $block = $this->_objectManager->getObject( - 'Magento\Install\Block\Begin', - array('filesystem' => $fileSystem, 'eulaFile' => $fileName) - ); - - $this->assertEquals($expectedTxt, $block->getLicenseHtml()); - } - - /** - * Test for getLicenseHtml when EULA file name is empty - * - * @dataProvider getLicenseHtmlWhenFileIsEmptyDataProvider - * - * @param $fileName - */ - public function testGetLicenseHtmlWhenFileIsEmpty($fileName) - { - $fileSystem = $this->getMock('Magento\Framework\App\Filesystem', array(), array(), '', false); - $fileSystem->expects($this->never())->method('read'); - - $block = $this->_objectManager->getObject( - 'Magento\Install\Block\Begin', - array('filesystem' => $fileSystem, 'eulaFile' => $fileName) - ); - $this->assertEquals('', $block->getLicenseHtml()); - } - - /** - * Data provider for testGetLicenseHtmlWhenFileExists - * - * @return array - */ - public function getLicenseHtmlWhenFileExistsDataProvider() - { - return array( - 'Lycense for EE' => array('LICENSE_TEST1.html', 'HTML for EE LICENSE'), - 'Lycense for CE' => array('LICENSE_TEST2.html', 'HTML for CE LICENSE'), - 'empty file' => array('LICENSE_TEST3.html', '') - ); - } - - /** - * Data provider for testGetLicenseHtmlWhenFileIsEmpty - * - * @return array - */ - public function getLicenseHtmlWhenFileIsEmptyDataProvider() - { - return array('no filename' => array(null), 'empty filename' => array('')); - } -} diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php index 3f5f3360230e4f95deba6cc5b7412d540801d0be..ea5565936bebdcdf0065c434f78954d0d3bcc90a 100644 --- a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php +++ b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php @@ -80,7 +80,6 @@ class VisitorTest extends \PHPUnit_Framework_TestCase $store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false, false); $this->storeManagerInterface->expects($this->any())->method('getStore')->will($this->returnValue($store)); - $this->dateTime->expects($this->any())->method('now')->will($this->returnValue(time())); $resource = $this->getMockBuilder('Magento\Customer\Model\Resource\Visitor') ->setMethods([ @@ -135,12 +134,15 @@ class VisitorTest extends \PHPUnit_Framework_TestCase public function testGetFirstVisitAt() { + $this->markTestIncomplete('MAGETWO-29131'); $time = time(); + $this->dateTime->expects($this->once())->method('now')->will($this->returnValue($time)); $this->assertEquals($time, $this->visitor->getFirstVisitAt()); } public function testGetLastVisitAt() { + $this->markTestIncomplete('MAGETWO-29131'); $time = time(); $this->dateTime->expects($this->once())->method('now')->will($this->returnValue($time)); $this->assertEquals($time, $this->visitor->getLastVisitAt()); diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/InfoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/InfoTest.php index 6c7027785c5164553b3bcc6ef101d58ccf0e088c..6b25cac1a14be53afa53e1c4e442e9037aa1caa1 100644 --- a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/InfoTest.php +++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/InfoTest.php @@ -23,8 +23,69 @@ */ namespace Magento\Sales\Block\Adminhtml\Order\View; +use Magento\Framework\Exception\NoSuchEntityException; + class InfoTest extends \PHPUnit_Framework_TestCase { + + /** + * @var \Magento\Sales\Block\Adminhtml\Order\View\Info + */ + protected $block; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $authorizationMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $groupServiceMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $coreRegistryMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $orderMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $groupMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $contextMock; + + protected function setUp() + { + $this->contextMock + = $this->getMock('Magento\Backend\Block\Template\Context', ['getAuthorization'], [], '', false); + $this->authorizationMock = $this->getMock('Magento\Framework\AuthorizationInterface', [], [], '', false); + $this->contextMock + ->expects($this->any())->method('getAuthorization')->will($this->returnValue($this->authorizationMock)); + $this->groupServiceMock = $this->getMock('Magento\Customer\Service\V1\CustomerGroupServiceInterface'); + $this->coreRegistryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false); + $methods = ['getCustomerGroupId', '__wakeUp']; + $this->orderMock = $this->getMock('\Magento\Sales\Model\Order', $methods, [], '', false); + $this->groupMock = $this->getMock('Magento\Customer\Service\V1\Data\CustomerGroup', [], [], '', false); + $arguments = [ + 'context' => $this->contextMock, + 'groupService' => $this->groupServiceMock, + 'registry' => $this->coreRegistryMock + ]; + + $helper = new \Magento\TestFramework\Helper\ObjectManager($this); + /** @var \Magento\Sales\Block\Adminhtml\Order\View\Info $block */ + $this->block = $helper->getObject('Magento\Sales\Block\Adminhtml\Order\View\Info', $arguments); + } + public function testGetAddressEditLink() { $contextMock = $this->getMock('Magento\Backend\Block\Template\Context', ['getAuthorization'], [], '', false); @@ -44,4 +105,38 @@ class InfoTest extends \PHPUnit_Framework_TestCase $address = new \Magento\Framework\Object(); $this->assertEmpty($block->getAddressEditLink($address)); } + + public function testGetCustomerGroupNameWhenGroupIsNotExist() + { + $this->coreRegistryMock + ->expects($this->any()) + ->method('registry') + ->with('current_order') + ->will($this->returnValue($this->orderMock)); + $this->orderMock->expects($this->once())->method('getCustomerGroupId')->will($this->returnValue(4)); + $this->groupServiceMock + ->expects($this->once())->method('getGroup')->with(4)->will($this->returnValue($this->groupMock)); + $this->groupMock + ->expects($this->once()) + ->method('getCode') + ->will($this->throwException(new NoSuchEntityException())); + $this->assertEquals('', $this->block->getCustomerGroupName()); + } + + public function testGetCustomerGroupNameWhenGroupExists() + { + $this->coreRegistryMock + ->expects($this->any()) + ->method('registry') + ->with('current_order') + ->will($this->returnValue($this->orderMock)); + $this->orderMock->expects($this->once())->method('getCustomerGroupId')->will($this->returnValue(4)); + $this->groupServiceMock + ->expects($this->once())->method('getGroup')->with(4)->will($this->returnValue($this->groupMock)); + $this->groupMock + ->expects($this->once()) + ->method('getCode') + ->will($this->returnValue('group_code')); + $this->assertEquals('group_code', $this->block->getCustomerGroupName()); + } } diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php new file mode 100644 index 0000000000000000000000000000000000000000..118a9530e95a0fbf141c743d866ac7571e5440f2 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php @@ -0,0 +1,518 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Sales\Model\Order\Creditmemo\Total; + +use \Magento\Framework\Object as MagentoObject; + +class TaxTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Sales\Model\Order\Creditmemo\Total\Tax + */ + protected $model; + + /** + * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject + */ + protected $order; + + /** + * @var \Magento\TestFramework\Helper\ObjectManager + */ + protected $objectManager; + + /** + * @var \Magento\Sales\Model\Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject + */ + protected $creditmemo; + + /** + * @var \Magento\Sales\Model\Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject + */ + protected $invoice; + + public function setUp() + { + $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); + /** @var \Magento\Sales\Model\Order\Creditmemo\Total\Tax $model */ + $this->model = $this->objectManager->getObject('Magento\Sales\Model\Order\Creditmemo\Total\Tax'); + + $this->order = $this->getMock( + '\Magento\Sales\Model\Order', + array( + '__wakeup' + ), + array(), + '', + false + ); + + $this->invoice = $this->getMock( + '\Magento\Sales\Model\Order\Invoice', + array( + '__wakeup', + ), + array(), + '', + false + ); + + $this->creditmemo = $this->getMock( + '\Magento\Sales\Model\Order\Creditmemo', + array( + 'getAllItems', + 'getOrder', + 'roundPrice', + 'isLast', + '__wakeup', + ), + array(), + '', + false + ); + $this->creditmemo->expects($this->atLeastOnce())->method('getOrder')->will($this->returnValue($this->order)); + } + + /** + * @param array $orderData + * @param array $creditmemoData + * @param array $expectedResults + * @dataProvider collectDataProvider + */ + public function testCollect($orderData, $creditmemoData, $expectedResults) + { + $roundingDelta = []; + + //Set up order mock + foreach ($orderData['data_fields'] as $key => $value) { + $this->order->setData($key, $value); + } + + //Set up creditmemo mock + /** @var \Magento\Sales\Model\Order\Creditmemo\Item[] $creditmemoItems */ + $creditmemoItems = []; + foreach ($creditmemoData['items'] as $itemKey => $creditmemoItemData) { + $creditmemoItems[$itemKey] = $this->getCreditmemoItem($creditmemoItemData); + } + $this->creditmemo->expects($this->once()) + ->method('getAllItems') + ->will($this->returnValue($creditmemoItems)); + $this->creditmemo->expects($this->any()) + ->method('isLast') + ->will($this->returnValue($creditmemoData['is_last'])); + foreach ($creditmemoData['data_fields'] as $key => $value) { + $this->creditmemo->setData($key, $value); + } + $this->creditmemo->expects($this->any()) + ->method('roundPrice') + ->will($this->returnCallback( + function ($price, $type, $negative) use (&$roundingDelta) { + if (!isset($roundingDelta[$type])) { + $roundingDelta[$type] = 0; + } + $roundedPrice = round($price + $roundingDelta[$type], 2); + $roundingDelta[$type] = $price - $roundedPrice; + return $roundedPrice; + } + )); + + $this->model->collect($this->creditmemo); + + //verify invoice data + foreach ($expectedResults['creditmemo_data'] as $key => $value) { + $this->assertEquals($value, $this->creditmemo->getData($key)); + } + //verify invoice item data + foreach ($expectedResults['creditmemo_items'] as $itemKey => $itemData) { + $creditmemoItem = $creditmemoItems[$itemKey]; + foreach ($itemData as $key => $value) { + $this->assertEquals($value, $creditmemoItem->getData($key)); + } + } + } + + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @return array + */ + public function collectDataProvider() + { + $result = []; + // scenario 1: 3 item_1, 3 item_2, $99 each, 8.19 tax rate + // 1 item_1 and 2 item_2 are invoiced + $result['partial_invoice_partial_creditmemo'] = [ + 'order_data' => [ + 'data_fields' => [ + 'shipping_tax_amount' => 2.45, + 'base_shipping_tax_amount' => 2.45, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 53.56, + 'base_tax_amount' => 53.56, + 'tax_invoiced' => 24.33, + 'base_tax_invoiced' => 24.33, + 'tax_refunded' => 0, + 'base_tax_refunded' => 0, + 'base_shipping_amount' => 30, + ], + ], + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_invoiced' => 1, + 'tax_invoiced' => 8.11, + 'tax_refunded' => 0, + 'base_tax_invoiced' => 8.11, + 'base_tax_refunded' => 0, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_refunded' => 0, + ], + 'is_last' => false, + 'qty' => 1, + ], + 'item_2' => [ + 'order_item' => [ + 'qty_invoiced' => 2, + 'tax_refunded' => 0, + 'tax_invoiced' => 16.22, + 'base_tax_refunded' => 0, + 'base_tax_invoiced' => 16.22, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_refunded' => 0, + ], + 'is_last' => false, + 'qty' => 1, + ], + ], + 'is_last' => false, + 'data_fields' => [ + 'grand_total' => 198, + 'base_grand_total' => 198, + 'base_shipping_amount' => 30, + 'tax_amount' => 0.82, + 'base_tax_amount' => 0.82, + 'invoice' => new MagentoObject( + [ + 'shipping_tax_amount' => 2.45, + 'base_shipping_tax_amount' => 2.45, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + ] + ), + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'tax_amount' => 8.11, + 'base_tax_amount' => 8.11, + ], + 'item_2' => [ + 'tax_amount' => 8.11, + 'base_tax_amount' => 8.11, + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 216.67, + 'base_grand_total' => 216.67, + 'tax_amount' => 19.49, + 'base_tax_amount' => 19.49, + 'shipping_tax_amount' => 2.45, + 'base_shipping_tax_amount' => 2.45, + ], + ] + ]; + + // scenario 2: 3 items, 2 invoiced, rowtotal of 150 with 8.25 tax rate + // extra tax amount exist (weee tax), make sure that tax amount + // is not over the amount invoiced + $result['tax_amount_not_over_invoiced_tax_amount'] = [ + 'order_data' => [ + 'data_fields' => [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 16.09, + 'base_tax_amount' => 16.09, + 'tax_invoiced' => 11.14, + 'base_tax_invoiced' => 11.14, + 'tax_refunded' => 0, + 'base_tax_refunded' => 0, + 'base_shipping_amount' => 30, + ], + ], + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_invoiced' => 2, + 'tax_invoiced' => 8.26, + 'tax_refunded' => 0, + 'base_tax_invoiced' => 8.26, + 'base_tax_refunded' => 0, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_refunded' => 0, + ], + 'is_last' => false, + 'qty' => 2, + ], + ], + 'is_last' => false, + 'data_fields' => [ + 'grand_total' => 136.65, + 'base_grand_total' => 136.65, + 'base_shipping_amount' => 30, + 'tax_amount' => 1.65, + 'base_tax_amount' => 1.65, + 'invoice' => new MagentoObject( + [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + ] + ), + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'tax_amount' => 8.26, + 'base_tax_amount' => 8.26, + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 146.14, + 'base_grand_total' => 146.14, + 'tax_amount' => 11.14, + 'base_tax_amount' => 11.14, + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + ], + ] + ]; + + // scenario 3: 3 items, 3 invoiced, rowtotal of 150 with 8.25 tax rate + // extra tax amount exist (weee tax), make sure that tax amount + // equals to tax amount invoiced + $result['last_partial_creditmemo'] = [ + 'order_data' => [ + 'data_fields' => [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_tax_refunded' => 1.24, + 'base_shipping_tax_refunded' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 16.09, + 'base_tax_amount' => 16.09, + 'tax_invoiced' => 16.09, + 'base_tax_invoiced' => 16.09, + 'tax_refunded' => 11.14, + 'base_tax_refunded' => 11.14, + 'shipping_amount' => 15, + 'shipping_amount_refunded' => 15, + 'base_shipping_amount' => 15, + 'base_shipping_amount_refunded' => 15, + ], + ], + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_invoiced' => 3, + 'tax_invoiced' => 12.38, + 'tax_refunded' => 8.26, + 'base_tax_invoiced' => 12.38, + 'base_tax_refunded' => 8.26, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_refunded' => 2, + ], + 'is_last' => true, + 'qty' => 1, + ], + ], + 'is_last' => true, + 'data_fields' => [ + 'grand_total' => 60.82, + 'base_grand_total' => 60.82, + 'base_shipping_amount' => 0, + 'tax_amount' => 0.82, + 'base_tax_amount' => 0.82, + 'invoice' => new MagentoObject( + [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + ] + ), + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'tax_amount' => 4.12, + 'base_tax_amount' => 4.12, + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 64.95, + 'base_grand_total' => 64.95, + 'tax_amount' => 4.95, + 'base_tax_amount' => 4.95, + ], + ] + ]; + + // scenario 4: 3 items, 2 invoiced, price includes tax + // partial credit memo, make sure that hidden tax is calculated correctly + $result['partial_invoice_partial_creditmemo_price_incl_tax'] = [ + 'order_data' => [ + 'data_fields' => [ + 'shipping_tax_amount' => 0, + 'base_shipping_tax_amount' => 0, + 'shipping_tax_refunded' => 0, + 'base_shipping_tax_refunded' => 0, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 13.72, + 'base_tax_amount' => 13.72, + 'tax_invoiced' => 9.15, + 'base_tax_invoiced' => 9.15, + 'tax_refunded' => 0, + 'base_tax_refunded' => 0, + 'hidden_tax_amount' => 11.43, + 'base_hidden_tax_amount' => 11.43, + 'hidden_tax_invoiced' => 7.62, + 'base_hidden_tax_invoiced' => 7.62, + 'hidden_tax_refunded' => 0, + 'base_hidden_tax_refunded' => 0, + 'shipping_amount' => 0, + 'shipping_amount_refunded' => 0, + 'base_shipping_amount' => 0, + 'base_shipping_amount_refunded' => 0, + ], + ], + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_invoiced' => 2, + 'tax_invoiced' => 7.62, + 'tax_refunded' => 0, + 'base_tax_invoiced' => 7.62, + 'base_tax_refunded' => 0, + 'hidden_tax_amount' => 11.43, + 'base_hidden_tax_amount' => 11.43, + 'hidden_tax_invoiced' => 7.62, + 'base_hidden_tax_invoiced' => 7.62, + 'qty_refunded' => 0, + ], + 'is_last' => false, + 'qty' => 1, + ], + ], + 'is_last' => false, + 'data_fields' => [ + 'grand_total' => 52.38, + 'base_grand_total' => 52.38, + 'base_shipping_amount' => 0, + 'tax_amount' => 0.76, + 'base_tax_amount' => 0.76, + 'invoice' => new MagentoObject( + [ + 'shipping_tax_amount' => 0, + 'base_shipping_tax_amount' => 0, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + ] + ), + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'tax_amount' => 3.81, + 'base_tax_amount' => 3.81, + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 60, + 'base_grand_total' => 60, + 'tax_amount' => 4.57, + 'base_tax_amount' => 4.57, + ], + ] + ]; + return $result; + } + + /** + * @param $creditmemoItemData array + * @return \Magento\Sales\Model\Order\Creditmemo\Item|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getCreditmemoItem($creditmemoItemData) + { + /** @var \Magento\Sales\Model\Order\Item|\PHPUnit_Framework_MockObject_MockObject $orderItem */ + $orderItem = $this->getMock( + '\Magento\Sales\Model\Order\Item', + array( + 'isDummy', + '__wakeup' + ), + array(), + '', + false + ); + foreach ($creditmemoItemData['order_item'] as $key => $value) { + $orderItem->setData($key, $value); + } + + /** @var \Magento\Sales\Model\Order\Creditmemo\Item|\PHPUnit_Framework_MockObject_MockObject $creditmemoItem */ + $creditmemoItem = $this->getMock( + '\Magento\Sales\Model\Order\Creditmemo\Item', + array( + 'getOrderItem', + 'isLast', + '__wakeup' + ), + array(), + '', + false + ); + $creditmemoItem->expects($this->any())->method('getOrderItem')->will($this->returnValue($orderItem)); + $creditmemoItem->expects($this->any()) + ->method('isLast') + ->will($this->returnValue($creditmemoItemData['is_last'])); + $creditmemoItem->setData('qty', $creditmemoItemData['qty']); + return $creditmemoItem; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/TaxTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/TaxTest.php index 1cbb07c517e26626ccd0e349670f44f33f49a3b2..c689e1167a8b6b10693dbc02bca48732569aa4b2 100644 --- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/TaxTest.php +++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/TaxTest.php @@ -23,123 +23,400 @@ */ namespace Magento\Sales\Model\Order\Invoice\Total; +use \Magento\Framework\Object as MagentoObject; + class TaxTest extends \PHPUnit_Framework_TestCase { - public function testCollect() + /** + * @var \Magento\Sales\Model\Order\Invoice\Total\Tax + */ + protected $model; + + /** + * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject + */ + protected $order; + + /** + * @var \Magento\TestFramework\Helper\ObjectManager + */ + protected $objectManager; + + /** + * @var \Magento\Sales\Model\Order\Invoice|\PHPUnit_Framework_MockObject_MockObject + */ + protected $invoice; + + public function setUp() { - $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); + $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); /** @var \Magento\Sales\Model\Order\Invoice\Total\Tax $model */ - $model = $objectManager->getObject('Magento\Sales\Model\Order\Invoice\Total\Tax'); + $this->model = $this->objectManager->getObject('Magento\Sales\Model\Order\Invoice\Total\Tax'); - $collection = $objectManager - ->getCollectionMock('Magento\Sales\Model\Resource\Order\Invoice\Collection', array()); - - $order = $this->getMock( + $this->order = $this->getMock( '\Magento\Sales\Model\Order', array( 'getInvoiceCollection', - 'getHiddenTaxAmount', - 'getBaseHiddenTaxAmount', '__wakeup' ), array(), '', false ); - $order->expects($this->atLeastOnce())->method('getInvoiceCollection')->will($this->returnValue($collection)); - $order->expects($this->atLeastOnce())->method('getHiddenTaxAmount')->will($this->returnValue(10)); - $order->expects($this->atLeastOnce())->method('getBaseHiddenTaxAmount')->will($this->returnValue(10)); - - $invoiceItems[] = $this->getInvoiceItem(0, 10); - $invoice = $this->getMock( + $this->invoice = $this->getMock( '\Magento\Sales\Model\Order\Invoice', array( 'getAllItems', 'getOrder', - 'getGrandTotal', - 'setGrandTotal', - '__wakeup' + 'roundPrice', + 'isLast', + '__wakeup', ), array(), '', false ); - $invoice->expects($this->atLeastOnce())->method('getAllItems')->will($this->returnValue($invoiceItems)); - $invoice->expects($this->atLeastOnce())->method('getOrder')->will($this->returnValue($order)); - $invoice->expects($this->atLeastOnce())->method('getGrandTotal')->will($this->returnValue(0)); - $invoice - ->expects($this->atLeastOnce()) - ->method('setGrandTotal') - ->with($this->equalTo(10)) - ->will($this->returnSelf()); - - $model->collect($invoice); + $this->invoice->expects($this->atLeastOnce())->method('getOrder')->will($this->returnValue($this->order)); + } + + /** + * @param array $orderData + * @param array $invoiceData + * @param array $expectedResults + * @dataProvider collectDataProvider + */ + public function testCollect($orderData, $invoiceData, $expectedResults) + { + $roundingDelta = []; + + //Set up order mock + foreach ($orderData['data_fields'] as $key => $value) { + $this->order->setData($key, $value); + } + /** @var \Magento\Sales\Model\Order\Invoice[] $previousInvoices */ + $previousInvoices = []; + foreach ($orderData['previous_invoices'] as $previousInvoiceData) { + $previousInvoice = $this->getMockBuilder('\Magento\Sales\Model\Order\Invoice') + ->disableOriginalConstructor() + ->setMethods(['isCanceled', '__wakeup']) + ->getMock(); + $previousInvoice->setData('shipping_amount', $previousInvoiceData['shipping_amount']); + $previousInvoices[] = $previousInvoice; + } + + $this->order->expects($this->once()) + ->method('getInvoiceCollection') + ->will($this->returnValue($previousInvoices)); + + //Set up invoice mock + /** @var \Magento\Sales\Model\Order\Invoice\Item[] $invoiceItems */ + $invoiceItems = []; + foreach ($invoiceData['items'] as $itemKey => $invoiceItemData) { + $invoiceItems[$itemKey] = $this->getInvoiceItem($invoiceItemData); + } + $this->invoice->expects($this->once()) + ->method('getAllItems') + ->will($this->returnValue($invoiceItems)); + $this->invoice->expects($this->once()) + ->method('isLast') + ->will($this->returnValue($invoiceData['is_last'])); + foreach ($invoiceData['data_fields'] as $key => $value) { + $this->invoice->setData($key, $value); + } + $this->invoice->expects($this->any()) + ->method('roundPrice') + ->will($this->returnCallback( + function ($price, $type, $negative) use (&$roundingDelta) { + if (!isset($roundingDelta[$type])) { + $roundingDelta[$type] = 0; + } + $roundedPrice = round($price + $roundingDelta[$type], 2); + $roundingDelta[$type] = $price - $roundedPrice; + return $roundedPrice; + } + )); + + $this->model->collect($this->invoice); + + //verify invoice data + foreach ($expectedResults['invoice_data'] as $key => $value) { + $this->assertEquals($value, $this->invoice->getData($key)); + } + //verify invoice item data + foreach ($expectedResults['invoice_items'] as $itemKey => $itemData) { + $invoiceItem = $invoiceItems[$itemKey]; + foreach ($itemData as $key => $value) { + $this->assertEquals($value, $invoiceItem->getData($key)); + } + } + } + + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @return array + */ + public function collectDataProvider() + { + $result = []; + // 3 item_1, 3 item_2, $99 each, 8.19 tax rate + $result['partial_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + ], + 'data_fields' => [ + 'shipping_tax_amount' => 2.45, + 'base_shipping_tax_amount' => 2.45, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 53.56, + 'base_tax_amount' => 53.56, + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'tax_amount' => 24.32, + 'tax_invoiced' => 0, + 'base_tax_amount' => 24.32, + 'base_tax_invoiced' => 0, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_invoiced' => 0, + ], + 'is_last' => false, + 'qty' => 1, + ], + 'item_2' => [ + 'order_item' => [ + 'qty_ordered' => 3, + 'tax_amount' => 24.33, + 'tax_invoiced' => 0, + 'base_tax_amount' => 24.33, + 'base_tax_invoiced' => 0, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_invoiced' => 0, + ], + 'is_last' => false, + 'qty' => 2, + ], + ], + 'is_last' => false, + 'data_fields' => [ + 'grand_total' => 327, + 'base_grand_total' => 327, + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'tax_amount' => 8.11, + 'base_tax_amount' => 8.11, + ], + 'item_2' => [ + 'tax_amount' => 16.22, + 'base_tax_amount' => 16.22, + ], + ], + 'invoice_data' => [ + 'grand_total' => 353.78, + 'base_grand_total' => 353.78, + 'tax_amount' => 26.78, + 'base_tax_amount' => 26.78, + ], + ] + ]; + + // 3 item_1, 3 item_2, $99 each, 8.19 tax rate + // item_1 has 1 already invoiced, item_2 has 2 already invoiced + $result['partial_invoice_second_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + [ + 'shipping_amount' => 30, + 'is_canceled' => false, + ] + ], + 'data_fields' => [ + 'shipping_tax_amount' => 2.45, + 'base_shipping_tax_amount' => 2.45, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 53.56, + 'base_tax_amount' => 53.56, + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'tax_amount' => 24.32, + 'tax_invoiced' => 8.11, + 'base_tax_amount' => 24.32, + 'base_tax_invoiced' => 8.11, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_invoiced' => 1, + ], + 'is_last' => false, + 'qty' => 1, + ], + 'item_2' => [ + 'order_item' => [ + 'qty_ordered' => 3, + 'tax_amount' => 24.33, + 'tax_invoiced' => 16.22, + 'base_tax_amount' => 24.33, + 'base_tax_invoiced' => 16.22, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_invoiced' => 2, + ], + 'is_last' => false, + 'qty' => 0, + ], + ], + 'is_last' => false, + 'data_fields' => [ + 'grand_total' => 99, + 'base_grand_total' => 99, + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'tax_amount' => 8.11, + 'base_tax_amount' => 8.11, + ], + ], + 'invoice_data' => [ + 'grand_total' => 107.11, + 'base_grand_total' => 107.11, + 'tax_amount' => 8.11, + 'base_tax_amount' => 8.11, + ], + ] + ]; + // 3 item_1, 3 item_2, $99 each, 8.19 tax rate + // item_1 has 1 already invoiced, item_2 has 2 already invoiced + $result['partial_invoice_last_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + [ + 'shipping_amount' => 30, + 'is_canceled' => false, + ] + ], + 'data_fields' => [ + 'shipping_tax_amount' => 2.45, + 'base_shipping_tax_amount' => 2.45, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 53.56, + 'base_tax_amount' => 53.56, + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'tax_amount' => 24.32, + 'tax_invoiced' => 16.22, + 'base_tax_amount' => 24.32, + 'base_tax_invoiced' => 16.22, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_invoiced' => 2, + ], + 'is_last' => true, + 'qty' => 1, + ], + 'item_2' => [ + 'order_item' => [ + 'qty_ordered' => 3, + 'tax_amount' => 24.33, + 'tax_invoiced' => 16.22, + 'base_tax_amount' => 24.33, + 'base_tax_invoiced' => 16.22, + 'hidden_tax_amount' => 0, + 'base_hidden_tax_amount' => 0, + 'qty_invoiced' => 2, + ], + 'is_last' => true, + 'qty' => 1, + ], + ], + 'is_last' => false, + 'data_fields' => [ + 'grand_total' => 198, + 'base_grand_total' => 198, + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'tax_amount' => 8.10, + 'base_tax_amount' => 8.10, + ], + 'item_2' => [ + 'tax_amount' => 8.11, + 'base_tax_amount' => 8.11, + ], + ], + 'invoice_data' => [ + 'grand_total' => 214.21, + 'base_grand_total' => 214.21, + 'tax_amount' => 16.21, + 'base_tax_amount' => 16.21, + ], + ] + ]; + return $result; } /** - * @param $taxAmount - * @param $hiddenTaxAmount + * @param $invoiceItemData array * @return \Magento\Sales\Model\Order\Invoice\Item|\PHPUnit_Framework_MockObject_MockObject */ - protected function getInvoiceItem($taxAmount, $hiddenTaxAmount) + protected function getInvoiceItem($invoiceItemData) { + /** @var \Magento\Sales\Model\Order\Item|\PHPUnit_Framework_MockObject_MockObject $orderItem */ $orderItem = $this->getMock( '\Magento\Sales\Model\Order\Item', array( - 'getQtyOrdered', - 'getTaxAmount', - 'getBaseTaxAmount', - 'getHiddenTaxAmount', - 'getBaseHiddenTaxAmount', + 'isDummy', '__wakeup' ), array(), '', false ); - $orderItem->expects($this->atLeastOnce())->method('getQtyOrdered')->will($this->returnValue(1)); - $orderItem->expects($this->atLeastOnce())->method('getTaxAmount')->will($this->returnValue($taxAmount)); - $orderItem->expects($this->atLeastOnce())->method('getBaseTaxAmount')->will($this->returnValue($taxAmount)); - $orderItem - ->expects($this->atLeastOnce()) - ->method('getHiddenTaxAmount') - ->will($this->returnValue($hiddenTaxAmount)); - $orderItem - ->expects($this->atLeastOnce()) - ->method('getBaseHiddenTaxAmount') - ->will($this->returnValue($hiddenTaxAmount)); + foreach ($invoiceItemData['order_item'] as $key => $value) { + $orderItem->setData($key, $value); + } + /** @var \Magento\Sales\Model\Order\Invoice\Item|\PHPUnit_Framework_MockObject_MockObject $invoiceItem */ $invoiceItem = $this->getMock( '\Magento\Sales\Model\Order\Invoice\Item', array( 'getOrderItem', 'isLast', - 'setTaxAmount', - 'setBaseTaxAmount', - 'setHiddenTaxAmount', - 'setBaseHiddenTaxAmount', '__wakeup' ), array(), '', false ); - $invoiceItem->expects($this->atLeastOnce())->method('getOrderItem')->will($this->returnValue($orderItem)); - $invoiceItem->expects($this->atLeastOnce())->method('isLast')->will($this->returnValue(true)); - - $invoiceItem->expects($this->once())->method('setTaxAmount')->with($taxAmount)->will($this->returnSelf()); - $invoiceItem->expects($this->once())->method('setBaseTaxAmount')->with($taxAmount)->will($this->returnSelf()); - $invoiceItem - ->expects($this->once()) - ->method('setHiddenTaxAmount') - ->with($hiddenTaxAmount) - ->will($this->returnSelf()); - $invoiceItem - ->expects($this->once()) - ->method('setBaseHiddenTaxAmount') - ->with($hiddenTaxAmount) - ->will($this->returnSelf()); + $invoiceItem->expects($this->any())->method('getOrderItem')->will($this->returnValue($orderItem)); + $invoiceItem->expects($this->any()) + ->method('isLast') + ->will($this->returnValue($invoiceItemData['is_last'])); + $invoiceItem->setData('qty', $invoiceItemData['qty']); return $invoiceItem; } } diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php index 2fa3a6d37f9a4f2ce990ad144fdcf183a69844dc..3a112d361b0c72364809cff2eb12b32815f0b567 100644 --- a/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php +++ b/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php @@ -48,6 +48,16 @@ class OrderTest extends \PHPUnit_Framework_TestCase */ protected $incrementId; + /** + * @var array + */ + protected $calculatedTaxInfo = [ + 'title' => 'My Mocked Tax Rate', + 'percent' => 10.0, + 'tax_amount' => 1.23, + 'base_tax_amount' => 2.46, + ]; + protected function setUp() { $helper = new \Magento\TestFramework\Helper\ObjectManager($this); @@ -66,11 +76,22 @@ class OrderTest extends \PHPUnit_Framework_TestCase false ); $this->incrementId = '#00000001'; + + // mock tax helper + $taxHelperMock = $this->getMockBuilder('Magento\Tax\Helper\Data') + ->setMethods(['getCalculatedTaxes']) + ->disableOriginalConstructor() + ->getMock(); + $taxHelperMock->expects($this->any()) + ->method('getCalculatedTaxes') + ->will($this->returnValue($this->calculatedTaxInfo)); + $this->order = $helper->getObject( 'Magento\Sales\Model\Order', [ 'paymentCollectionFactory' => $this->paymentCollectionFactoryMock, 'orderItemCollectionFactory' => $this->orderItemCollectionFactoryMock, + 'taxHelper' => $taxHelperMock, 'data' => ['increment_id' => $this->incrementId] ] ); @@ -371,4 +392,15 @@ class OrderTest extends \PHPUnit_Framework_TestCase { $this->assertEquals('order', $this->order->getEntityType()); } + + + /** + * test method getFullTaxInfo() + */ + public function testGetFullTaxInfo() + { + $actualResult = $this->order->getFullTaxInfo(); + $expectedResult = $this->calculatedTaxInfo; + $this->assertSame($expectedResult, $actualResult); + } } diff --git a/dev/tests/unit/testsuite/Magento/Search/Block/SearchDataTest.php b/dev/tests/unit/testsuite/Magento/Search/Block/SearchDataTest.php new file mode 100644 index 0000000000000000000000000000000000000000..4a0fb5a6e88457e8743b5eb1cedc90a3dff839f4 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Search/Block/SearchDataTest.php @@ -0,0 +1,117 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Block; + +use PHPUnit_Framework_MockObject_MockObject as MockObject; + +class SearchDataTest extends \PHPUnit_Framework_TestCase +{ + + /** @var \Magento\Framework\View\Element\Template\Context|MockObject */ + private $context; + + /** + * @var \Magento\Search\Model\QueryFactoryInterface|MockObject + */ + private $queryFactory; + + /** + * @var \Magento\Search\Model\Query|MockObject + */ + private $searchQuery; + + /** + * @var \Magento\Search\Model\SearchDataProviderInterface|MockObject + */ + private $dataProvider; + + /** + * @var \Magento\Search\Block\SearchData + */ + private $block; + + protected function setUp() + { + $this->dataProvider = $this->getMockBuilder('\Magento\Search\Model\SearchDataProviderInterface') + ->disableOriginalConstructor() + ->setMethods(['getSearchData', 'isCountResultsEnabled']) + ->getMockForAbstractClass(); + + $this->searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface') + ->disableOriginalConstructor() + ->setMethods(['getQueryText']) + ->getMockForAbstractClass(); + $this->queryFactory = $this->getMockBuilder('\Magento\Search\Model\QueryFactoryInterface') + ->disableOriginalConstructor() + ->setMethods(['get']) + ->getMockForAbstractClass(); + $this->queryFactory->expects($this->once()) + ->method('get') + ->will($this->returnValue($this->searchQuery)); + $this->context = $this->getMockBuilder('\Magento\Framework\View\Element\Template\Context') + ->disableOriginalConstructor() + ->getMock(); + $this->block = $this->getMockBuilder('\Magento\Search\Block\SearchData')->setConstructorArgs( + [ + $this->context, + $this->dataProvider, + $this->queryFactory, + 'Test Title', + array(), + ] + ) + ->setMethods(['getUrl']) + ->getMockForAbstractClass(); + } + + public function testGetSuggestions() + { + $value = [1, 2, 3, 100500,]; + + $this->dataProvider->expects($this->once()) + ->method('getSearchData') + ->with($this->searchQuery) + ->will($this->returnValue($value)); + $actualValue = $this->block->getSearchData(); + $this->assertEquals($value, $actualValue); + } + + public function testGetLink() + { + $searchQuery = 'Some test search query'; + $expectedResult = '?q=Some+test+search+query'; + $actualResult = $this->block->getLink($searchQuery); + $this->assertEquals($expectedResult, $actualResult); + } + + public function testIsCountResultsEnabled() + { + $value = 'qwertyasdfzxcv'; + $this->dataProvider->expects($this->once()) + ->method('isCountResultsEnabled') + ->will($this->returnValue($value)); + $this->assertEquals($value, $this->block->isCountResultsEnabled()); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php b/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php new file mode 100644 index 0000000000000000000000000000000000000000..68043f23c8d2f0c4429520c81c1bedd6d0a359e1 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php @@ -0,0 +1,57 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Model; + +use Magento\TestFramework\Helper\ObjectManager; + +class DataProviderTest extends \PHPUnit_Framework_TestCase +{ + + /** + * @var ObjectManager + */ + private $objectManager; + + protected function setUp() + { + $this->objectManager = new ObjectManager($this); + } + + public function testGetRecommendations() + { + /** @var \Magento\Search\Model\QueryInterface|\PHPUnit_Framework_MockObject_MockObject $searchQuery */ + $searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface')->getMockForAbstractClass(); + /** @var \Magento\Search\Model\SearchDataProvider $dataProvider */ + $dataProvider = $this->objectManager->getObject('\Magento\Search\Model\SearchDataProvider'); + $this->assertEquals([], $dataProvider->getSearchData($searchQuery)); + } + + public function testIsCountResultsEnabled() + { + /** @var \Magento\Search\Model\SearchDataProvider $dataProvider */ + $dataProvider = $this->objectManager->getObject('\Magento\Search\Model\SearchDataProvider'); + $this->assertFalse($dataProvider->isCountResultsEnabled()); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php b/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php new file mode 100644 index 0000000000000000000000000000000000000000..0c13478a085e28b00df746dc1f3e9faaea39ab3d --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php @@ -0,0 +1,88 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Search\Model; + +use Magento\TestFramework\Helper\ObjectManager; + +class QueryResultTest extends \PHPUnit_Framework_TestCase +{ + + /** + * @var ObjectManager + */ + private $objectManager; + + protected function setUp() + { + $this->objectManager = new ObjectManager($this); + } + + /** + * @dataProvider getPropertiesDataProvider + */ + public function testGetProperties($queryText, $resultsCount) + { + /** @var \Magento\Search\Model\QueryResult $queryResult */ + $queryResult = $this->objectManager->getObject( + '\Magento\Search\Model\QueryResult', + [ + 'queryText' => $queryText, + 'resultsCount' => $resultsCount, + ] + ); + $this->assertEquals($queryText, $queryResult->getQueryText()); + $this->assertEquals($resultsCount, $queryResult->getResultsCount()); + } + + /** + * Data provider for testGetProperties + * @return array + */ + public function getPropertiesDataProvider() + { + return [ + [ + 'queryText' => 'Some kind of query text', + 'resultsCount' => 0, + ], + [ + 'queryText' => 'Another query', + 'resultsCount' => 322312312, + ], + [ + 'queryText' => 'It\' a query too', + 'resultsCount' => -100, + ], + [ + 'queryText' => '', + 'resultsCount' => null, + ], + [ + 'queryText' => 42, + 'resultsCount' => false, + ], + ]; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php new file mode 100644 index 0000000000000000000000000000000000000000..e4309b7c5d016b6cf7a28343232bd54dde15f601 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php @@ -0,0 +1,409 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Tax\Model\Sales\Total\Quote; + +/** + * Test class for \Magento\Tax\Model\Sales\Total\Quote\Shipping + */ +use Magento\Tax\Model\Calculation; +use Magento\TestFramework\Helper\ObjectManager; + +class ShippingTest extends \PHPUnit_Framework_TestCase +{ + /** + * Tests the specific method + * + * @param array $itemData + * @param array $shippingItemData + * @param array $appliedRatesData + * @param array $taxDetailsData + * @param array $quoteDetailsData + * @param array $addressData + * @param array $verifyData + * + * @dataProvider dataProviderCollectArray + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testCollect($itemData, $shippingItemData, $appliedRatesData, $taxDetailsData, $quoteDetailsData, + $addressData, $verifyData + ) { + $objectManager = new ObjectManager($this); + $taxConfig = $this->getMockBuilder('\Magento\Tax\Model\Config') + ->disableOriginalConstructor() + ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax', 'discountTax']) + ->getMock(); + $taxConfig + ->expects($this->any()) + ->method('getShippingTaxClass') + ->will($this->returnValue(true)); + $taxConfig + ->expects($this->any()) + ->method('shippingPriceIncludesTax') + ->will($this->returnValue(true)); + $taxConfig + ->expects($this->any()) + ->method('discountTax') + ->will($this->returnValue(false)); + + $product = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false); + $item = $this->getMockBuilder('Magento\Sales\Model\Quote\Item') + ->disableOriginalConstructor() + ->setMethods(['getParentItem', 'getHasChildren', 'getProduct', 'getQuote', 'getCode', '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getParentItem') + ->will($this->returnValue(null)); + $item + ->expects($this->any()) + ->method('getHasChildren') + ->will($this->returnValue(false)); + $item + ->expects($this->any()) + ->method('getCode') + ->will($this->returnValue("1")); + $item + ->expects($this->any()) + ->method('getProduct') + ->will($this->returnValue($product)); + + foreach ($itemData as $key => $value) { + $item->setData($key, $value); + } + + $items = array($item); + $taxDetails = $this->getMockBuilder('Magento\Tax\Service\V1\Data\TaxDetails') + ->disableOriginalConstructor() + ->setMethods(['getItems']) + ->getMock(); + $taxDetails + ->expects($this->any()) + ->method('getItems') + ->will($this->returnValue($items)); + + $quoteDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetailsBuilder'); + $storeManager = $this->getMockBuilder('\Magento\Framework\StoreManagerInterface') + ->disableOriginalConstructor() + ->setMethods(['getStore', 'hasSingleStore', 'isSingleStoreMode', 'getStores', 'getWebsite', 'getWebsites', + 'reinitStores', 'getDefaultStoreView', 'setIsSingleStoreModeAllowed', 'getGroup', 'getGroups', + 'clearWebsiteCache', 'setCurrentStore']) + ->getMock(); + $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock(); + $storeManager->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($storeMock)); + + $taxDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\TaxDetailsBuilder'); + $taxDetailsBuilder->_setDataValues($taxDetailsData); + $taxDetails = $taxDetailsBuilder->populateWithArray($taxDetailsData)->create(); + + $calculatorFactory = $this->getMockBuilder('Magento\Tax\Model\Calculation\CalculatorFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $calculationTool = $this->getMockBuilder('Magento\Tax\Model\Calculation') + ->disableOriginalConstructor() + ->setMethods(['getRate', 'getAppliedRates', 'round', 'calcTaxAmount', '__wakeup']) + ->getMock(); + $calculationTool->expects($this->any()) + ->method('round') + ->will($this->returnArgument(0)); + $calculationTool->expects($this->any()) + ->method('getRate') + ->will($this->returnValue(10)); + $calculationTool->expects($this->any()) + ->method('calcTaxAmount') + ->will($this->returnValue(1)); + + $calculationTool->expects($this->any()) + ->method('getAppliedRates') + ->will($this->returnValue($appliedRatesData)); + $calculator = $objectManager->getObject('Magento\Tax\Model\Calculation\TotalBaseCalculator', + [ + 'calculationTool' => $calculationTool, + ] + ); + $calculatorFactory + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($calculator)); + + $taxDetailsItemBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\TaxDetails\ItemBuilder'); + $taxCalculationService = $objectManager->getObject( + 'Magento\Tax\Service\V1\TaxCalculationService', + [ + 'calculation' => $calculationTool, + 'calculatorFactory' => $calculatorFactory, + 'taxDetailsBuilder' => $taxDetailsBuilder, + 'taxDetailsItemBuilder' => $taxDetailsItemBuilder, + 'storeManager' => $storeManager, + ] + ); + + $taxClassKeyBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\TaxClassKeyBuilder') + ->disableOriginalConstructor() + ->setMethods(['setType', 'setValue', 'create']) + ->getMock(); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setType') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setValue') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($taxClassKeyBuilder)); + + $shippingItemBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetails\ItemBuilder'); + $shippingItem = $shippingItemBuilder->populateWithArray($shippingItemData)->create(); + + $itemBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetails\ItemBuilder') + ->disableOriginalConstructor() + ->setMethods(['getTaxClassKeyBuilder', 'setTaxClassKey', 'create', 'getAssociatedTaxables']) + ->getMock(); + $itemBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('setTaxClassKey') + ->will($this->returnValue($itemBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($shippingItem)); + $itemBuilder + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(null)); + + $regionBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\RegionBuilder') + ->disableOriginalConstructor() + ->setMethods(['setRegionId', 'create']) + ->getMock(); + + $addressBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\AddressBuilder') + ->disableOriginalConstructor() + ->setMethods(['getRegionBuilder', 'create']) + ->getMock(); + $region = $this->getMock('Magento\Customer\Service\V1\Data\Region', [], [], '', false); + $regionBuilder + ->expects($this->any()) + ->method('setRegionId') + ->will($this->returnValue($regionBuilder)); + $regionBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($region)); + $addressBuilder + ->expects($this->any()) + ->method('getRegionBuilder') + ->will($this->returnValue($regionBuilder)); + + $quoteDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetailsBuilder'); + $quoteDetails = $quoteDetailsBuilder->populateWithArray($quoteDetailsData)->create(); + $quoteDetailsBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetailsBuilder') + ->disableOriginalConstructor() + ->setMethods(['getItemBuilder', 'getAddressBuilder', 'getTaxClassKeyBuilder', 'create']) + ->getMock(); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getItemBuilder') + ->will($this->returnValue($itemBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getAddressBuilder') + ->will($this->returnValue($addressBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($quoteDetails)); + + $shippingTotalsCalcModel = new Shipping($taxConfig, $taxCalculationService, $quoteDetailsBuilder); + + $store = $this->getMockBuilder('Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->setMethods(['convertPrice', '__wakeup']) + ->getMock(); + $quote = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false); + $quote + ->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($store)); + $address = $this->getMockBuilder('\Magento\Sales\Model\Quote\Address') + ->disableOriginalConstructor() + ->setMethods(['getShippingTaxCalculationAmount', 'setExtraTaxableDetails', 'getAssociatedTaxables', + 'getAllItems', 'getAllNonNominalItems', 'getQuote', 'getBillingAddress', 'getRegionId', + '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->any()) + ->method('getShippingTaxCalculationAmount') + ->will($this->returnValue("1")); + $address + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(array())); + $address + ->expects($this->any()) + ->method('getAllNonNominalItems') + ->will($this->returnValue($items)); + $address + ->expects($this->any()) + ->method('getRegionId') + ->will($this->returnValue($region)); + $quote + ->expects($this->any()) + ->method('getBillingAddress') + ->will($this->returnValue($address)); + $addressBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($address)); + + $addressData["cached_items_nonnominal"] = $items; + foreach ($addressData as $key => $value) { + $address->setData($key, $value); + } + + $shippingTotalsCalcModel->collect($address); + + foreach ($verifyData as $key => $value) { + $this->assertSame($verifyData[$key], $address->getData($key)); + } + } + + /** + * @return array + */ + public function dataProviderCollectArray() + { + $data = [ + 'default' => [ + 'itemData' => [ + "qty" => 1, "price" => 100, "tax_percent" => 20, "product_type" => "simple", + "code" => "sequence-1", "tax_calculation_item_id" => "sequence-1", "converted_price" => 100 + ], + 'shippingItemData' => [ + "type" => "shipping", "code" => "shipping", "quantity" => 1, "unit_price" => 10 + ], + 'appliedRates' => [ + [ + "rates" => [ + [ + "code" => "US-NY-*-Rate ", + "title" => "US-NY-*-Rate ", + "percent" => 10, + "rate_id" => 1 + ] + ], + "percent" => 10, + "id" => "US-NY-*-Rate 1" + ] + ], + 'taxDetailsData' => [ + "subtotal" => 10, + "tax_amount" => 1, + "discount_tax_compensation_amount" => 0, + "applied_taxes" => [ + "_data" => [ + "amount" => 1, + "percent" => 10, + "rates" => ["_data" => ["percent" => 10]], + "tax_rate_key" => "US-NY-*-Rate 1" + ] + ], + 'items' => [ + "shipping-1" => [ + "_data" => [ + "code" => "shipping", + "type" => "shipping", + "row_tax" => 1, + "price" => 10, + "price_incl_tax" => 11, + "row_total" => 10, + "row_total_incl_tax" => 11 + ] + ] + ] + ], + 'quoteDetailsData' => [ + "billing_address" => [ + "street" => array("123 Main Street"), + "postcode" => "10012", + "country_id" => "US", + "region" => ["region_id" => 43], + "city" => "New York", + ], + 'shipping_address' => [ + "street" => array("123 Main Street"), + "postcode" => "10012", + "country_id" => "US", + "region" => ["region_id" => 43], + "city" => "New York", + ], + 'customer_id' => '1', + 'items' => [ + [ + "type" => "shipping", "code" => "shipping", "quantity" => 1, "unit_price" => 10, + 'tax_class_key' => array("_data" => array("type" => "id", "value" => 2)), + 'tax_included = false', + ] + ] + ], + 'addressData' => [ + "address_id" => 2, "address_type" => "shipping", "street" => "123 Main Street", + "city" => "New York", "region" => "New York", "region_id" => "43", "postcode" => "10012", + "country_id" => "US", "telephone" => "111-111-1111", "same_as_billing" => "1", + "shipping_method" => "freeshipping_freeshipping", "weight" => 1, "shipping_amount" => 10, + "base_shipping_amount" => 10, + ], + 'verifyData' => [ + "shipping_amount" => 10, + "base_shipping_incl_tax" => 11.0, + "base_shipping_tax_amount" => 1.0 + ], + ], + ]; + + return $data; + } +} + diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php new file mode 100644 index 0000000000000000000000000000000000000000..5a439cbda49e542c4b979946ed0138de0236cdf7 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php @@ -0,0 +1,402 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Tax\Model\Sales\Total\Quote; + +/** + * Test class for \Magento\Tax\Model\Sales\Total\Quote\Subtotal + */ +use Magento\Tax\Model\Calculation; +use Magento\TestFramework\Helper\ObjectManager; + +class SubtotalTest extends \PHPUnit_Framework_TestCase +{ + /** + * Tests the specific method + * + * @param array $itemData + * @param array $appliedRatesData + * @param array $taxDetailsData + * @param array $quoteDetailsData + * @param array $addressData + * @param array $verifyData + * + * @dataProvider dataProviderCollectArray + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testCollect($itemData, $appliedRatesData, $taxDetailsData, $quoteDetailsData, $addressData, + $verifyData + ) { + $objectManager = new ObjectManager($this); + $taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false); + $taxConfig = $this->getMockBuilder('\Magento\Tax\Model\Config') + ->disableOriginalConstructor() + ->setMethods(['priceIncludesTax', 'getShippingTaxClass', 'shippingPriceIncludesTax', 'discountTax']) + ->getMock(); + $taxConfig + ->expects($this->any()) + ->method('priceIncludesTax') + ->will($this->returnValue(false)); + $taxConfig->expects($this->any()) + ->method('getShippingTaxClass') + ->will($this->returnValue(1)); + $taxConfig->expects($this->any()) + ->method('shippingPriceIncludesTax') + ->will($this->returnValue(false)); + $taxConfig->expects($this->any()) + ->method('discountTax') + ->will($this->returnValue(false)); + + $product = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false); + $item = $this->getMockBuilder('Magento\Sales\Model\Quote\Item') + ->disableOriginalConstructor() + ->setMethods(['getParentItem', 'getHasChildren', 'getProduct', 'getQuote', 'getCode', '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getParentItem') + ->will($this->returnValue(null)); + $item + ->expects($this->any()) + ->method('getHasChildren') + ->will($this->returnValue(false)); + $item + ->expects($this->any()) + ->method('getCode') + ->will($this->returnValue("1")); + $item + ->expects($this->any()) + ->method('getProduct') + ->will($this->returnValue($product)); + + foreach ($itemData as $key => $value) { + $item->setData($key, $value); + } + + $items = array($item); + $taxDetails = $this->getMockBuilder('Magento\Tax\Service\V1\Data\TaxDetails') + ->disableOriginalConstructor() + ->setMethods(['getItems']) + ->getMock(); + $taxDetails + ->expects($this->any()) + ->method('getItems') + ->will($this->returnValue($items)); + + $quoteDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetailsBuilder'); + $storeManager = $this->getMockBuilder('\Magento\Framework\StoreManagerInterface') + ->disableOriginalConstructor() + ->setMethods(['getStore', 'hasSingleStore', 'isSingleStoreMode', 'getStores', 'getWebsite', 'getWebsites', + 'reinitStores', 'getDefaultStoreView', 'setIsSingleStoreModeAllowed', 'getGroup', 'getGroups', + 'clearWebsiteCache', 'setCurrentStore']) + ->getMock(); + $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock(); + $storeManager->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($storeMock)); + + $taxDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\TaxDetailsBuilder'); + $taxDetailsBuilder->_setDataValues($taxDetailsData); + $taxDetails = $taxDetailsBuilder->populateWithArray($taxDetailsData)->create(); + + $calculatorFactory = $this->getMockBuilder('Magento\Tax\Model\Calculation\CalculatorFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $calculationTool = $this->getMockBuilder('Magento\Tax\Model\Calculation') + ->disableOriginalConstructor() + ->setMethods(['getRate', 'getAppliedRates', 'round', 'calcTaxAmount', '__wakeup']) + ->getMock(); + $calculationTool->expects($this->any()) + ->method('round') + ->will($this->returnArgument(0)); + $calculationTool->expects($this->any()) + ->method('getRate') + ->will($this->returnValue(20)); + $calculationTool->expects($this->any()) + ->method('calcTaxAmount') + ->will($this->returnValue(20)); + $calculationTool->expects($this->any()) + ->method('getAppliedRates') + ->will($this->returnValue($appliedRatesData)); + $calculator = $objectManager->getObject('Magento\Tax\Model\Calculation\TotalBaseCalculator', + [ + 'calculationTool' => $calculationTool, + ] + ); + $calculatorFactory + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($calculator)); + + $taxDetailsItemBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\TaxDetails\ItemBuilder'); + $taxCalculationService = $objectManager->getObject( + 'Magento\Tax\Service\V1\TaxCalculationService', + [ + 'calculation' => $calculationTool, + 'calculatorFactory' => $calculatorFactory, + 'taxDetailsBuilder' => $taxDetailsBuilder, + 'taxDetailsItemBuilder' => $taxDetailsItemBuilder, + 'storeManager' => $storeManager, + ] + ); + + $taxClassKeyBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\TaxClassKeyBuilder') + ->disableOriginalConstructor() + ->setMethods(['setType', 'setValue', 'create']) + ->getMock(); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setType') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setValue') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($taxClassKeyBuilder)); + + $itemBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetails\ItemBuilder') + ->disableOriginalConstructor() + ->setMethods(['getTaxClassKeyBuilder', 'create', 'setTaxClassKey', 'getAssociatedTaxables']) + ->getMock(); + $itemBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('setTaxClassKey') + ->will($this->returnValue($itemBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($items)); + $itemBuilder + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(null)); + + $regionBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\RegionBuilder') + ->disableOriginalConstructor() + ->setMethods(['setRegionId', 'create']) + ->getMock(); + + $addressBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\AddressBuilder') + ->disableOriginalConstructor() + ->setMethods(['getRegionBuilder', 'create']) + ->getMock(); + $region = $this->getMock('Magento\Customer\Service\V1\Data\Region', [], [], '', false); + $regionBuilder + ->expects($this->any()) + ->method('setRegionId') + ->will($this->returnValue($regionBuilder)); + $regionBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($region)); + $addressBuilder + ->expects($this->any()) + ->method('getRegionBuilder') + ->will($this->returnValue($regionBuilder)); + + $quoteDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetailsBuilder'); + $quoteDetails = $quoteDetailsBuilder->populateWithArray($quoteDetailsData)->create(); + $quoteDetailsBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetailsBuilder') + ->disableOriginalConstructor() + ->setMethods(['getItemBuilder', 'getAddressBuilder', 'getTaxClassKeyBuilder', 'create']) + ->getMock(); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getItemBuilder') + ->will($this->returnValue($itemBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getAddressBuilder') + ->will($this->returnValue($addressBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($quoteDetails)); + + $subtotalTotalsCalcModel = new Subtotal($taxConfig, $taxCalculationService, $quoteDetailsBuilder); + + $store = $this->getMockBuilder('Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->setMethods(['convertPrice', '__wakeup', 'getStoreId']) + ->getMock(); + $store + ->expects($this->any()) + ->method('getStoreId') + ->will($this->returnValue(1)); + $quote = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false); + $quote + ->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($store)); + $address = $this->getMockBuilder('\Magento\Sales\Model\Quote\Address') + ->disableOriginalConstructor() + ->setMethods(['getAssociatedTaxables', + 'getQuote', 'getBillingAddress', 'getRegionId', + '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(array())); + $address + ->expects($this->any()) + ->method('getRegionId') + ->will($this->returnValue($region)); + $quote + ->expects($this->any()) + ->method('getBillingAddress') + ->will($this->returnValue($address)); + $addressBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($address)); + + $addressData["cached_items_nonnominal"] = $items; + foreach ($addressData as $key => $value) { + $address->setData($key, $value); + } + $subtotalTotalsCalcModel->collect($address); + + foreach ($verifyData as $key => $value) { + $this->assertSame($verifyData[$key], $address->getData($key)); + } + } + + /** + * @return array + */ + public function dataProviderCollectArray() + { + $data = [ + 'default' => [ + 'itemData' => [ + "qty" => 1, "price" => 100, "tax_percent" => 20, "product_type" => "simple", + "code" => "sequence-1", "tax_calculation_item_id" => "sequence-1", "converted_price" => 100 + ], + '$appliedRates' => [ + [ + "rates" => [ + [ + "code" => "US-NY-*-Rate ", + "title" => "US-NY-*-Rate ", + "percent" => 20, + "rate_id" => 1 + ] + ], + "percent" => 20, + "id" => "US-NY-*-Rate 1" + ] + ], + 'taxDetailsData' => [ + "subtotal" => 100, + "tax_amount" => 20, + "discount_tax_compensation_amount" => 0, + "applied_taxes" => [ + "_data" => [ + "amount" => 20, + "percent" => 20, + "rates" => ["_data" => ["percent" => 20]], + "tax_rate_key" => "US-NY-*-Rate 1" + ] + ], + 'items' => [ + "sequence-1" => [ + "_data" => [ + 'code' => 'sequence-1', + 'type' => 'product', + 'row_tax' => 20, + 'price' => 100, + 'price_incl_tax' => 120, + 'row_total' => 100, + 'row_total_incl_tax' => 120, + 'tax_calculation_item_id' => "sequence-1" + ] + ] + ] + ], + 'quoteDetailsData' => [ + "billing_address" => [ + "street" => array("123 Main Street"), + "postcode" => "10012", + "country_id" => "US", + "region" => ["region_id" => 43], + "city" => "New York", + ], + 'shipping_address' => [ + "street" => array("123 Main Street"), + "postcode" => "10012", + "country_id" => "US", + "region" => ["region_id" => 43], + "city" => "New York", + ], + 'customer_id' => '1', + 'items' => [ + [ + 'code' => 'sequence-1', + 'type' => 'product', + 'quantity' => 1, + 'unit_price' => 100, + 'tax_class_key' => array("_data" => array("type" => "id", "value" => 2)), + 'tax_included = false', + ] + ] + ], + 'addressData' => [ + "address_id" => 2, "address_type" => "shipping", "street" => "123 Main Street", + "city" => "New York", "region" => "New York", "region_id" => "43", "postcode" => "10012", + "country_id" => "US", "telephone" => "111-111-1111", "same_as_billing" => "1", + "shipping_method" => "freeshipping_freeshipping", "weight" => 1, "shipping_amount" => 0, + "base_shipping_amount" => 0 + ], + 'verifyData' => [ + "base_tax_amount" => 20.0, + "subtotal" => 100, + "shipping_amount" => 0, + "base_subtotal_incl_tax" => 120.0 + ], + ], + ]; + + return $data; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php index d99478704b5841f1da7310fa335698aa76055ca6..e309fd11c408401f880ac39a9e45a6951bfcebae 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php @@ -27,9 +27,384 @@ namespace Magento\Tax\Model\Sales\Total\Quote; * Test class for \Magento\Tax\Model\Sales\Total\Quote\Tax */ use Magento\Tax\Model\Calculation; +use Magento\TestFramework\Helper\ObjectManager; class TaxTest extends \PHPUnit_Framework_TestCase { + const TAX = 0.2; + + /** + * Tests the specific method + * + * @param array $itemData + * @param array $appliedRatesData + * @param array $taxDetailsData + * @param array $quoteDetailsData + * @param array $addressData + * @param array $verifyData + * + * @dataProvider dataProviderCollectArray + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testCollect($itemData, $appliedRatesData, $taxDetailsData, $quoteDetailsData, + $addressData, $verifyData + ) { + $objectManager = new ObjectManager($this); + $taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false); + $taxConfig = $this->getMockBuilder('\Magento\Tax\Model\Config') + ->disableOriginalConstructor() + ->setMethods(['priceIncludesTax', 'getShippingTaxClass', 'shippingPriceIncludesTax', 'discountTax']) + ->getMock(); + $taxConfig + ->expects($this->any()) + ->method('priceIncludesTax') + ->will($this->returnValue(false)); + $taxConfig->expects($this->any()) + ->method('getShippingTaxClass') + ->will($this->returnValue(1)); + $taxConfig->expects($this->any()) + ->method('shippingPriceIncludesTax') + ->will($this->returnValue(false)); + $taxConfig->expects($this->any()) + ->method('discountTax') + ->will($this->returnValue(false)); + + $product = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false); + $item = $this->getMockBuilder('Magento\Sales\Model\Quote\Item') + ->disableOriginalConstructor() + ->setMethods(['getParentItem', 'getHasChildren', 'getProduct', 'getQuote', 'getCode', '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getParentItem') + ->will($this->returnValue(null)); + $item + ->expects($this->any()) + ->method('getHasChildren') + ->will($this->returnValue(false)); + $item + ->expects($this->any()) + ->method('getCode') + ->will($this->returnValue("1")); + $item + ->expects($this->any()) + ->method('getProduct') + ->will($this->returnValue($product)); + + foreach ($itemData as $key => $value) { + $item->setData($key, $value); + } + + $items = array($item); + $taxDetails = $this->getMockBuilder('Magento\Tax\Service\V1\Data\TaxDetails') + ->disableOriginalConstructor() + ->setMethods(['getItems']) + ->getMock(); + $taxDetails + ->expects($this->any()) + ->method('getItems') + ->will($this->returnValue($items)); + + $quoteDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetailsBuilder'); + $storeManager = $this->getMockBuilder('\Magento\Framework\StoreManagerInterface') + ->disableOriginalConstructor() + ->setMethods(['getStore', 'hasSingleStore', 'isSingleStoreMode', 'getStores', 'getWebsite', 'getWebsites', + 'reinitStores', 'getDefaultStoreView', 'setIsSingleStoreModeAllowed', 'getGroup', 'getGroups', + 'clearWebsiteCache', 'setCurrentStore']) + ->getMock(); + $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock(); + $storeManager->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($storeMock)); + + $taxDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\TaxDetailsBuilder'); + + $taxDetailsBuilder->_setDataValues($taxDetailsData); + $taxDetails = $taxDetailsBuilder->populateWithArray($taxDetailsData)->create(); + + $calculatorFactory = $this->getMockBuilder('Magento\Tax\Model\Calculation\CalculatorFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $calculationTool = $this->getMockBuilder('Magento\Tax\Model\Calculation') + ->disableOriginalConstructor() + ->setMethods(['getRate', 'getAppliedRates', 'round', 'calcTaxAmount', '__wakeup']) + ->getMock(); + $calculationTool->expects($this->any()) + ->method('round') + ->will($this->returnArgument(0)); + $calculationTool->expects($this->any()) + ->method('getRate') + ->will($this->returnValue(20)); + $calculationTool->expects($this->any()) + ->method('calcTaxAmount') + ->will($this->returnValue(20)); + + $calculationTool->expects($this->any()) + ->method('getAppliedRates') + ->will($this->returnValue($appliedRatesData)); + $calculator = $objectManager->getObject('Magento\Tax\Model\Calculation\TotalBaseCalculator', + [ + 'calculationTool' => $calculationTool, + ] + ); + $calculatorFactory + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($calculator)); + + $taxDetailsItemBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\TaxDetails\ItemBuilder'); + $taxCalculationService = $objectManager->getObject( + 'Magento\Tax\Service\V1\TaxCalculationService', + [ + 'calculation' => $calculationTool, + 'calculatorFactory' => $calculatorFactory, + 'taxDetailsBuilder' => $taxDetailsBuilder, + 'taxDetailsItemBuilder' => $taxDetailsItemBuilder, + 'storeManager' => $storeManager, + ] + ); + + + $taxClassKeyBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\TaxClassKeyBuilder') + ->disableOriginalConstructor() + ->setMethods(['setType', 'setValue', 'create']) + ->getMock(); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setType') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setValue') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($taxClassKeyBuilder)); + + $itemBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetails\ItemBuilder') + ->disableOriginalConstructor() + ->setMethods(['getTaxClassKeyBuilder', 'create', 'setTaxClassKey', 'getAssociatedTaxables']) + ->getMock(); + $itemBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('setTaxClassKey') + ->will($this->returnValue($itemBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($items)); + $itemBuilder + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(null)); + + $regionBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\RegionBuilder') + ->disableOriginalConstructor() + ->setMethods(['setRegionId', 'create']) + ->getMock(); + + $addressBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\AddressBuilder') + ->disableOriginalConstructor() + ->setMethods(['getRegionBuilder', 'create']) + ->getMock(); + $region = $this->getMock('Magento\Customer\Service\V1\Data\Region', [], [], '', false); + $regionBuilder + ->expects($this->any()) + ->method('setRegionId') + ->will($this->returnValue($regionBuilder)); + $regionBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($region)); + $addressBuilder + ->expects($this->any()) + ->method('getRegionBuilder') + ->will($this->returnValue($regionBuilder)); + + $quoteDetailsBuilder = $objectManager->getObject('Magento\Tax\Service\V1\Data\QuoteDetailsBuilder'); + $quoteDetails = $quoteDetailsBuilder->populateWithArray($quoteDetailsData)->create(); + $quoteDetailsBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetailsBuilder') + ->disableOriginalConstructor() + ->setMethods(['getItemBuilder', 'getAddressBuilder', 'getTaxClassKeyBuilder', 'create']) + ->getMock(); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getItemBuilder') + ->will($this->returnValue($itemBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getAddressBuilder') + ->will($this->returnValue($addressBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $quoteDetailsBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($quoteDetails)); + + $taxTotalsCalcModel = new Tax($taxConfig, $taxCalculationService, $quoteDetailsBuilder, $taxData); + + $store = $this->getMockBuilder('Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->setMethods(['convertPrice', '__wakeup', 'getStoreId']) + ->getMock(); + $store + ->expects($this->any()) + ->method('getStoreId') + ->will($this->returnValue(1)); + $quote = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false); + $quote + ->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($store)); + $address = $this->getMockBuilder('\Magento\Sales\Model\Quote\Address') + ->disableOriginalConstructor() + ->setMethods(['getAssociatedTaxables', + 'getQuote', 'getBillingAddress', 'getRegionId', + '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(array())); + $address + ->expects($this->any()) + ->method('getRegionId') + ->will($this->returnValue($region)); + $quote + ->expects($this->any()) + ->method('getBillingAddress') + ->will($this->returnValue($address)); + $addressBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($address)); + + $addressData["cached_items_nonnominal"] = $items; + foreach ($addressData as $key => $value) { + $address->setData($key, $value); + } + + $taxTotalsCalcModel = $taxTotalsCalcModel->collect($address); + foreach ($verifyData as $key => $value) { + $this->assertSame($verifyData[$key], $address->getData($key)); + } + } + + /** + * @return array + */ + public function dataProviderCollectArray() + { + $data = [ + 'default' => [ + 'itemData' => [ + "qty" => 1, "price" => 100, "tax_percent" => 20, "product_type" => "simple", + "code" => "sequence-1", "tax_calculation_item_id" => "sequence-1", "converted_price" => 100 + ], + '$appliedRates' => [ + [ + "rates" => [ + [ + "code" => "US-NY-*-Rate ", + "title" => "US-NY-*-Rate ", + "percent" => 20, + "rate_id" => 1 + ] + ], + "percent" => 20, + "id" => "US-NY-*-Rate 1" + ] + ], + 'taxDetailsData' => [ + "subtotal" => 100, + "tax_amount" => 20, + "discount_tax_compensation_amount" => 0, + "applied_taxes" => [ + "_data" => [ + "amount" => 20, + "percent" => 20, + "rates" => ["_data" => ["percent" => 20]], + "tax_rate_key" => "US-NY-*-Rate 1" + ] + ], + 'items' => [ + "sequence-1" => [ + "_data" => [ + 'code' => 'sequence-1', + 'type' => 'product', + 'row_tax' => 20, + 'price' => 100, + 'price_incl_tax' => 120, + 'row_total' => 100, + 'row_total_incl_tax' => 120, + 'tax_calculation_item_id' => "sequence-1" + ] + ] + ] + ], + 'quoteDetailsData' => [ + "billing_address" => [ + "street" => array("123 Main Street"), + "postcode" => "10012", + "country_id" => "US", + "region" => ["region_id" => 43], + "city" => "New York", + ], + 'shipping_address' => [ + "street" => array("123 Main Street"), + "postcode" => "10012", + "country_id" => "US", + "region" => ["region_id" => 43], + "city" => "New York", + ], + 'customer_id' => '1', + 'items' => [ + [ + 'code' => 'sequence-1', + 'type' => 'product', + 'quantity' => 1, + 'unit_price' => 100, + 'tax_class_key' => array("_data" => array("type" => "id", "value" => 2)), + 'tax_included = false', + ] + ] + ], + 'addressData' => [ + "address_id" => 2, "address_type" => "shipping", "street" => "123 Main Street", + "city" => "New York", "region" => "New York", "region_id" => "43", "postcode" => "10012", + "country_id" => "US", "telephone" => "111-111-1111", "same_as_billing" => "1", + "shipping_method" => "freeshipping_freeshipping", "weight" => 1, "shipping_amount" => 0, + "base_shipping_amount" => 0 + ], + 'verifyData' => [ + "tax_amount" => 20.0, + "subtotal" => 100, + "shipping_amount" => 0, + "subtotal_incl_tax" => 120.0 + ], + ], + ]; + + return $data; + } + /** * Tests the specific method * @@ -69,4 +444,278 @@ class TaxTest extends \PHPUnit_Framework_TestCase [Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL, 'after', 'before'] ]; } + + /** + * Tests the specific method + * + * @param array $itemData + * @param array $addressData + * + * @dataProvider dataProviderMapQuoteExtraTaxablesArray + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testMapQuoteExtraTaxables($itemData, $addressData) + { + $objectManager = new ObjectManager($this); + $taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false); + $taxConfig = $this->getMock('\Magento\Tax\Model\Config', [], [], '', false); + $taxCalculationService = $this->getMock('\Magento\Tax\Service\V1\TaxCalculationService', [], [], '', false); + $quoteDetailsBuilder = $this->getMock('\Magento\Tax\Service\V1\Data\QuoteDetailsBuilder', [], [], '', false); + + $taxTotalsCalcModel = new Tax($taxConfig, $taxCalculationService, $quoteDetailsBuilder, $taxData); + $taxClassKeyBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\TaxClassKeyBuilder') + ->disableOriginalConstructor() + ->setMethods(['setType', 'setValue', 'create']) + ->getMock(); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setType') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('setValue') + ->will($this->returnValue($taxClassKeyBuilder)); + $taxClassKeyBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($taxClassKeyBuilder)); + + $itemBuilder = $this->getMockBuilder('\Magento\Tax\Service\V1\Data\QuoteDetails\ItemBuilder') + ->disableOriginalConstructor() + ->setMethods(['getTaxClassKeyBuilder', 'setTaxClassKey', 'create', 'getAssociatedTaxables']) + ->getMock(); + $itemBuilder + ->expects($this->any()) + ->method('getTaxClassKeyBuilder') + ->will($this->returnValue($taxClassKeyBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('setTaxClassKey') + ->will($this->returnValue($itemBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($itemBuilder)); + $itemBuilder + ->expects($this->any()) + ->method('getAssociatedTaxables') + ->will($this->returnValue(null)); + + $regionBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\RegionBuilder') + ->disableOriginalConstructor() + ->setMethods(['setRegionId', 'create']) + ->getMock(); + + $addressBuilder = $this->getMockBuilder('\Magento\Customer\Service\V1\Data\AddressBuilder') + ->disableOriginalConstructor() + ->setMethods(['getRegionBuilder', 'create']) + ->getMock(); + $region = $this->getMock('Magento\Customer\Service\V1\Data\Region', [], [], '', false); + $regionBuilder + ->expects($this->any()) + ->method('setRegionId') + ->will($this->returnValue($regionBuilder)); + $regionBuilder + ->expects($this->any()) + ->method('create') + ->will($this->returnValue($region)); + $addressBuilder + ->expects($this->any()) + ->method('getRegionBuilder') + ->will($this->returnValue($regionBuilder)); + + $product = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false); + $item = $this->getMockBuilder('Magento\Sales\Model\Quote\Item') + ->disableOriginalConstructor() + ->setMethods(['getParentItem', 'getHasChildren', 'getProduct', 'getQuote', 'getCode', '__wakeup']) + ->getMock(); + $item + ->expects($this->any()) + ->method('getParentItem') + ->will($this->returnValue(null)); + $item + ->expects($this->any()) + ->method('getHasChildren') + ->will($this->returnValue(false)); + $item + ->expects($this->any()) + ->method('getCode') + ->will($this->returnValue("1")); + $item + ->expects($this->any()) + ->method('getProduct') + ->will($this->returnValue($product)); + + foreach ($itemData as $key => $value) { + $item->setData($key, $value); + } + + $items = array($item); + $quote = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false); + + $address = $objectManager->getObject('\Magento\Sales\Model\Quote\Address'); + $address = $this->getMockBuilder('\Magento\Sales\Model\Quote\Address') + ->disableOriginalConstructor() + ->setMethods(['getAssociatedTaxables', + 'getQuote', 'getBillingAddress', 'getRegionId', + '__wakeup']) + ->getMock(); + $quote + ->expects($this->any()) + ->method('getBillingAddress') + ->will($this->returnValue($address)); + + $addressData["cached_items_nonnominal"] = $items; + foreach ($addressData as $key => $value) { + $address->setData($key, $value); + } + + $itemDataObjects = $taxTotalsCalcModel->mapQuoteExtraTaxables($itemBuilder, $address, false); + } + + /* + * @return array + */ + public function dataProviderMapQuoteExtraTaxablesArray() + { + $data = [ + 'default' => [ + 'itemData' => [ + "qty" => 1, "price" => 100, "tax_percent" => 20, "product_type" => "simple", + "code" => "sequence-1", "tax_calculation_item_id" => "sequence-1" + ], + 'addressData' => [ + "address_id" => 2, "address_type" => "shipping", "street" => "123 Main Street", + "city" => "New York", "region" => "New York", "region_id" => "43", "postcode" => "10012", + "country_id" => "US", "telephone" => "111-111-1111", "same_as_billing" => "1", + "shipping_method" => "freeshipping_freeshipping", "weight" => 1, "shipping_amount" => 0, + "base_shipping_amount" => 0, + ] + ] + ]; + + return $data; + } + + /** + * Tests the specific method + * + * @param string $itemData + * @param array $addressData + * + * @dataProvider dataProviderFetchArray + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testFetch($appliedTaxesData, $addressData) + { + $objectManager = new ObjectManager($this); + $taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false); + + $taxConfig = $this->getMockBuilder('\Magento\Tax\Model\Config') + ->disableOriginalConstructor() + ->setMethods(['displayCartTaxWithGrandTotal', 'displayCartZeroTax', 'displayCartSubtotalBoth']) + ->getMock(); + $taxConfig + ->expects($this->once()) + ->method('displayCartTaxWithGrandTotal') + ->will($this->returnValue(true)); + $taxConfig + ->expects($this->once()) + ->method('displayCartSubtotalBoth') + ->will($this->returnValue(true)); + + $taxCalculationService = $this->getMock('\Magento\Tax\Service\V1\TaxCalculationService', [], [], '', false); + $quoteDetailsBuilder = $this->getMock('\Magento\Tax\Service\V1\Data\QuoteDetailsBuilder', [], [], '', false); + + $taxTotalsCalcModel = new Tax($taxConfig, $taxCalculationService, $quoteDetailsBuilder, $taxData); + + $appliedTaxes = unserialize($appliedTaxesData); + $store = $this->getMockBuilder('Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->setMethods(['convertPrice', '__wakeup']) + ->getMock(); + $quote = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false); + $items = array(); + + $address = $this->getMockBuilder('\Magento\Sales\Model\Quote\Address') + ->disableOriginalConstructor() + ->setMethods(['getAppliedTaxes', 'getQuote', 'getAllNonNominalItems', 'getGrandTotal', '__wakeup', + 'addTotal', 'getTaxAmount']) + ->getMock(); + $address + ->expects($this->once()) + ->method('getAppliedTaxes') + ->will($this->returnValue($appliedTaxes)); + $address + ->expects($this->any()) + ->method('getQuote') + ->will($this->returnValue($quote)); + $address + ->expects($this->once()) + ->method('getAllNonNominalItems') + ->will($this->returnValue($items)); + $address + ->expects($this->any()) + ->method('getGrandTotal') + ->will($this->returnValue(88)); + $quote + ->expects($this->any()) + ->method('getStore') + ->will($this->returnValue($store)); + $address + ->expects($this->any()) + ->method('getTaxAmount') + ->will($this->returnValue(8)); + + $addressData["cached_items_nonnominal"] = $items; + foreach ($addressData as $key => $value) { + $address->setData($key, $value); + } + + $taxTotalsCalcModel->fetch($address); + } + + /** + * @return array + */ + /* + * @return array + */ + public function dataProviderFetchArray() + { + $appliedDataString = 'a:1:{s:7:"TX Rate";a:9:{s:6:"amount";d:80;s:11:"base_amount";d:80;s:7:"percent";'; + $appliedDataString .= 'd:10;s:2:"id";s:7:"TX Rate";s:5:"rates";a:1:{i:0;a:3:{s:7:"percent";d:10;s:4:"code";'; + $appliedDataString .= 's:7:"TX Rate";s:5:"title";s:7:"TX Rate";}}s:7:"item_id";s:1:"1";s:9:"item_type";'; + $appliedDataString .= 's:7:"product";s:18:"associated_item_id";N;s:7:"process";i:0;}}'; + $data = [ + 'default' => [ + 'appliedTaxesData' => $appliedDataString, + 'addressData' => [ + "address_id" => 2, "address_type" => "shipping", "street" => "123 Main Street", + "city" => "New York", "region" => "New York", "region_id" => "43", "postcode" => "10012", + "country_id" => "US", "telephone" => "111-111-1111", "same_as_billing" => "1", + "shipping_method" => "freeshipping_freeshipping", "weight" => 1, "shipping_amount" => 0, + "base_shipping_amount" => 0, + ] + ] + ]; + + return $data; + } + + /** + * Tests the specific method + */ + public function testGetLabel() + { + $objectManager = new ObjectManager($this); + $taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false); + + $taxConfig = $this->getMock('\Magento\Tax\Model\Config', [], [], '', false); + $taxCalculationService = $this->getMock('\Magento\Tax\Service\V1\TaxCalculationService', [], [], '', false); + $quoteDetailsBuilder = $this->getMock('\Magento\Tax\Service\V1\Data\QuoteDetailsBuilder', [], [], '', false); + + $taxTotalsCalcModel = new Tax($taxConfig, $taxCalculationService, $quoteDetailsBuilder, $taxData); + $this->assertSame($taxTotalsCalcModel->getLabel(), __('Tax')); + } } diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/Di/_files/app/code/Magento/SomeModule/view/frontend/default.xml b/dev/tests/unit/testsuite/Magento/Test/Tools/Di/_files/app/code/Magento/SomeModule/view/frontend/default.xml index 38c24856106c6cdb0cfad275ca64b7e6e0222d44..89b80023e8233b2f94caaebba6bb4556bae34a51 100644 --- a/dev/tests/unit/testsuite/Magento/Test/Tools/Di/_files/app/code/Magento/SomeModule/view/frontend/default.xml +++ b/dev/tests/unit/testsuite/Magento/Test/Tools/Di/_files/app/code/Magento/SomeModule/view/frontend/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../../app/code/Magento/Core/etc/layout_single.xsd"> +<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd"> <referenceBlock name="root"> <block class="Magento\Backend\Block\Menu\Proxy" name="menu" as="menu" template="Magento_Backend::menu.phtml" /> </referenceBlock> diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Html/HeaderTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php similarity index 93% rename from dev/tests/unit/testsuite/Magento/Theme/Block/Html/HeaderTest.php rename to dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php index e6052f03d38070091c15cb6bc05e7bafd0271928..e6302c509d1acbe50ca5e6a55591b8f157998e1d 100644 --- a/dev/tests/unit/testsuite/Magento/Theme/Block/Html/HeaderTest.php +++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php @@ -21,12 +21,12 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Theme\Block\Html; +namespace Magento\Theme\Block\Html\Header; -class HeaderTest extends \PHPUnit_Framework_TestCase +class LogoTest extends \PHPUnit_Framework_TestCase { /** - * @covers \Magento\Theme\Block\Html\Header::getLogoSrc + * @covers \Magento\Theme\Block\Html\Header\Logo::getLogoSrc */ public function testGetLogoSrc() { @@ -65,7 +65,7 @@ class HeaderTest extends \PHPUnit_Framework_TestCase 'fileStorageHelper' => $helper, 'filesystem' => $filesystem ); - $block = $objectManager->getObject('Magento\Theme\Block\Html\Header', $arguments); + $block = $objectManager->getObject('Magento\Theme\Block\Html\Header\Logo', $arguments); $this->assertEquals('http://localhost/pub/media/logo/default/image.gif', $block->getLogoSrc()); } diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php new file mode 100644 index 0000000000000000000000000000000000000000..024deae142a49c8c3c24626c7d5a40646a6b3247 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php @@ -0,0 +1,122 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\UrlRewrite\Block\Catalog\Edit; + +use Magento\TestFramework\Helper\ObjectManager; + +class FormTest extends \PHPUnit_Framework_TestCase +{ + /** @var \Magento\UrlRewrite\Block\Edit\Form */ + protected $form; + + /** @var \Magento\Framework\Data\FormFactory|\PHPUnit_Framework_MockObject_MockObject */ + protected $formFactory; + + /** @var \PHPUnit_Framework_MockObject_MockObject */ + protected $urlRewriteFactory; + + /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */ + protected $productFactory; + + /** @var \Magento\Catalog\Model\CategoryFactory|\PHPUnit_Framework_MockObject_MockObject */ + protected $categoryFactory; + + /** @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */ + protected $layout; + + protected function setUp() + { + $this->layout = $this->getMock('Magento\Framework\View\LayoutInterface'); + $this->formFactory = $this->getMock('Magento\Framework\Data\FormFactory', ['create'], [], '', false); + $this->urlRewriteFactory = $this->getMock('Magento\UrlRewrite\Model\UrlRewriteFactory', ['create']); + $this->urlRewriteFactory->expects($this->once())->method('create') + ->willReturn($this->getMock('Magento\UrlRewrite\Model\UrlRewrite', [], [], '', false)); + $this->categoryFactory = $this->getMock('Magento\Catalog\Model\CategoryFactory', ['create'], [], '', false); + $this->productFactory = $this->getMock('Magento\Catalog\Model\ProductFactory', ['create'], [], '', false); + + $this->form = (new ObjectManager($this))->getObject( + 'Magento\UrlRewrite\Block\Catalog\Edit\Form', + [ + 'layout' => $this->layout, + 'productFactory' => $this->productFactory, + 'categoryFactory' => $this->categoryFactory, + 'formFactory' => $this->formFactory, + 'rewriteFactory' => $this->urlRewriteFactory, + 'data' => ['template' => null], + ] + ); + } + + public function testAddErrorMessageWhenProductWithoutStores() + { + $form = $this->getMock('Magento\Framework\Data\Form', [], [], '', false); + $form->expects($this->any())->method('getElement')->will($this->returnValue( + $this->getMockForAbstractClass('\Magento\Framework\Data\Form\Element\AbstractElement', [], '', false)) + ); + $this->formFactory->expects($this->once()) + ->method('create') + ->will($this->returnValue($form)); + $fieldset = $this->getMock('Magento\Framework\Data\Form\Element\Fieldset', [], [], '', false); + $form->expects($this->once()) + ->method('addFieldset') + ->will($this->returnValue($fieldset)); + $storeElement = $this->getMock( + 'Magento\Framework\Data\Form\Element\AbstractElement', + ['setAfterElementHtml', 'setValues'], + [], + '', + false + ); + $fieldset->expects($this->at(2)) + ->method('addField') + ->with( + 'store_id', + 'select', + [ + 'label' => 'Store', + 'title' => 'Store', + 'name' => 'store_id', + 'required' => true, + 'value' => 0 + ] + ) + ->willReturn($storeElement); + + $product = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false); + $product->expects($this->any())->method('getId')->willReturn('product_id'); + $product->expects($this->once())->method('getStoreIds')->willReturn([]); + $this->productFactory->expects($this->once())->method('create')->willReturn($product); + $this->categoryFactory->expects($this->once())->method('create') + ->willReturn($this->getMock('Magento\Catalog\Model\Category', [], [], '', false)); + + $storeElement->expects($this->once())->method('setAfterElementHtml'); + $storeElement->expects($this->once())->method('setValues')->with([]); + + $this->layout->expects($this->once())->method('createBlock') + ->willReturn($this->getMock('Magento\Framework\Data\Form\Element\Renderer\RendererInterface')); + + $this->form->toHtml(); + } +} diff --git a/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php index 29756dcb4b4164546db906ab87c1b7b2e7d17a56..3ddeed9a4ff93ca5096ca8b0fdc238843b7750ae 100644 --- a/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php +++ b/dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php @@ -23,8 +23,19 @@ */ namespace Magento\Weee\Helper; +use Magento\Weee\Helper\Data as WeeeHelper; + class DataTest extends \PHPUnit_Framework_TestCase { + const ROW_AMOUNT_INVOICED = '200'; + const BASE_ROW_AMOUNT_INVOICED = '400'; + const TAX_AMOUNT_INVOICED = '20'; + const BASE_TAX_AMOUNT_INVOICED = '40'; + const ROW_AMOUNT_REFUNDED = '100'; + const BASE_ROW_AMOUNT_REFUNDED = '201'; + const TAX_AMOUNT_REFUNDED = '10'; + const BASE_TAX_AMOUNT_REFUNDED = '21'; + /** * @var \Magento\Catalog\Model\Product */ @@ -54,4 +65,90 @@ class DataTest extends \PHPUnit_Framework_TestCase { $this->assertEquals('11.26', $this->_helperData->getAmount($this->_product)); } + + /** + * @return \Magento\Sales\Model\Order\Item|\PHPUnit_Framework_MockObject_MockObject + */ + private function setupOrderItem() + { + $orderItem = $this->getMockBuilder('\Magento\Sales\Model\Order\Item') + ->disableOriginalConstructor() + ->setMethods(['__wakeup']) + ->getMock(); + + $orderItem->setData( + 'weee_tax_applied', + serialize( + [ + [ + WeeeHelper::KEY_WEEE_AMOUNT_INVOICED => self::ROW_AMOUNT_INVOICED, + WeeeHelper::KEY_BASE_WEEE_AMOUNT_INVOICED => self::BASE_ROW_AMOUNT_INVOICED, + WeeeHelper::KEY_WEEE_TAX_AMOUNT_INVOICED => self::TAX_AMOUNT_INVOICED, + WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_INVOICED => self::BASE_TAX_AMOUNT_INVOICED, + WeeeHelper::KEY_WEEE_AMOUNT_REFUNDED => self::ROW_AMOUNT_REFUNDED, + WeeeHelper::KEY_BASE_WEEE_AMOUNT_REFUNDED => self::BASE_ROW_AMOUNT_REFUNDED, + WeeeHelper::KEY_WEEE_TAX_AMOUNT_REFUNDED => self::TAX_AMOUNT_REFUNDED, + WeeeHelper::KEY_BASE_WEEE_TAX_AMOUNT_REFUNDED => self::BASE_TAX_AMOUNT_REFUNDED, + ], + ] + ) + ); + return $orderItem; + } + + public function testGetWeeeAmountInvoiced() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getWeeeAmountInvoiced($orderItem); + $this->assertEquals(self::ROW_AMOUNT_INVOICED, $value); + } + + public function testGetBaseWeeeAmountInvoiced() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getBaseWeeeAmountInvoiced($orderItem); + $this->assertEquals(self::BASE_ROW_AMOUNT_INVOICED, $value); + } + + public function testGetWeeeTaxAmountInvoiced() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getWeeeTaxAmountInvoiced($orderItem); + $this->assertEquals(self::TAX_AMOUNT_INVOICED, $value); + } + + public function testGetWeeeBaseTaxAmountInvoiced() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getBaseWeeeTaxAmountInvoiced($orderItem); + $this->assertEquals(self::BASE_TAX_AMOUNT_INVOICED, $value); + } + + public function testGetWeeeAmountRefunded() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getWeeeAmountRefunded($orderItem); + $this->assertEquals(self::ROW_AMOUNT_REFUNDED, $value); + } + + public function testGetBaseWeeeAmountRefunded() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getBaseWeeeAmountRefunded($orderItem); + $this->assertEquals(self::BASE_ROW_AMOUNT_REFUNDED, $value); + } + + public function testGetWeeeTaxAmountRefunded() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getWeeeTaxAmountRefunded($orderItem); + $this->assertEquals(self::TAX_AMOUNT_REFUNDED, $value); + } + + public function testGetBaseWeeeTaxAmountRefunded() + { + $orderItem = $this->setupOrderItem(); + $value = $this->_helperData->getBaseWeeeTaxAmountRefunded($orderItem); + $this->assertEquals(self::BASE_TAX_AMOUNT_REFUNDED, $value); + } } diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php new file mode 100644 index 0000000000000000000000000000000000000000..ad65d82c1176efc6435569b25a278e25e4c7eae2 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php @@ -0,0 +1,515 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Weee\Model\Total\Creditmemo; + +use \Magento\Framework\Object as MagentoObject; + +class WeeeTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Weee\Model\Total\Creditmemo\Weee + */ + protected $model; + + /** + * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject + */ + protected $order; + + /** + * @var \Magento\TestFramework\Helper\ObjectManager + */ + protected $objectManager; + + /** + * @var \Magento\Sales\Model\Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject + */ + protected $creditmemo; + + /** + * @var \Magento\Sales\Model\Order\Invoice|\PHPUnit_Framework_MockObject_MockObject + */ + protected $invoice; + + /** + * @var \Magento\Weee\Helper\Data|\PHPUnit_Framework_MockObject_MockObject + */ + protected $weeeData; + + public function setUp() + { + $this->weeeData = $this->getMockBuilder('\Magento\Weee\Helper\Data') + ->setMethods( + [ + 'getRowWeeeTaxInclTax', + 'getBaseRowWeeeTaxInclTax', + 'getWeeeAmountInvoiced', + 'getBaseWeeeAmountInvoiced', + 'getWeeeAmountRefunded', + 'getBaseWeeeAmountRefunded', + 'getWeeeTaxAmountInvoiced', + 'getBaseWeeeTaxAmountInvoiced', + 'getWeeeTaxAmountRefunded', + 'getBaseWeeeTaxAmountRefunded', + 'getApplied', + 'setApplied', + 'includeInSubtotal', + ] + )->disableOriginalConstructor() + ->getMock(); + + $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); + /** @var \Magento\Sales\Model\Order\Invoice\Total\Tax $model */ + $this->model = $this->objectManager->getObject( + 'Magento\Weee\Model\Total\Creditmemo\Weee', + [ + 'weeeData' => $this->weeeData, + ] + ); + + $this->order = $this->getMock( + '\Magento\Sales\Model\Order', + array( + '__wakeup' + ), + array(), + '', + false + ); + + $this->creditmemo = $this->getMock( + '\Magento\Sales\Model\Order\Creditmemo', + array( + 'getAllItems', + 'getInvoice', + 'roundPrice', + 'getStore', + '__wakeup', + ), + array(), + '', + false + ); + } + + /** + * @param array $creditmemoData + * @param array $expectedResults + * @dataProvider collectDataProvider + */ + public function testCollect($creditmemoData, $expectedResults) + { + $roundingDelta = []; + + //Set up weeeData mock + $this->weeeData->expects($this->once()) + ->method('includeInSubtotal') + ->will($this->returnValue($creditmemoData['include_in_subtotal'])); + + //Set up invoice mock + /** @var \Magento\Sales\Model\Order\Invoice\Item[] $creditmemoItems */ + $creditmemoItems = []; + foreach ($creditmemoData['items'] as $itemKey => $creditmemoItemData) { + $creditmemoItems[$itemKey] = $this->getInvoiceItem($creditmemoItemData); + } + $this->creditmemo->expects($this->once()) + ->method('getAllItems') + ->will($this->returnValue($creditmemoItems)); + foreach ($creditmemoData['data_fields'] as $key => $value) { + $this->creditmemo->setData($key, $value); + } + $this->creditmemo->expects($this->any()) + ->method('roundPrice') + ->will($this->returnCallback( + function ($price, $type, $negative) use (&$roundingDelta) { + if (!isset($roundingDelta[$type])) { + $roundingDelta[$type] = 0; + } + $roundedPrice = round($price + $roundingDelta[$type], 2); + $roundingDelta[$type] = $price - $roundedPrice; + return $roundedPrice; + } + )); + + $this->model->collect($this->creditmemo); + + //verify invoice data + foreach ($expectedResults['creditmemo_data'] as $key => $value) { + $this->assertEquals( + $value, + $this->creditmemo->getData($key), + 'Creditmemo data field ' . $key . ' is incorrect' + ); + } + //verify invoice item data + foreach ($expectedResults['creditmemo_items'] as $itemKey => $itemData) { + $creditmemoItem = $creditmemoItems[$itemKey]; + foreach ($itemData as $key => $value) { + $this->assertEquals( + $value, + $creditmemoItem->getData($key), + 'Creditmemo item field ' . $key . ' is incorrect' + ); + } + } + } + + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @return array + */ + public function collectDataProvider() + { + $result = []; + // scenario 1: 3 item_1, $100 with $weee, 8.25 tax rate, 3 items invoiced, full creditmemo + $result['complete_creditmemo'] = [ + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 30, + 'base_weee_amount_invoiced' => 30, + 'weee_amount_refunded' => 0, + 'base_weee_amount_refunded' => 0, + 'weee_tax_amount_invoiced' => 2.47, + 'base_weee_tax_amount_invoiced' => 2.47, + 'weee_tax_amount_refunded' => 0, + 'base_weee_tax_amount_refunded' => 0, + 'applied_weee' => [ + [], + ], + 'qty_invoiced' => 3, + ], + 'is_last' => true, + 'data_fields' => [ + 'qty' => 3, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 300, + 'base_grand_total' => 300, + 'subtotal' => 300, + 'base_subtotal' => 300, + 'subtotal_incl_tax' => 324.75, + 'base_subtotal_incl_tax' => 324.75, + 'tax_amount' => 0, + 'base_tax_amount' => 0 + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 30, + 'row_amount' => 30, + 'base_row_amount_incl_tax' => 32.47, + 'row_amount_incl_tax' => 32.47, + ] + ], + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amount' => 30, + + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 332.47, + 'base_grand_total' => 332.47, + 'tax_amount' => 2.47, + 'base_tax_amount' => 2.47, + 'subtotal' => 300, + 'base_subtotal' => 300, + 'subtotal_incl_tax' => 357.22, + 'base_subtotal_incl_tax' => 357.22, + + ], + ] + ]; + + // Scenario 2: 3 item_1, $100 with $weee, 8.25 tax rate, 3 items invoiced, 2 item creditmemo + $result['partial_creditmemo'] = [ + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 30, + 'base_weee_amount_invoiced' => 30, + 'weee_amount_refunded' => 0, + 'base_weee_amount_refunded' => 0, + 'weee_tax_amount_invoiced' => 2.47, + 'base_weee_tax_amount_invoiced' => 2.47, + 'weee_tax_amount_refunded' => 0, + 'base_weee_tax_amount_refunded' => 0, + 'applied_weee' => [ + [], + ], + 'qty_invoiced' => 3, + ], + 'is_last' => false, + 'data_fields' => [ + 'qty' => 2, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 200, + 'base_grand_total' => 200, + 'subtotal' => 200, + 'base_subtotal' => 200, + 'subtotal_incl_tax' => 216.5, + 'base_subtotal_incl_tax' => 216.5, + 'tax_amount' => 0, + 'base_tax_amount' => 0 + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 20, + 'row_amount' => 20, + 'base_row_amount_incl_tax' => 21.65, + 'row_amount_incl_tax' => 21.65, + ] + ], + 'weee_tax_applied_row_amount' => 20, + 'base_weee_tax_applied_row_amount' => 20, + + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 221.65, + 'base_grand_total' => 221.65, + 'tax_amount' => 1.65, + 'base_tax_amount' => 1.65, + 'subtotal' => 200, + 'base_subtotal' => 200, + 'subtotal_incl_tax' => 238.15, + 'base_subtotal_incl_tax' => 238.15, + + ], + ] + ]; + + // Scenario 3: 3 item_1, $100 with $weee, 8.25 tax rate, 3 items invoiced, 2 item returned + $result['last_partial_creditmemo'] = [ + 'creditmemo_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 30, + 'base_weee_amount_invoiced' => 30, + 'weee_amount_refunded' => 20, + 'base_weee_amount_refunded' => 20, + 'weee_tax_amount_invoiced' => 2.47, + 'base_weee_tax_amount_invoiced' => 2.47, + 'weee_tax_amount_refunded' => 1.64, + 'base_weee_tax_amount_refunded' => 1.64, + 'applied_weee' => [ + [], + ], + 'qty_invoiced' => 3, + ], + 'is_last' => true, + 'data_fields' => [ + 'qty' => 1, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 100, + 'base_grand_total' => 100, + 'subtotal' => 100, + 'base_subtotal' => 100, + 'subtotal_incl_tax' => 108.25, + 'base_subtotal_incl_tax' => 108.25, + 'tax_amount' => 0, + 'base_tax_amount' => 0 + ], + ], + 'expected_results' => [ + 'creditmemo_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 10, + 'row_amount' => 10, + 'base_row_amount_incl_tax' => 10.82, + 'row_amount_incl_tax' => 10.82, + ] + ], + 'weee_tax_applied_row_amount' => 10, + 'base_weee_tax_applied_row_amount' => 10, + + ], + ], + 'creditmemo_data' => [ + 'grand_total' => 110.83, + 'base_grand_total' => 110.83, + 'tax_amount' => 0.83, + 'base_tax_amount' => 0.83, + 'subtotal' => 100, + 'base_subtotal' => 100, + 'subtotal_incl_tax' => 119.07, + 'base_subtotal_incl_tax' => 119.07, + + ], + ] + ]; + return $result; + } + + /** + * @param $creditmemoItemData array + * @return \Magento\Sales\Model\Order\Creditmemo\Item|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getInvoiceItem($creditmemoItemData) + { + /** @var \Magento\Sales\Model\Order\Item|\PHPUnit_Framework_MockObject_MockObject $orderItem */ + $orderItem = $this->getMock( + '\Magento\Sales\Model\Order\Item', + array( + 'isDummy', + '__wakeup' + ), + array(), + '', + false + ); + foreach ($creditmemoItemData['order_item'] as $key => $value) { + $orderItem->setData($key, $value); + } + + $this->weeeData->expects($this->once()) + ->method('getRowWeeeTaxInclTax') + ->with($orderItem) + ->will($this->returnValue($orderItem->getRowWeeeTaxInclTax())); + $this->weeeData->expects($this->once()) + ->method('getBaseRowWeeeTaxInclTax') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseRowWeeeTaxInclTax())); + $this->weeeData->expects($this->once()) + ->method('getWeeeAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getWeeeAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getBaseWeeeAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseWeeeAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getWeeeTaxAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getWeeeTaxAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getBaseWeeeTaxAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseWeeeTaxAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getWeeeAmountRefunded') + ->with($orderItem) + ->will($this->returnValue($orderItem->getWeeeAmountRefunded())); + $this->weeeData->expects($this->once()) + ->method('getBaseWeeeAmountRefunded') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseWeeeAmountRefunded())); + $this->weeeData->expects($this->once()) + ->method('getWeeeTaxAmountRefunded') + ->with($orderItem) + ->will($this->returnValue($orderItem->getWeeeTaxAmountRefunded())); + $this->weeeData->expects($this->once()) + ->method('getBaseWeeeTaxAmountRefunded') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseWeeeTaxAmountRefunded())); + + /** @var \Magento\Sales\Model\Order\Invoice\Item|\PHPUnit_Framework_MockObject_MockObject $invoiceItem */ + $invoiceItem = $this->getMock( + '\Magento\Sales\Model\Order\Invoice\Item', + array( + 'getOrderItem', + 'isLast', + '__wakeup' + ), + array(), + '', + false + ); + $invoiceItem->expects($this->any())->method('getOrderItem')->will($this->returnValue($orderItem)); + $invoiceItem->expects($this->any()) + ->method('isLast') + ->will($this->returnValue($creditmemoItemData['is_last'])); + foreach ($creditmemoItemData['data_fields'] as $key => $value) { + $invoiceItem->setData($key, $value); + } + + $this->weeeData->expects($this->any()) + ->method('getApplied') + ->will($this->returnCallback( + function ($item) { + return $item->getAppliedWeee(); + } + )); + + $this->weeeData->expects($this->any()) + ->method('setApplied') + ->will($this->returnCallback( + function ($item, $weee) { + return $item->setAppliedWeee($weee); + } + )); + + return $invoiceItem; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php new file mode 100644 index 0000000000000000000000000000000000000000..1894ef078d0673eb63c224c7fd7359567097f63f --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php @@ -0,0 +1,659 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Weee\Model\Total\Invoice; + +use \Magento\Framework\Object as MagentoObject; + +class WeeeTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Weee\Model\Total\Invoice\Weee + */ + protected $model; + + /** + * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject + */ + protected $order; + + /** + * @var \Magento\TestFramework\Helper\ObjectManager + */ + protected $objectManager; + + /** + * @var \Magento\Sales\Model\Order\Invoice|\PHPUnit_Framework_MockObject_MockObject + */ + protected $invoice; + + /** + * @var \Magento\Weee\Helper\Data|\PHPUnit_Framework_MockObject_MockObject + */ + protected $weeeData; + + public function setUp() + { + $this->weeeData = $this->getMockBuilder('\Magento\Weee\Helper\Data') + ->setMethods( + [ + 'getRowWeeeTaxInclTax', + 'getBaseRowWeeeTaxInclTax', + 'getWeeeAmountInvoiced', + 'getBaseWeeeAmountInvoiced', + 'getWeeeTaxAmountInvoiced', + 'getBaseWeeeTaxAmountInvoiced', + 'getApplied', + 'setApplied', + 'includeInSubtotal', + ] + )->disableOriginalConstructor() + ->getMock(); + + $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); + /** @var \Magento\Sales\Model\Order\Invoice\Total\Tax $model */ + $this->model = $this->objectManager->getObject( + 'Magento\Weee\Model\Total\Invoice\Weee', + [ + 'weeeData' => $this->weeeData, + ] + ); + + $this->order = $this->getMock( + '\Magento\Sales\Model\Order', + array( + '__wakeup' + ), + array(), + '', + false + ); + + $this->invoice = $this->getMock( + '\Magento\Sales\Model\Order\Invoice', + array( + 'getAllItems', + 'getOrder', + 'roundPrice', + 'isLast', + 'getStore', + '__wakeup', + ), + array(), + '', + false + ); + $this->invoice->expects($this->atLeastOnce())->method('getOrder')->will($this->returnValue($this->order)); + } + + private function setupOrder($orderData) + { + //Set up order mock + foreach ($orderData['data_fields'] as $key => $value) { + $this->order->setData($key, $value); + } + } + + /** + * @param array $orderData + * @param array $invoiceData + * @param array $expectedResults + * @dataProvider collectDataProvider + */ + public function testCollect($orderData, $invoiceData, $expectedResults) + { + $roundingDelta = []; + + $this->setupOrder($orderData); + + //Set up weeeData mock + $this->weeeData->expects($this->once()) + ->method('includeInSubtotal') + ->will($this->returnValue($invoiceData['include_in_subtotal'])); + + //Set up invoice mock + /** @var \Magento\Sales\Model\Order\Invoice\Item[] $invoiceItems */ + $invoiceItems = []; + foreach ($invoiceData['items'] as $itemKey => $invoiceItemData) { + $invoiceItems[$itemKey] = $this->getInvoiceItem($invoiceItemData); + } + $this->invoice->expects($this->once()) + ->method('getAllItems') + ->will($this->returnValue($invoiceItems)); + $this->invoice->expects($this->once()) + ->method('isLast') + ->will($this->returnValue($invoiceData['is_last'])); + foreach ($invoiceData['data_fields'] as $key => $value) { + $this->invoice->setData($key, $value); + } + $this->invoice->expects($this->any()) + ->method('roundPrice') + ->will($this->returnCallback( + function ($price, $type, $negative) use (&$roundingDelta) { + if (!isset($roundingDelta[$type])) { + $roundingDelta[$type] = 0; + } + $roundedPrice = round($price + $roundingDelta[$type], 2); + $roundingDelta[$type] = $price - $roundedPrice; + return $roundedPrice; + } + )); + + $this->model->collect($this->invoice); + + //verify invoice data + foreach ($expectedResults['invoice_data'] as $key => $value) { + $this->assertEquals($value, $this->invoice->getData($key), 'Invoice data field ' . $key . ' is incorrect'); + } + //verify invoice item data + foreach ($expectedResults['invoice_items'] as $itemKey => $itemData) { + $invoiceItem = $invoiceItems[$itemKey]; + foreach ($itemData as $key => $value) { + $this->assertEquals( + $value, + $invoiceItem->getData($key), + 'Invoice item field ' . $key . ' is incorrect' + ); + } + } + } + + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @return array + */ + public function collectDataProvider() + { + $result = []; + // 3 item_1, $100 with $weee, 8.25 tax rate, full invoice + $result['complete_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + ], + 'data_fields' => [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 16.09, + 'tax_invoiced' => 0, + 'base_tax_amount' => 16.09, + 'base_tax_amount_invoiced' => 0, + 'subtotal' => '300', + 'base_subtotal' => '300', + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 0, + 'base_weee_amount_invoiced' => 0, + 'weee_tax_amount_invoiced' => 0, + 'base_weee_tax_amount_invoiced' => 0, + 'applied_weee' => [ + [], + ], + 'applied_weee_updated' => [ + 'base_row_amount_invoiced' => 30, + 'row_amount_invoiced' => 30, + 'base_tax_amount_invoiced' => 2.47, + 'tax_amount_invoiced' => 2.47, + ], + 'qty_invoiced' => 0, + ], + 'is_last' => true, + 'data_fields' => [ + 'qty' => 3, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'is_last' => true, + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 181.09, + 'base_grand_total' => 181.09, + 'subtotal' => 300, + 'base_subtotal' => 300, + 'subtotal_incl_tax' => 314.85, + 'base_subtotal_incl_tax' => 314.85, + 'tax_amount' => 16.09, + 'base_tax_amount' => 16.09 + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 30, + 'row_amount' => 30, + 'base_row_amount_incl_tax' => 32.47, + 'row_amount_incl_tax' => 32.47, + ] + ], + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amount' => 30, + + ], + ], + 'invoice_data' => [ + 'grand_total' => 211.09, + 'base_grand_total' => 211.09, + 'tax_amount' => 16.09, + 'base_tax_amount' => 16.09, + 'subtotal' => 300, + 'base_subtotal' => 300, + 'subtotal_incl_tax' => 344.85, + 'base_subtotal_incl_tax' => 344.85, + + ], + ] + ]; + + // 3 item_1, $100 with $weee, 8.25 tax rate, partial invoice, invoice qty=2 + $result['partial_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + ], + 'data_fields' => [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 16.09, + 'tax_invoiced' => 0, + 'base_tax_amount' => 16.09, + 'base_tax_amount_invoiced' => 0, + 'subtotal' => '300', + 'base_subtotal' => '300', + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 0, + 'base_weee_amount_invoiced' => 0, + 'weee_tax_amount_invoiced' => 0, + 'base_weee_tax_amount_invoiced' => 0, + 'applied_weee' => [ + [], + ], + 'applied_weee_updated' => [ + 'base_row_amount_invoiced' => 30, + 'row_amount_invoiced' => 30, + 'base_tax_amount_invoiced' => 2.47, + 'tax_amount_invoiced' => 2.47, + ], + 'qty_invoiced' => 0, + ], + 'is_last' => false, + 'data_fields' => [ + 'qty' => 2, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'is_last' => false, + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 124.49, + 'base_grand_total' => 124.49, + 'subtotal' => 200, + 'base_subtotal' => 200, + 'subtotal_incl_tax' => 216.5, + 'base_subtotal_incl_tax' => 216.5, + 'tax_amount' => 9.49, + 'base_tax_amount' => 9.49 + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 20, + 'row_amount' => 20, + 'base_row_amount_incl_tax' => 21.65, + 'row_amount_incl_tax' => 21.65, + ] + ], + 'weee_tax_applied_row_amount' => 20, + 'base_weee_tax_applied_row_amount' => 20, + + ], + ], + 'invoice_data' => [ + 'grand_total' => 146.14, + 'base_grand_total' => 146.14, + 'tax_amount' => 11.14, + 'base_tax_amount' => 11.14, + 'subtotal' => 200, + 'base_subtotal' => 200, + 'subtotal_incl_tax' => 238.15, + 'base_subtotal_incl_tax' => 238.15, + + ], + ] + ]; + + // 3 item_1, $100 with $weee, 8.25 tax rate, partial invoice: one item invoiced + // invoice another item + $result['second_partial_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + ], + 'data_fields' => [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 16.09, + 'tax_invoiced' => 0, + 'base_tax_amount' => 16.09, + 'base_tax_amount_invoiced' => 0, + 'subtotal' => '300', + 'base_subtotal' => '300', + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 0, + 'base_weee_amount_invoiced' => 0, + 'weee_tax_amount_invoiced' => 0, + 'base_weee_tax_amount_invoiced' => 0, + 'applied_weee' => [ + [ + ], + ], + 'applied_weee_updated' => [ + 'base_row_amount_invoiced' => 30, + 'row_amount_invoiced' => 30, + 'base_tax_amount_invoiced' => 2.47, + 'tax_amount_invoiced' => 2.47, + ], + 'qty_invoiced' => 1, + ], + 'is_last' => false, + 'data_fields' => [ + 'qty' => 1, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'is_last' => false, + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 54.13, + 'base_grand_total' => 54.13, + 'tax_amount' => 4.13, + 'base_tax_amount' => 4.13, + 'subtotal' => 100, + 'base_subtotal' => 100, + 'subtotal_incl_tax' => 108.25, + 'base_subtotal_incl_tax' => 108.25, + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 10, + 'row_amount' => 10, + 'base_row_amount_incl_tax' => 10.82, + 'row_amount_incl_tax' => 10.82, + ] + ], + 'weee_tax_applied_row_amount' => 10, + 'base_weee_tax_applied_row_amount' => 10, + + ], + ], + 'invoice_data' => [ + 'grand_total' => 64.95, + 'base_grand_total' => 64.95, + 'tax_amount' => 4.95, + 'base_tax_amount' => 4.95, + 'subtotal' => 100, + 'base_subtotal' => 100, + 'subtotal_incl_tax' => 119.07, + 'base_subtotal_incl_tax' => 119.07, + + ], + ] + ]; + + // 3 item_1, $100 with $weee, 8.25 tax rate, partial invoice: two item invoiced + // invoice another item + $result['last_partial_invoice'] = [ + 'order_data' => [ + 'previous_invoices' => [ + ], + 'data_fields' => [ + 'shipping_tax_amount' => 1.24, + 'base_shipping_tax_amount' => 1.24, + 'shipping_hidden_tax_amount' => 0, + 'base_shipping_hidden_tax_amount' => 0, + 'tax_amount' => 16.09, + 'tax_invoiced' => 11.14, + 'base_tax_amount' => 16.09, + 'base_tax_invoiced' => 11.14, + 'subtotal' => '300', + 'base_subtotal' => '300', + ], + ], + 'invoice_data' => [ + 'items' => [ + 'item_1' =>[ + 'order_item' => [ + 'qty_ordered' => 3, + 'weee_tax_applied_row_amount' => 30, + 'base_weee_tax_applied_row_amnt' => 30, + 'row_weee_tax_incl_tax' => 32.47, + 'base_row_weee_tax_incl_tax' => 32.47, + 'weee_amount_invoiced' => 20, + 'base_weee_amount_invoiced' => 20, + 'weee_tax_amount_invoiced' => 1.64, + 'base_weee_tax_amount_invoiced' => 1.64, + 'applied_weee' => [ + [ + ], + ], + 'applied_weee_updated' => [ + 'base_row_amount_invoiced' => 30, + 'row_amount_invoiced' => 30, + 'base_tax_amount_invoiced' => 2.47, + 'tax_amount_invoiced' => 2.47, + ], + 'qty_invoiced' => 2, + ], + 'is_last' => true, + 'data_fields' => [ + 'qty' => 1, + 'applied_weee' => [ + [ + ], + ] + ] + ], + ], + 'is_last' => true, + 'include_in_subtotal' => false, + 'data_fields' => [ + 'grand_total' => 54.95, + 'base_grand_total' => 54.95, + 'tax_amount' => 4.95, + 'base_tax_amount' => 4.95, + 'subtotal' => 100, + 'base_subtotal' => 100, + 'subtotal_incl_tax' => 104.95, + 'base_subtotal_incl_tax' => 104.95, + ], + ], + 'expected_results' => [ + 'invoice_items' => [ + 'item_1' => [ + 'applied_weee' => [ + [ + 'base_row_amount' => 10, + 'row_amount' => 10, + 'base_row_amount_incl_tax' => 10.82, + 'row_amount_incl_tax' => 10.82, + ] + ], + 'weee_tax_applied_row_amount' => 10, + 'base_weee_tax_applied_row_amount' => 10, + + ], + ], + 'invoice_data' => [ + 'grand_total' => 64.95, + 'base_grand_total' => 64.95, + 'tax_amount' => 4.95, + 'base_tax_amount' => 4.95, + 'subtotal' => 100, + 'base_subtotal' => 100, + 'subtotal_incl_tax' => 114.95, + 'base_subtotal_incl_tax' => 114.95, + + ], + ] + ]; + return $result; + } + + /** + * @param $invoiceItemData array + * @return \Magento\Sales\Model\Order\Invoice\Item|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getInvoiceItem($invoiceItemData) + { + /** @var \Magento\Sales\Model\Order\Item|\PHPUnit_Framework_MockObject_MockObject $orderItem */ + $orderItem = $this->getMock( + '\Magento\Sales\Model\Order\Item', + array( + 'isDummy', + '__wakeup' + ), + array(), + '', + false + ); + foreach ($invoiceItemData['order_item'] as $key => $value) { + $orderItem->setData($key, $value); + } + + $this->weeeData->expects($this->once()) + ->method('getRowWeeeTaxInclTax') + ->with($orderItem) + ->will($this->returnValue($orderItem->getRowWeeeTaxInclTax())); + $this->weeeData->expects($this->once()) + ->method('getBaseRowWeeeTaxInclTax') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseRowWeeeTaxInclTax())); + if ($invoiceItemData['is_last']) { + $this->weeeData->expects($this->once()) + ->method('getWeeeAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getWeeeAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getBaseWeeeAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseWeeeAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getWeeeTaxAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getWeeeTaxAmountInvoiced())); + $this->weeeData->expects($this->once()) + ->method('getBaseWeeeTaxAmountInvoiced') + ->with($orderItem) + ->will($this->returnValue($orderItem->getBaseWeeeTaxAmountInvoiced())); + } + /** @var \Magento\Sales\Model\Order\Invoice\Item|\PHPUnit_Framework_MockObject_MockObject $invoiceItem */ + $invoiceItem = $this->getMock( + '\Magento\Sales\Model\Order\Invoice\Item', + array( + 'getOrderItem', + 'isLast', + '__wakeup' + ), + array(), + '', + false + ); + $invoiceItem->expects($this->any())->method('getOrderItem')->will($this->returnValue($orderItem)); + $invoiceItem->expects($this->any()) + ->method('isLast') + ->will($this->returnValue($invoiceItemData['is_last'])); + foreach ($invoiceItemData['data_fields'] as $key => $value) { + $invoiceItem->setData($key, $value); + } + + $this->weeeData->expects($this->any()) + ->method('getApplied') + ->will($this->returnCallback( + function ($item) { + return $item->getAppliedWeee(); + } + )); + + $this->weeeData->expects($this->any()) + ->method('setApplied') + ->will($this->returnCallback( + function ($item, $weee) { + return $item->setAppliedWeee($weee); + } + )); + + return $invoiceItem; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Item/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Item/ConfigureTest.php index 557df301cb81624ee73952602eb0a0f26b0b6ba3..d8eec8eb601d656d474e725cbbf16907cbc85b34 100644 --- a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Item/ConfigureTest.php +++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Item/ConfigureTest.php @@ -75,10 +75,121 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase 'registry' )->with( $this->equalTo('product') - )->will( - $this->returnValue($product) + )->willReturn( + $product ); $this->assertEquals($product, $this->_model->getProduct()); } + + public function testSetLayout() + { + $layoutMock = $this->getMock( + 'Magento\Framework\View\LayoutInterface', + [], + [], + '', + false + ); + + $blockMock = $this->getMock( + 'Magento\Framework\View\Element\AbstractBlock', + ['setCustomAddToCartUrl'], + [], + '', + false + ); + $layoutMock->expects($this->once()) + ->method('getBlock') + ->with('product.info') + ->will($this->returnValue($blockMock)); + + $itemMock = $this->getMock( + 'Magento\Wishlist\Model\Item', + [], + [], + '', + false + ); + + $this->_mockRegistry->expects($this->exactly(2)) + ->method('registry') + ->with('wishlist_item') + ->willReturn($itemMock); + + $this->_mockWishlistData->expects($this->once()) + ->method('getAddToCartUrl') + ->with($itemMock) + ->willReturn('some_url'); + + $blockMock->expects($this->once()) + ->method('setCustomAddToCartUrl') + ->with('some_url'); + + $this->assertEquals($this->_model, $this->_model->setLayout($layoutMock)); + $this->assertEquals($layoutMock, $this->_model->getLayout()); + } + + public function testSetLayoutWithNoItem() + { + $layoutMock = $this->getMock( + 'Magento\Framework\View\LayoutInterface', + [], + [], + '', + false + ); + + $blockMock = $this->getMock( + 'Magento\Framework\View\Element\AbstractBlock', + ['setCustomAddToCartUrl'], + [], + '', + false + ); + $layoutMock->expects($this->once()) + ->method('getBlock') + ->with('product.info') + ->willReturn($blockMock); + + $this->_mockRegistry->expects($this->exactly(1)) + ->method('registry') + ->with('wishlist_item') + ->willReturn(null); + + $this->_mockWishlistData->expects($this->never()) + ->method('getAddToCartUrl'); + + $blockMock->expects($this->never()) + ->method('setCustomAddToCartUrl'); + + $this->assertEquals($this->_model, $this->_model->setLayout($layoutMock)); + $this->assertEquals($layoutMock, $this->_model->getLayout()); + } + + + public function testSetLayoutWithNoBlockAndItem() + { + $layoutMock = $this->getMock( + 'Magento\Framework\View\LayoutInterface', + [], + [], + '', + false + ); + + $layoutMock->expects($this->once()) + ->method('getBlock') + ->with('product.info') + ->willReturn(null); + + $this->_mockRegistry->expects($this->never()) + ->method('registry'); + + $this->_mockWishlistData->expects($this->never()) + ->method('getAddToCartUrl'); + + $this->assertEquals($this->_model, $this->_model->setLayout($layoutMock)); + $this->assertEquals($layoutMock, $this->_model->getLayout()); + } } diff --git a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php index 2e42f97bdfa9c28320d15f938495f919994087c0..adddc9928605e6328f1be382d5da669b2deee0b6 100644 --- a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php +++ b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php @@ -132,7 +132,7 @@ return array( 'catalogrule/website' => 'catalogrule_website', 'catalogsearch/fulltext' => 'catalogsearch_fulltext', 'catalogsearch/result' => 'catalogsearch_result', - 'catalogsearch/search_query' => 'catalogsearch_query', + 'catalogsearch/search_query' => 'search_query', 'checkout/agreement' => 'checkout_agreement', 'checkout/agreement_store' => 'checkout_agreement_store', 'chronopay/api_debug' => 'chronopay_api_debug', diff --git a/dev/tools/performance-toolkit/README.txt b/dev/tools/performance-toolkit/README.txt new file mode 100644 index 0000000000000000000000000000000000000000..f4bf6427b5f14935dbaf419bb988b44a29bf5b96 --- /dev/null +++ b/dev/tools/performance-toolkit/README.txt @@ -0,0 +1,95 @@ +Performance Toolkit +============= + +Installation +----------- +jMeter: +-- go to http://jmeter.apache.org/download_jmeter.cgi and download jMeter in Source section (pay you attention that Java 6 or later is required) +-- unzip archive + +Plugins (only if you want to use additional reports (like graphs)): +-- go to http://jmeter-plugins.org/downloads/all/ and download JMeterPlugins-Standard and JMeterPlugins-Extras +-- unzip them to appropriate ext directory of your jMeter instance. + + +Usage +----------- + +1. Run via console +Scenario can accept 5 parameters that are described bellow in format <parameter_name:default_value>: + +<host:''> URL component 'host' of application being tested (URL or IP). +<base_path:'/'> Base path for tested site. +<users:100> Number of concurrent users. Recommended amount is 100. Minimal amount is 10. +<ramp_period:300> Ramp period (seconds). Period the request will be distributed within. +<orders:0> Number of orders in the period specified in the current allocation. If <orders> is specified, the <users> parameter will be recalculated. +<report_save_path:./> Path where reports will be saved. Reports will be saved in current working directory by default. + +All parameters must be passed to command line with "J" prefix: "-J<parameter_name>=<parameter_value>" + +Example: +> cd /directory_of_jMeter/bin/ +> jmeter -n -t /path_to_benchmark_file/benchmark.jmx -Jhost=magento2.dev -Jbase_path=/ -Jusers=100 -Jramp_period=300 -Jreport_save_path=./ + + +2. Run via GUI +-- Open jMeter/bin directory and run jmeter.bat +-- Click in menu File -> Open (Ctrl+O) and select file; or drag and drop benchmark.jmx file in opened GUI. + +On the first tab 'Test Toolkit' you can change 'User Defined variables' like as <host>, <users>, <ramp_period>, <orders>, <report_save_path>. +For running script click "Start" (green arrow in the top menu). + + +Results of running (Report types) +----------- + +After running via GUI you can see result of working in left panel. Choose the corresponding report. +After running script via console report will be generated in the path that has been specified in <report_save_path>. + + +Threads +----------- + +jMeter script consists of five threads. Setup thread and four user threads. +Percentage ratio between threads is as follows: +Browsing, adding items to the cart and abandon cart (BrowsAddToCart suffix in reports) - 62% +Just browsing (BrowsAddToCart suffix in reports) - 30% +Browsing, adding items to cart and checkout it as guest (GuestChkt suffix in reports) - 4% +Browsing, adding items to cart and checkout as registered customer (CustomerChkt suffix in reports) - 4% + + +About reports: +----------- + +Summary Report. +Report contains aggregated information about threads. +Report file name is {report_save_path}/summary-report.log +Details http://jmeter.apache.org/usermanual/component_reference.html#Summary_Report + +Detailed URLs report. +Report contains information about URLs. +Pay your attention that URL is displayed only in generated report file (in GUI, URL is not displayed). +Report file name is {report_save_path}/detailed-urls-report.log (can be open as csv format). +Details http://jmeter.apache.org/usermanual/component_reference.html#View_Results_in_Table + +About other types read on +http://jmeter.apache.org/usermanual/component_reference.html + + +Testing environment +----------- + +jMeter: apache-jmeter-2.11 +OS (where jMeter is running): Windows 7 SP1 +Server (where Magento is hosted): Intel(R) Core(TM)2 Duo CPU T7700 @2.40GHz, memtotal 4gb. +PHP: 5.4.19 (memory_limit 2Gb) +MySQL: 5.5.29 MySQL Community Server +Magento version: ver. 2.0.0.0-dev70 (rev 16b68a0f8e0fad4375f33b7238e2f2964ac3aadc) +Magento database (Small plan in Fixture Generation Tool): +jMeter parameters (all default parameters): + users: 100 + ramp_period: 300 + view_product_add_to_cart_percent: 62 + view_catalog_percent: 30 + guest_checkout_percent: 4 + customer_checkout_percent: 4 diff --git a/dev/tools/performance-toolkit/benchmark.jmx b/dev/tools/performance-toolkit/benchmark.jmx new file mode 100644 index 0000000000000000000000000000000000000000..de669dabd7f4fb5c60d23ca53f57a3dbc57fe82f --- /dev/null +++ b/dev/tools/performance-toolkit/benchmark.jmx @@ -0,0 +1,4576 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548"> + <hashTree> + <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Toolkit" enabled="true"> + <stringProp name="TestPlan.comments"></stringProp> + <boolProp name="TestPlan.functional_mode">false</boolProp> + <boolProp name="TestPlan.serialize_threadgroups">false</boolProp> + <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="host" elementType="Argument"> + <stringProp name="Argument.name">host</stringProp> + <stringProp name="Argument.value">${__P(host)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="base_path" elementType="Argument"> + <stringProp name="Argument.name">base_path</stringProp> + <stringProp name="Argument.value">${__P(base_path,/)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="report_save_path" elementType="Argument"> + <stringProp name="Argument.name">report_save_path</stringProp> + <stringProp name="Argument.value">${__P(report_save_path,./)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="ramp_period" elementType="Argument"> + <stringProp name="Argument.name">ramp_period</stringProp> + <stringProp name="Argument.value">${__P(ramp_period,300)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="orders" elementType="Argument"> + <stringProp name="Argument.name">orders</stringProp> + <stringProp name="Argument.value">${__P(orders,0)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="users" elementType="Argument"> + <stringProp name="Argument.name">users</stringProp> + <stringProp name="Argument.value">${__P(users,100)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="view_product_add_to_cart_percent" elementType="Argument"> + <stringProp name="Argument.name">view_product_add_to_cart_percent</stringProp> + <stringProp name="Argument.value">${__P(view_product_add_to_cart_percent,62)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="view_catalog_percent" elementType="Argument"> + <stringProp name="Argument.name">view_catalog_percent</stringProp> + <stringProp name="Argument.value">${__P(view_catalog_percent,30)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="guest_checkout_percent" elementType="Argument"> + <stringProp name="Argument.name">guest_checkout_percent</stringProp> + <stringProp name="Argument.value">${__P(guest_checkout_percent,4)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="customer_checkout_percent" elementType="Argument"> + <stringProp name="Argument.name">customer_checkout_percent</stringProp> + <stringProp name="Argument.value">${__P(customer_checkout_percent,4)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="loops" elementType="Argument"> + <stringProp name="Argument.name">loops</stringProp> + <stringProp name="Argument.value">${__P(loops,1)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="customer_password" elementType="Argument"> + <stringProp name="Argument.name">customer_password</stringProp> + <stringProp name="Argument.value">123123q</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="url_suffix" elementType="Argument"> + <stringProp name="Argument.name">url_suffix</stringProp> + <stringProp name="Argument.value">.html</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="admin_path" elementType="Argument"> + <stringProp name="Argument.name">admin_path</stringProp> + <stringProp name="Argument.value">${__P(admin_path,backend)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="admin_user" elementType="Argument"> + <stringProp name="Argument.name">admin_user</stringProp> + <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="admin_password" elementType="Argument"> + <stringProp name="Argument.name">admin_password</stringProp> + <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="website_id" elementType="Argument"> + <stringProp name="Argument.name">website_id</stringProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="TestPlan.user_define_classpath"></stringProp> + </TestPlan> + <hashTree> + <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${host}</stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol"></stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path"></stringProp> + <stringProp name="HTTPSampler.concurrentPool">4</stringProp> + </ConfigTestElement> + <hashTree/> + <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true"> + <collectionProp name="HeaderManager.headers"> + <elementProp name="Accept-Language" elementType="Header"> + <stringProp name="Header.name">Accept-Language</stringProp> + <stringProp name="Header.value">en-US,en;q=0.5</stringProp> + </elementProp> + <elementProp name="Accept" elementType="Header"> + <stringProp name="Header.name">Accept</stringProp> + <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp> + </elementProp> + <elementProp name="User-Agent" elementType="Header"> + <stringProp name="Header.name">User-Agent</stringProp> + <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp> + </elementProp> + <elementProp name="Accept-Encoding" elementType="Header"> + <stringProp name="Header.name">Accept-Encoding</stringProp> + <stringProp name="Header.value">gzip, deflate</stringProp> + </elementProp> + </collectionProp> + </HeaderManager> + <hashTree/> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">1</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <longProp name="ThreadGroup.start_time">1384333221000</longProp> + <longProp name="ThreadGroup.end_time">1384333221000</longProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + </SetupThreadGroup> + <hashTree> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Clear properties" enabled="true"> + <stringProp name="BeanShellSampler.query">props.remove("category_url_key"); +props.remove("category_name"); +props.remove("simple_products_list"); +props.remove("configurable_products_list"); +props.remove("users"); +props.remove("customer_emails_list");</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: validate user defined variables" enabled="true"> + <stringProp name="BeanShellSampler.query">Boolean stopTestOnError (String error) { + log.error(error); + System.out.println(error); + SampleResult.setStopTest(true); + return false; +} + +if ("${host}" == "1") { + return stopTestOnError("\"host\" parameter is not defined. Please define host parameter as: \"-Jhost=example.com\""); +} + +if (${users} < 10) { + return stopTestOnError("\"users\" parameter is invalid. Its value must be 10 or greater"); +} + +String path = "${base_path}"; +String slash = "/"; +if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substring(0, 1))) { + return stopTestOnError("\"base_path\" parameter is invalid. It must start and end with \"/\""); +} +</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request: Open main page (for category extract)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol"></stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="TestPlan.comments">Site - Get Category 1</stringProp> + </HTTPSamplerProxy> + <hashTree> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extarct first category url key" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">category_url_key</stringProp> + <stringProp name="RegexExtractor.regex"><a href="http://${host}${base_path}(index.php/)?([^'"]+)${url_suffix}" class="level-top" ></stringProp> + <stringProp name="RegexExtractor.template">$2$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + <stringProp name="Scope.variable">simple_product_1_url_key</stringProp> + </RegexExtractor> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extarct first category name" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">category_name</stringProp> + <stringProp name="RegexExtractor.regex"><a href="http://${host}${base_path}(index.php/)?${category_url_key}${url_suffix}" class="level-top" ><span>([^'"]+)</span></stringProp> + <stringProp name="RegexExtractor.template">$2$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + <stringProp name="Scope.variable">simple_product_1_url_key</stringProp> + </RegexExtractor> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert category url" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="484395188">^[a-z0-9-]+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">category_url_key</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert category name" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2845929">^.+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">category_name</stringProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Collect category" enabled="true"> + <stringProp name="BeanShellSampler.query">props.put("category_url_key", vars.get("category_url_key")); +props.put("category_name", vars.get("category_name"));</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request: Search simple products" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol"></stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}catalogsearch/result/?limit=30&q=Simple</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert search result" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-68828613">Search results for: 'Simple'</stringProp> + <stringProp name="1647182604"><div class="search results"></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp> + <stringProp name="RegexExtractor.regex">${base_path}(index.php/)?(simple.*)${url_suffix}" title="[Ss]imple.*"</stringProp> + <stringProp name="RegexExtractor.template">$2$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">-1</stringProp> + </RegexExtractor> + <hashTree/> + </hashTree> + <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Simple products loop (search result)" enabled="true"> + <stringProp name="ForeachController.inputVal">simple_products_url_keys</stringProp> + <stringProp name="ForeachController.returnVal">simple_products_url_key</stringProp> + <boolProp name="ForeachController.useSeparator">true</boolProp> + </ForeachController> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request: Open Simple product" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_products_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor: Extarct product id" enabled="true"> + <stringProp name="XPathExtractor.default"></stringProp> + <stringProp name="XPathExtractor.refname">simple_product_id</stringProp> + <stringProp name="XPathExtractor.xpathQuery">.//input[@type="hidden" and @name="product"]/@value</stringProp> + <boolProp name="XPathExtractor.validate">false</boolProp> + <boolProp name="XPathExtractor.tolerant">true</boolProp> + <boolProp name="XPathExtractor.namespace">false</boolProp> + </XPathExtractor> + <hashTree/> + <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor: Extarct product title" enabled="true"> + <stringProp name="XPathExtractor.default"></stringProp> + <stringProp name="XPathExtractor.refname">simple_product_title</stringProp> + <stringProp name="XPathExtractor.xpathQuery">.//*[@data-ui-id='page-title']/text()</stringProp> + <boolProp name="XPathExtractor.validate">false</boolProp> + <boolProp name="XPathExtractor.tolerant">true</boolProp> + <boolProp name="XPathExtractor.namespace">false</boolProp> + </XPathExtractor> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert id" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="89649215">^\d+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">simple_product_id</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert title" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2845929">^.+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">simple_product_title</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert url key" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="484395188">^[a-z0-9-]+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">simple_products_url_key</stringProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true"> + <stringProp name="CounterConfig.start">1</stringProp> + <stringProp name="CounterConfig.end"></stringProp> + <stringProp name="CounterConfig.incr">1</stringProp> + <stringProp name="CounterConfig.name">simple_products_counter</stringProp> + <stringProp name="CounterConfig.format"></stringProp> + <boolProp name="CounterConfig.per_user">false</boolProp> + </CounterConfig> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Collect simple product" enabled="true"> + <stringProp name="BeanShellSampler.query">import java.util.ArrayList; +import java.util.HashMap; + +// If it is first iteration of cycle then recreate productList +if (1 == Integer.parseInt(vars.get("simple_products_counter"))) { + productList = new ArrayList(); + props.put("simple_products_list", productList); +} else { + productList = props.get("simple_products_list"); +} + +// Create product map +Map productMap = new HashMap(); +productMap.put("id", vars.get("simple_product_id")); +productMap.put("title", vars.get("simple_product_title")); +productMap.put("url_key", vars.get("simple_products_url_key")); + +// Collect products map in products list +productList.add(productMap); </stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request: Search configurable products" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol"></stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}catalogsearch/result/?limit=30&q=Configurable</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert search result" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1354477292">Search results for: 'Configurable'</stringProp> + <stringProp name="1647182604"><div class="search results"></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">configurable_products_url_keys</stringProp> + <stringProp name="RegexExtractor.regex">${base_path}(index.php/)?(configurable.*)${url_suffix}" title="[Cc]onfigurable.*"</stringProp> + <stringProp name="RegexExtractor.template">$2$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">-1</stringProp> + </RegexExtractor> + <hashTree/> + </hashTree> + <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Configurable products loop (search result)" enabled="true"> + <stringProp name="ForeachController.inputVal">configurable_products_url_keys</stringProp> + <stringProp name="ForeachController.returnVal">configurable_products_url_key</stringProp> + <boolProp name="ForeachController.useSeparator">true</boolProp> + </ForeachController> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Request: Open Configurable product" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}${configurable_products_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor: Extarct product id" enabled="true"> + <stringProp name="XPathExtractor.default"></stringProp> + <stringProp name="XPathExtractor.refname">configurable_product_id</stringProp> + <stringProp name="XPathExtractor.xpathQuery">.//input[@type="hidden" and @name="product"]/@value</stringProp> + <boolProp name="XPathExtractor.validate">false</boolProp> + <boolProp name="XPathExtractor.tolerant">true</boolProp> + <boolProp name="XPathExtractor.namespace">false</boolProp> + </XPathExtractor> + <hashTree/> + <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor: Extarct product title" enabled="true"> + <stringProp name="XPathExtractor.default"></stringProp> + <stringProp name="XPathExtractor.refname">configurable_product_title</stringProp> + <stringProp name="XPathExtractor.xpathQuery">.//*[@data-ui-id='page-title']/text()</stringProp> + <boolProp name="XPathExtractor.validate">false</boolProp> + <boolProp name="XPathExtractor.tolerant">true</boolProp> + <boolProp name="XPathExtractor.namespace">false</boolProp> + </XPathExtractor> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extarct product attribute id" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">configurable_product_attribute_id</stringProp> + <stringProp name="RegexExtractor.regex">"spConfig":\{"attributes":\{"(\d+)"</stringProp> + <stringProp name="RegexExtractor.template">$1$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + </RegexExtractor> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extarct product attribute option id" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">configurable_product_attribute_option_id</stringProp> + <stringProp name="RegexExtractor.regex">"options":\[\{"id":"(\d+)"</stringProp> + <stringProp name="RegexExtractor.template">$1$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + </RegexExtractor> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert id" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="89649215">^\d+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">configurable_product_id</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert title" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2845929">^.+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">configurable_product_title</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Responce Assertion: Assert url key" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="484395188">^[a-z0-9-]+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">configurable_products_url_key</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert attribute id" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="89649215">^\d+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">configurable_product_attribute_id</stringProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert attribute option id" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="89649215">^\d+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">configurable_product_attribute_option_id</stringProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true"> + <stringProp name="CounterConfig.start">1</stringProp> + <stringProp name="CounterConfig.end"></stringProp> + <stringProp name="CounterConfig.incr">1</stringProp> + <stringProp name="CounterConfig.name">configurable_products_counter</stringProp> + <stringProp name="CounterConfig.format"></stringProp> + <boolProp name="CounterConfig.per_user">false</boolProp> + </CounterConfig> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Collect configurable product" enabled="true"> + <stringProp name="BeanShellSampler.query">import java.util.ArrayList; +import java.util.HashMap; + +// If it is first iteration of cycle then recreate productList +if (1 == Integer.parseInt(vars.get("configurable_products_counter"))) { + productList = new ArrayList(); + props.put("configurable_products_list", productList); +} else { + productList = props.get("configurable_products_list"); +} + +// Create product map +Map productMap = new HashMap(); +productMap.put("id", vars.get("configurable_product_id")); +productMap.put("title", vars.get("configurable_product_title")); +productMap.put("url_key", vars.get("configurable_products_url_key")); +productMap.put("attribute_id", vars.get("configurable_product_attribute_id")); +productMap.put("attribute_option_id", vars.get("configurable_product_attribute_option_id")); + +// Collect products map in products list +productList.add(productMap); </stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Admin - Login" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1397214398">Welcome</stringProp> + <stringProp name="-1309286748"><title>Magento Admin</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">admin_form_key</stringProp> + <stringProp name="RegexExtractor.regex"><input name="form_key" type="hidden" value="([^'"]+)" /></stringProp> + <stringProp name="RegexExtractor.template">$1$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + </RegexExtractor> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2845929">^.+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">admin_form_key</stringProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Admin - Login Submit Form" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="dummy" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">dummy</stringProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${admin_form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + </elementProp> + <elementProp name="login[password]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">${admin_password}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">login[password]</stringProp> + </elementProp> + <elementProp name="login[username]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">${admin_user}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">login[username]</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert logged-in" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1847038912"><title>Dashboard / Magento Admin</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Admin - Open Customer Grid" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-679437259">Customers</stringProp> + <stringProp name="495525733"><title>Customers / Customers / Magento Admin</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Admin - Prepare Customers search Data" enabled="true"> + <stringProp name="BeanShellSampler.query">import org.apache.jmeter.protocol.http.util.Base64Encoder; +String searchData = "customer_since[locale]=en_US&website_id=1"; +vars.put("searchData", new String(Base64Encoder.encode(searchData)));</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Admin - Search Customers" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="ajax" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">true</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">ajax</stringProp> + </elementProp> + <elementProp name="isAjax" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">true</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">isAjax</stringProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${admin_form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + </elementProp> + <elementProp name="internal_customer" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">internal_customer</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/limit/{$users}/filter/${searchData}</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1083053965">We couldn't find any records.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">//table[@id='customerGrid_table']//tr[@data-role='row']</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + <XPathExtractor guiclass="XPathExtractorGui" testclass="XPathExtractor" testname="XPath Extractor" enabled="true"> + <stringProp name="XPathExtractor.default"></stringProp> + <stringProp name="XPathExtractor.refname">customer_emails</stringProp> + <stringProp name="XPathExtractor.xpathQuery">//*[@id='customerGrid_table']//td[@data-column='email']/text()</stringProp> + <boolProp name="XPathExtractor.validate">false</boolProp> + <boolProp name="XPathExtractor.tolerant">true</boolProp> + <boolProp name="XPathExtractor.namespace">false</boolProp> + <boolProp name="XPathExtractor.show_warnings">true</boolProp> + <boolProp name="XPathExtractor.report_errors">true</boolProp> + </XPathExtractor> + <hashTree/> + </hashTree> + <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer emails loop (search result)" enabled="true"> + <stringProp name="ForeachController.inputVal">customer_emails</stringProp> + <stringProp name="ForeachController.returnVal">customer_email</stringProp> + <boolProp name="ForeachController.useSeparator">true</boolProp> + </ForeachController> + <hashTree> + <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true"> + <stringProp name="CounterConfig.start">1</stringProp> + <stringProp name="CounterConfig.end"></stringProp> + <stringProp name="CounterConfig.incr">1</stringProp> + <stringProp name="CounterConfig.name">email_counter</stringProp> + <stringProp name="CounterConfig.format"></stringProp> + <boolProp name="CounterConfig.per_user">false</boolProp> + </CounterConfig> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Collect customer emails" enabled="true"> + <stringProp name="BeanShellSampler.query">import java.util.ArrayList; + +// If it is first iteration of cycle then recreate emailsList +if (1 == Integer.parseInt(vars.get("email_counter"))) { + emailsList = new ArrayList(); + props.put("customer_emails_list", emailsList); +} else { + emailsList = props.get("customer_emails_list"); +} +emailsList.add(vars.get("customer_email"));</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + </hashTree> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Validate properties and count users" enabled="true"> + <stringProp name="BeanShellSampler.query">Boolean stopTestOnError (String error) { + log.error(error); + System.out.println(error); + SampleResult.setStopTest(true); + return false; +} + +if (props.get("simple_products_list") == null) { + return stopTestOnError("Cannot find simple products. Test stopped."); +} +if (props.get("configurable_products_list") == null) { + return stopTestOnError("Cannot find configurable products. Test stopped."); +} +if (props.get("customer_emails_list") == null) { + return stopTestOnError("Cannot find customer emails. Test stopped."); +} +int orders = Integer.parseInt(vars.get("orders")); + +if (orders > 0) { + int checkout_sum = Integer.parseInt(vars.get("guest_checkout_percent")) + Integer.parseInt(vars.get("customer_checkout_percent")); + checkout_sum = checkout_sum > 0 ? checkout_sum : 1; + int users = orders * (100 / checkout_sum); + props.put("users", users); +} else { + props.put("users", Integer.parseInt(vars.get("users"))); +} +</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="WarmUp Add To Cart" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Category Product browsing" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">${loops}</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">${__javaScript(Math.round(props.get("users")*${view_catalog_percent}/100>>0))}</stringProp> + <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp> + <longProp name="ThreadGroup.start_time">1304708488000</longProp> + <longProp name="ThreadGroup.end_time">1304708488000</longProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + </ThreadGroup> + <hashTree> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Get arguments(CatProdBrows)" enabled="true"> + <stringProp name="TestPlan.comments">Passing arguments between threads</stringProp> + <stringProp name="BeanShellSampler.query">number = (int)(Math.random() * props.get("simple_products_list").size()); +simpleList = props.get("simple_products_list").get(number); +vars.put("simple_product_1_url_key", simpleList.get("url_key")); +vars.put("simple_product_1_name", simpleList.get("title")); + +do { + number1 = (int)(Math.random() * props.get("simple_products_list").size()); +} while(number == number1); +simpleList = props.get("simple_products_list").get(number1); +vars.put("simple_product_2_url_key", simpleList.get("url_key")); +vars.put("simple_product_2_name", simpleList.get("title")); + +number = (int)(Math.random() * props.get("configurable_products_list").size()); +configurableList = props.get("configurable_products_list").get(number); +vars.put("configurable_product_1_url_key", configurableList.get("url_key")); +vars.put("configurable_product_1_name", configurableList.get("title")); + +vars.put("category_url_key", props.get("category_url_key")); +vars.put("category_name", props.get("category_name"));</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page(CatProdBrows)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="571386695"><title>Home page</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category(CatProdBrows)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1210004667"><span class="base" data-ui-id="page-title">${category_name}</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 View(CatProdBrows)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1254853024"><title>${simple_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 View(CatProdBrows)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_2_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2142356705"><title>${simple_product_2_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 View(CatProdBrows)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${configurable_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="199922279"><title>${configurable_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Product browsing and adding items to the cart" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">${loops}</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">${__javaScript(Math.round(props.get("users")*${view_product_add_to_cart_percent}/100>>0))}</stringProp> + <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp> + <longProp name="ThreadGroup.start_time">1304708488000</longProp> + <longProp name="ThreadGroup.end_time">1304708488000</longProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + </ThreadGroup> + <hashTree> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Get arguments(BrowsAddToCart)" enabled="true"> + <stringProp name="TestPlan.comments">Passing arguments between threads</stringProp> + <stringProp name="BeanShellSampler.query">number = (int)(Math.random() * props.get("simple_products_list").size()); +simpleList = props.get("simple_products_list").get(number); +vars.put("simple_product_1_url_key", simpleList.get("url_key")); +vars.put("simple_product_1_name", simpleList.get("title")); +vars.put("simple_product_1_id", simpleList.get("id")); + +do { + number1 = (int)(Math.random() * props.get("simple_products_list").size()); +} while(number == number1); +simpleList = props.get("simple_products_list").get(number1); +vars.put("simple_product_2_url_key", simpleList.get("url_key")); +vars.put("simple_product_2_name", simpleList.get("title")); +vars.put("simple_product_2_id", simpleList.get("id")); + +number = (int)(Math.random() * props.get("configurable_products_list").size()); +configurableList = props.get("configurable_products_list").get(number); +vars.put("configurable_product_1_url_key", configurableList.get("url_key")); +vars.put("configurable_product_1_name", configurableList.get("title")); +vars.put("configurable_product_1_id", configurableList.get("id")); +vars.put("configurable_attribute_id", configurableList.get("attribute_id")); +vars.put("configurable_option_id", configurableList.get("attribute_option_id")); + +vars.put("category_url_key", props.get("category_url_key")); +vars.put("category_name", props.get("category_name"));</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="571386695"><title>Home page</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1210004667"><span class="base" data-ui-id="page-title">${category_name}</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 View(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1254853024"><title>${simple_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 Add To Cart(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${simple_product_1_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="210217247">You added ${simple_product_1_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="518066445"><div>* This product is out of stock.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=1</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 View(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_2_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2142356705"><title>${simple_product_2_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 Add To Cart(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${simple_product_2_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="221533374">You added ${simple_product_2_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="518066445"><div>* This product is out of stock.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=2</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 View(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${configurable_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="199922279"><title>${configurable_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 Add To Cart(BrowsAddToCart)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${configurable_product_1_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + <elementProp name="super_attribute[${configurable_attribute_id}]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${configurable_option_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">super_attribute[${configurable_attribute_id}]</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1346272328">You added ${configurable_product_1_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-815931116"><div>* We don't have as many &quot;${configurable_product_1_name}&quot; as you requested.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=3</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Guest Checkout" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">${loops}</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">${__javaScript(Math.round(props.get("users")*${guest_checkout_percent}/100>>0))}</stringProp> + <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp> + <longProp name="ThreadGroup.start_time">1304708488000</longProp> + <longProp name="ThreadGroup.end_time">1304708488000</longProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + </ThreadGroup> + <hashTree> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Get arguments(GuestChkt)" enabled="true"> + <stringProp name="TestPlan.comments">Passing arguments between threads</stringProp> + <stringProp name="BeanShellSampler.query">number = (int)(Math.random() * props.get("simple_products_list").size()); +simpleList = props.get("simple_products_list").get(number); +vars.put("simple_product_1_url_key", simpleList.get("url_key")); +vars.put("simple_product_1_name", simpleList.get("title")); +vars.put("simple_product_1_id", simpleList.get("id")); + +do { + number1 = (int)(Math.random() * props.get("simple_products_list").size()); +} while(number == number1); +simpleList = props.get("simple_products_list").get(number1); +vars.put("simple_product_2_url_key", simpleList.get("url_key")); +vars.put("simple_product_2_name", simpleList.get("title")); +vars.put("simple_product_2_id", simpleList.get("id")); + +number = (int)(Math.random() * props.get("configurable_products_list").size()); +configurableList = props.get("configurable_products_list").get(number); +vars.put("configurable_product_1_url_key", configurableList.get("url_key")); +vars.put("configurable_product_1_name", configurableList.get("title")); +vars.put("configurable_product_1_id", configurableList.get("id")); +vars.put("configurable_attribute_id", configurableList.get("attribute_id")); +vars.put("configurable_option_id", configurableList.get("attribute_option_id")); + +vars.put("category_url_key", props.get("category_url_key")); +vars.put("category_name", props.get("category_name"));</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="571386695"><title>Home page</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1210004667"><span class="base" data-ui-id="page-title">${category_name}</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 View(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1254853024"><title>${simple_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 Add To Cart(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${simple_product_1_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="210217247">You added ${simple_product_1_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="518066445"><div>* This product is out of stock.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=1</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 View(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_2_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2142356705"><title>${simple_product_2_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 Add To Cart(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${simple_product_2_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="221533374">You added ${simple_product_2_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="518066445"><div>* This product is out of stock.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=2</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 View(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${configurable_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="199922279"><title>${configurable_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 Add To Cart(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${configurable_product_1_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + <elementProp name="super_attribute[${configurable_attribute_id}]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${configurable_option_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">super_attribute[${configurable_attribute_id}]</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1346272328">You added ${configurable_product_1_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-815931116"><div>* We don't have as many &quot;${configurable_product_1_name}&quot; as you requested.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=3</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout start(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1403911775"><title>Checkout</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-179817969"><title>Shopping Cart</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">form_key</stringProp> + <stringProp name="RegexExtractor.regex"><input name="form_key" type="hidden" value="([^'"]+)" /></stringProp> + <stringProp name="RegexExtractor.template">$1$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + </RegexExtractor> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2845929">^.+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">form_key</stringProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout guest(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="method" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.name">method</stringProp> + <stringProp name="Argument.value">guest</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveMethod/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2914">[]</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">8</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progress to billing(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">billing</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout billing addresses(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="billing[address_id]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[address_id]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[firstname]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[firstname]</stringProp> + <stringProp name="Argument.value">Name</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[lastname]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[lastname]</stringProp> + <stringProp name="Argument.value">Lastname</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[company]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[company]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[email]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[email]</stringProp> + <stringProp name="Argument.value">test@example.com</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[street][]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[street][]</stringProp> + <stringProp name="Argument.value">10441 Jefferson Blvd, ste 200</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[street][]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[street][]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[city]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[city]</stringProp> + <stringProp name="Argument.value">Culver City</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[region_id]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[region_id]</stringProp> + <stringProp name="Argument.value">12</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[region]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[region]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[postcode]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[postcode]</stringProp> + <stringProp name="Argument.value">90232</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[country_id]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[country_id]</stringProp> + <stringProp name="Argument.value">US</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[telephone]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[telephone]</stringProp> + <stringProp name="Argument.value">1-310-945-0345</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[fax]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[fax]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[customer_password]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[customer_password]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[confirm_password]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[confirm_password]</stringProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[use_for_shipping]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">billing[use_for_shipping]</stringProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="billing[save_in_address_book]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[save_in_address_book]</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveBilling/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1549408881">"goto_section":"shipping_method"</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progress to shipping method(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">shipping_method</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout shipping method(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="shipping_method" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.name">shipping_method</stringProp> + <stringProp name="Argument.value">flatrate_flatrate</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveShippingMethod/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1344413285">"goto_section":"payment"</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progressto payment(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">payment</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout payment method(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="payment[method]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">payment[method]</stringProp> + <stringProp name="Argument.value">checkmo</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">${form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/savePayment/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="319245611">"goto_section":"review"</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progress to review(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">review</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout place order(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="payment[method]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">payment[method]</stringProp> + <stringProp name="Argument.value">checkmo</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + <stringProp name="Argument.desc">false</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveOrder/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1521047006">{"success":true,"error":false}</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout success(GuestChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/success/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="494863233">Thank you for your purchase!</stringProp> + <stringProp name="1635682758">Your order # is</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Customer Checkout" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">${loops}</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">${__javaScript(Math.round(props.get("users")*${customer_checkout_percent}/100>>0))}</stringProp> + <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp> + <longProp name="ThreadGroup.start_time">1304708488000</longProp> + <longProp name="ThreadGroup.end_time">1304708488000</longProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + </ThreadGroup> + <hashTree> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Get arguments(CustomerChkt)" enabled="true"> + <stringProp name="TestPlan.comments">Passing arguments between threads</stringProp> + <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult; + +number = (int)(Math.random() * props.get("simple_products_list").size()); +simpleList = props.get("simple_products_list").get(number); +vars.put("simple_product_1_url_key", simpleList.get("url_key")); +vars.put("simple_product_1_name", simpleList.get("title")); +vars.put("simple_product_1_id", simpleList.get("id")); + +do { + number1 = (int)(Math.random() * props.get("simple_products_list").size()); +} while(number == number1); +simpleList = props.get("simple_products_list").get(number1); +vars.put("simple_product_2_url_key", simpleList.get("url_key")); +vars.put("simple_product_2_name", simpleList.get("title")); +vars.put("simple_product_2_id", simpleList.get("id")); + +number = (int)(Math.random() * props.get("configurable_products_list").size()); +configurableList = props.get("configurable_products_list").get(number); +vars.put("configurable_product_1_url_key", configurableList.get("url_key")); +vars.put("configurable_product_1_name", configurableList.get("title")); +vars.put("configurable_product_1_id", configurableList.get("id")); +vars.put("configurable_attribute_id", configurableList.get("attribute_id")); +vars.put("configurable_option_id", configurableList.get("attribute_option_id")); + +vars.put("category_url_key", props.get("category_url_key")); +vars.put("category_name", props.get("category_name")); + +emailsCount = props.get("customer_emails_list").size(); +print(emailsCount); +if (emailsCount < 1) { + log.error("You have to increase customers qty for running 'Customer Checkout' thread."); + System.out.println("You have to increase customers qty for running 'Customer Checkout' thread."); + SampleResult.setStopTest(true); +} else { + emails = props.get("customer_emails_list"); + email = emails.get(emailsCount - 1); + emails.remove(email); + props.put("customer_emails_list", emails); + vars.put("customer_email", email); +}</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp> + </BeanShellSampler> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="571386695"><title>Home page</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1210004667"><span class="base" data-ui-id="page-title">${category_name}</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 View(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1254853024"><title>${simple_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 1 Add To Cart(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${simple_product_1_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="210217247">You added ${simple_product_1_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="518066445"><div>* This product is out of stock.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=1</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 View(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${simple_product_2_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2142356705"><title>${simple_product_2_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Simple Product 2 Add To Cart(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${simple_product_2_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="221533374">You added ${simple_product_2_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="518066445"><div>* This product is out of stock.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=2</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 View(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}${configurable_product_1_url_key}${url_suffix}</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="199922279"><title>${configurable_product_1_name}</stringProp> + <stringProp name="-1787050162"><span>In stock</span></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Configurable Product 1 Add To Cart(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${configurable_product_1_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">product</stringProp> + </elementProp> + <elementProp name="related_product" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">related_product</stringProp> + </elementProp> + <elementProp name="qty" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">qty</stringProp> + </elementProp> + <elementProp name="super_attribute[${configurable_attribute_id}]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${configurable_option_id}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">super_attribute[${configurable_attribute_id}]</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1346272328">You added ${configurable_product_1_name} to your shopping cart.</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-815931116"><div>* We don't have as many &quot;${configurable_product_1_name}&quot; as you requested.</div></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="XPath Assertion" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">count(//*[@class='cart item'])=3</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout start(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1403911775"><title>Checkout</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-179817969"><title>Shopping Cart</title></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">6</intProp> + </ResponseAssertion> + <hashTree/> + <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true"> + <stringProp name="RegexExtractor.useHeaders">false</stringProp> + <stringProp name="RegexExtractor.refname">form_key</stringProp> + <stringProp name="RegexExtractor.regex"><input name="form_key" type="hidden" value="([^'"]+)" /></stringProp> + <stringProp name="RegexExtractor.template">$1$</stringProp> + <stringProp name="RegexExtractor.default"></stringProp> + <stringProp name="RegexExtractor.match_number">1</stringProp> + </RegexExtractor> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="2845929">^.+$</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + <stringProp name="Assertion.scope">variable</stringProp> + <stringProp name="Scope.variable">form_key</stringProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Login(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="context" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.name">context</stringProp> + <stringProp name="Argument.value">checkout</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="login[username]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${customer_email}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">login[username]</stringProp> + </elementProp> + <elementProp name="login[password]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${customer_password}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">login[password]</stringProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="Assert success" enabled="true"> + <boolProp name="XPath.negate">false</boolProp> + <stringProp name="XPath.xpath">//div[span='1'][h2='Billing Information']</stringProp> + <boolProp name="XPath.validate">false</boolProp> + <boolProp name="XPath.whitespace">false</boolProp> + <boolProp name="XPath.tolerant">true</boolProp> + <boolProp name="XPath.namespace">false</boolProp> + <boolProp name="XPath.show_warnings">true</boolProp> + <boolProp name="XPath.report_errors">true</boolProp> + </XPathAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout billing addresses(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="billing[address_id]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">37</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[address_id]</stringProp> + </elementProp> + <elementProp name="billing[city]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">Fayetteville</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[city]</stringProp> + </elementProp> + <elementProp name="billing[company]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[company]</stringProp> + </elementProp> + <elementProp name="billing[country_id]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">US</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[country_id]</stringProp> + </elementProp> + <elementProp name="billing[fax]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[fax]</stringProp> + </elementProp> + <elementProp name="billing[firstname]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">Anthony</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[firstname]</stringProp> + </elementProp> + <elementProp name="billing[lastname]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">Nealy</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[lastname]</stringProp> + </elementProp> + <elementProp name="billing[postcode]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">123123</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[postcode]</stringProp> + </elementProp> + <elementProp name="billing[region]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">Arkansas</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[region]</stringProp> + </elementProp> + <elementProp name="billing[region_id]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">5</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[region_id]</stringProp> + </elementProp> + <elementProp name="billing[street][]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">123 Freedom Blvd. #123</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[street][]</stringProp> + </elementProp> + <elementProp name="billing[street][]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value"></stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[street][]</stringProp> + </elementProp> + <elementProp name="billing[telephone]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">022-333-4455</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[telephone]</stringProp> + </elementProp> + <elementProp name="billing[use_for_shipping]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[use_for_shipping]</stringProp> + </elementProp> + <elementProp name="billing[save_in_address_book]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">1</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">billing[save_in_address_book]</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveBilling/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="1051635821">"goto_section":"shipping</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout shipping method additional (CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/getAdditional/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-336696320"><!-- BLOCK shipping_method_additional --></stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progress to shipping method(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">shipping_method</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout shipping method(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="giftoptions[1496][type]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">quote_item</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">giftoptions[1496][type]</stringProp> + </elementProp> + <elementProp name="giftoptions[451][type]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">quote</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">giftoptions[451][type]</stringProp> + </elementProp> + <elementProp name="shipping_method" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.name">shipping_method</stringProp> + <stringProp name="Argument.value">flatrate_flatrate</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveShippingMethod/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1344413285">"goto_section":"payment"</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progress to payment(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">payment</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout payment method(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="payment[method]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">payment[method]</stringProp> + <stringProp name="Argument.value">checkmo</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.value">${form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/savePayment/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="319245611">"goto_section":"review"</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout progress to review(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="toStep" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">review</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">toStep</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/progress/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree/> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout place order(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="payment[method]" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">true</boolProp> + <stringProp name="Argument.name">payment[method]</stringProp> + <stringProp name="Argument.value">checkmo</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + </elementProp> + <elementProp name="form_key" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">${form_key}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + <boolProp name="HTTPArgument.use_equals">true</boolProp> + <stringProp name="Argument.name">form_key</stringProp> + <stringProp name="Argument.desc">false</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/saveOrder/</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1521047006">{"success":true,"error":false}</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout success(CustomerChkt)" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="HTTPSampler.protocol">http</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/success/</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.implementation">Java</stringProp> + <boolProp name="HTTPSampler.monitor">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="494863233">Thank you for your purchase!</stringProp> + <stringProp name="1635682758">Your order # is</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">1</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <longProp name="ThreadGroup.start_time">1395324075000</longProp> + <longProp name="ThreadGroup.end_time">1395324075000</longProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + </PostThreadGroup> + <hashTree> + <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true"> + <collectionProp name="CookieManager.cookies"> + <elementProp name="product_list_limit" elementType="Cookie" testname="product_list_limit"> + <stringProp name="Cookie.value">30</stringProp> + <stringProp name="Cookie.domain">${host}</stringProp> + <stringProp name="Cookie.path">/</stringProp> + <boolProp name="Cookie.secure">false</boolProp> + <longProp name="Cookie.expires">0</longProp> + <boolProp name="Cookie.path_specified">true</boolProp> + <boolProp name="Cookie.domain_specified">true</boolProp> + </elementProp> + </collectionProp> + <boolProp name="CookieManager.clearEachIteration">true</boolProp> + </CookieManager> + <hashTree/> + <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BeanShell Sampler: Clear properties" enabled="true"> + <stringProp name="BeanShellSampler.query">props.remove("category_url_key"); +props.remove("category_name"); +props.remove("simple_products_list"); +props.remove("configurable_products_list"); +props.remove("users"); +props.remove("customer_emails_list");</stringProp> + <stringProp name="BeanShellSampler.filename"></stringProp> + <stringProp name="BeanShellSampler.parameters"></stringProp> + <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp> + </BeanShellSampler> + <hashTree/> + </hashTree> + <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename">${report_save_path}/summary-report.log</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="Detailed URLs report" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>false</latency> + <timestamp>false</timestamp> + <success>false</success> + <label>true</label> + <code>false</code> + <message>false</message> + <threadName>false</threadName> + <dataType>false</dataType> + <encoding>false</encoding> + <assertions>false</assertions> + <subresults>false</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <url>true</url> + </value> + </objProp> + <stringProp name="filename">${report_save_path}/detailed-urls-report.log</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename">${report_save_path}/view-results-tree.log</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename">${report_save_path}/aggregate-graph.log</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="StatVisualizer" testclass="ResultCollector" testname="Aggregate Report" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="DistributionGraphVisualizer" testclass="ResultCollector" testname="Distribution Graph (alpha)" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="SplineVisualizer" testclass="ResultCollector" testname="Spline Visualizer" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + </ResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ThreadsStateOverTimeGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Active Threads Over Time" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.BytesThroughputOverTimeGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Bytes Throughput Over Time" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">1000</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CompositeResultCollector guiclass="kg.apc.jmeter.vizualizers.CompositeGraphGui" testclass="kg.apc.jmeter.vizualizers.CompositeResultCollector" testname="jp@gc - Composite Graph" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + <collectionProp name="COMPOSITE_CFG"> + <collectionProp name=""> + <stringProp name="1267279877">jp@gc - Transactions per Second</stringProp> + <stringProp name="1267279877">jp@gc - Transactions per Second</stringProp> + </collectionProp> + <collectionProp name=""> + <stringProp name="117711132">Successful Transactions per Second</stringProp> + <stringProp name="-1517411905">Failed Transactions per Second</stringProp> + </collectionProp> + </collectionProp> + </kg.apc.jmeter.vizualizers.CompositeResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.HitsPerSecondGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Hits per Second" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">1000</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ResponseCodesPerSecondGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Response Codes per Second" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">1000</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.LatenciesOverTimeGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Response Latencies Over Time" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ResponseTimesDistributionGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Response Times Distribution" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">100</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ResponseTimesOverTimeGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Response Times Over Time" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ResponseTimesPercentilesGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Response Times Percentiles" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.TimesVsThreadsGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Response Times vs Threads" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ThroughputVsThreadsGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Transaction Throughput vs Threads" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">500</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.TransactionsPerSecondGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="jp@gc - Transactions per Second" enabled="false"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + </value> + </objProp> + <stringProp name="filename"></stringProp> + <longProp name="interval_grouping">1000</longProp> + <boolProp name="graph_aggregated">false</boolProp> + <stringProp name="include_sample_labels"></stringProp> + <stringProp name="exclude_sample_labels"></stringProp> + </kg.apc.jmeter.vizualizers.CorrectedResultCollector> + <hashTree/> + </hashTree> + </hashTree> +</jmeterTestPlan> diff --git a/dev/tools/performance-toolkit/fixtures/cart_price_rules.php b/dev/tools/performance-toolkit/fixtures/cart_price_rules.php new file mode 100644 index 0000000000000000000000000000000000000000..04ba77a36227d949e2cf8c87a61ba6ddc05681da --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/cart_price_rules.php @@ -0,0 +1,178 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$cartPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('cart_price_rules', 9); +$cartPriceRulesProductsFloor = \Magento\ToolkitFramework\Config::getInstance()->getValue('cart_price_rules_floor', 3); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); +/** @var $model \Magento\SalesRule\Model\Rule*/ +$model = $this->getObjectManager()->get('Magento\SalesRule\Model\Rule'); + +//Get all websites +$categoriesArray = array(); +$websites = $storeManager->getWebsites(); +foreach ($websites as $website) { + //Get all groups + $websiteGroups = $website->getGroups(); + foreach ($websiteGroups as $websiteGroup) { + $websiteGroupRootCategory = $websiteGroup->getRootCategoryId(); + $category->load($websiteGroupRootCategory); + $categoryResource = $category->getResource(); + //Get all categories + $resultsCategories = $categoryResource->getAllChildren($category); + foreach ($resultsCategories as $resultsCategory) { + $category->load($resultsCategory); + $structure = explode('/', $category->getPath()); + if (count($structure) > 2) { + $categoriesArray[] = array($category->getId(), $website->getId()); + } + } + } +} +asort($categoriesArray); +$categoriesArray = array_values($categoriesArray); +$idField = $model->getIdFieldName(); + + +for ($i = 0; $i < $cartPriceRulesCount; $i++) { + $ruleName = sprintf('Shopping Cart Price Rule %1$d', $i); + $data = array( + $idField => null, + 'product_ids' => '', + 'name' => $ruleName, + 'description' => '', + 'is_active' => '1', + 'website_ids' => $categoriesArray[$i % count($categoriesArray)][1], + 'customer_group_ids' => array ( + 0 => '0', + 1 => '1', + 2 => '2', + 3 => '3', + ), + 'coupon_type' => '1', + 'coupon_code' => '', + 'uses_per_customer' => '', + 'from_date' => '', + 'to_date' => '', + 'sort_order' => '', + 'is_rss' => '1', + 'rule' => array ( + 'conditions' => + array ( + 1 => + array ( + 'type' => 'Magento\\SalesRule\\Model\\Rule\\Condition\\Combine', + 'aggregator' => 'all', + 'value' => '1', + 'new_child' => '', + ), + '1--1' => + array ( + 'type' => 'Magento\\SalesRule\\Model\\Rule\\Condition\\Address', + 'attribute' => 'total_qty', + 'operator' => '>=', + 'value' => $cartPriceRulesProductsFloor + $i, + ), + '1--2' => + array ( + 'type' => 'Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Found', + 'value' => '1', + 'aggregator' => 'all', + 'new_child' => '', + ), + '1--2--1' => + array ( + 'type' => 'Magento\\SalesRule\\Model\\Rule\\Condition\\Product', + 'attribute' => 'category_ids', + 'operator' => '==', + 'value' => $categoriesArray[$i % count($categoriesArray)][0], + ), + ), + 'actions' => + array ( + 1 => + array ( + 'type' => 'Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine', + 'aggregator' => 'all', + 'value' => '1', + 'new_child' => '', + ), + ), + ), + 'simple_action' => 'by_percent', + 'discount_amount' => '10', + 'discount_qty' => '0', + 'discount_step' => '', + 'apply_to_shipping' => '0', + 'simple_free_shipping' => '0', + 'stop_rules_processing' => '0', + 'reward_points_delta' => '', + 'store_labels' => array ( + 0 => '', + 1 => '', + 2 => '', + 3 => '', + 4 => '', + 5 => '', + 6 => '', + 7 => '', + 8 => '', + 9 => '', + 10 => '', + 11 => '', + ), + 'page' => '1', + 'limit' => '20', + 'in_banners' => '', + 'banner_id' => array ( + 'from' => '', + 'to' => '', + ), + 'banner_name' => '', + 'visible_in' => '', + 'banner_is_enabled' => '', + 'related_banners' => array (), + ); + if (isset($data['simple_action']) && $data['simple_action'] == 'by_percent' + && isset($data['discount_amount']) + ) { + $data['discount_amount'] = min(100, $data['discount_amount']); + } + if (isset($data['rule']['conditions'])) { + $data['conditions'] = $data['rule']['conditions']; + } + if (isset($data['rule']['actions'])) { + $data['actions'] = $data['rule']['actions']; + } + unset($data['rule']); + + $model->loadPost($data); + $useAutoGeneration = (int)!empty($data['use_auto_generation']); + $model->setUseAutoGeneration($useAutoGeneration); + $model->save(); +} diff --git a/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php b/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php new file mode 100644 index 0000000000000000000000000000000000000000..5f7b5150367489fb4ba757a229b49b7f5d780017 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php @@ -0,0 +1,131 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$catalogPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('catalog_price_rules', 3); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); +/** @var $model \Magento\CatalogRule\Model\Rule*/ +$model = $this->getObjectManager()->get('Magento\CatalogRule\Model\Rule'); +//Get all websites +$categoriesArray = array(); +$websites = $storeManager->getWebsites(); +foreach ($websites as $website) { + //Get all groups + $websiteGroups = $website->getGroups(); + foreach ($websiteGroups as $websiteGroup) { + $websiteGroupRootCategory = $websiteGroup->getRootCategoryId(); + $category->load($websiteGroupRootCategory); + $categoryResource = $category->getResource(); + //Get all categories + $resultsCategories = $categoryResource->getAllChildren($category); + foreach ($resultsCategories as $resultsCategory) { + $category->load($resultsCategory); + $structure = explode('/', $category->getPath()); + if (count($structure) > 2) { + $categoriesArray[] = array($category->getId(), $website->getId()); + } + } + } +} +asort($categoriesArray); +$categoriesArray = array_values($categoriesArray); +$idField = $model->getIdFieldName(); + + +for ($i = 0; $i < $catalogPriceRulesCount; $i++) { + $ruleName = sprintf('Catalog Price Rule %1$d', $i); + $data = array( + $idField => null, + 'name' => $ruleName, + 'description' => '', + 'is_active' => '1', + 'website_ids' => $categoriesArray[$i % count($categoriesArray)][1], + 'customer_group_ids' => array ( + 0 => '0', + 1 => '1', + 2 => '2', + 3 => '3', + ), + 'from_date' => '', + 'to_date' => '', + 'sort_order' => '', + 'rule' => array ( + 'conditions' => + array ( + 1 => + array ( + 'type' => 'Magento\\CatalogRule\\Model\\Rule\\Condition\\Combine', + 'aggregator' => 'all', + 'value' => '1', + 'new_child' => '', + ), + '1--1' => + array ( + 'type' => 'Magento\\CatalogRule\\Model\\Rule\\Condition\\Product', + 'attribute' => 'category_ids', + 'operator' => '==', + 'value' => $categoriesArray[$i % count($categoriesArray)][0], + ), + ) + ), + 'simple_action' => 'by_percent', + 'discount_amount' => '15', + 'sub_is_enable' => '0', + 'sub_simple_action' => 'by_percent', + 'sub_discount_amount' => '0', + 'stop_rules_processing' => '0', + 'page' => '1', + 'limit' => '20', + 'in_banners' => '1', + 'banner_id' => array ( + 'from' => '', + 'to' => '', + ), + 'banner_name' => '', + 'visible_in' => '', + 'banner_is_enabled' => '', + 'related_banners' => array (), + ); + if (isset($data['simple_action']) && $data['simple_action'] == 'by_percent' + && isset($data['discount_amount']) + ) { + $data['discount_amount'] = min(100, $data['discount_amount']); + } + if (isset($data['rule']['conditions'])) { + $data['conditions'] = $data['rule']['conditions']; + } + if (isset($data['rule']['actions'])) { + $data['actions'] = $data['rule']['actions']; + } + unset($data['rule']); + + $model->loadPost($data); + $useAutoGeneration = (int)!empty($data['use_auto_generation']); + $model->setUseAutoGeneration($useAutoGeneration); + $model->save(); +} diff --git a/dev/tools/performance-toolkit/fixtures/categories.php b/dev/tools/performance-toolkit/fixtures/categories.php new file mode 100644 index 0000000000000000000000000000000000000000..faf1957ec49326e91a79691fbf8d1d5c1f3319b1 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/categories.php @@ -0,0 +1,78 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$categoriesNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('categories', 18); +$maxNestingLevel = \Magento\ToolkitFramework\Config::getInstance()->getValue('categories_nesting_level', 3); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->create('Magento\Catalog\Model\Category'); + +$groups = array(); +$storeGroups = $storeManager->getGroups(); +$i = 0; +foreach ($storeGroups as $storeGroup) { + $parentCategoryId[$i] = $defaultParentCategoryId[$i] = $storeGroup->getRootCategoryId(); + $nestingLevel[$i] = 1; + $nestingPath[$i] = "1/$parentCategoryId[$i]"; + $categoryPath[$i] = ''; + $i++; +} +$groupNumber = 0; +$anchorStep = 2; +$categoryIndex = 1; + +while ($categoryIndex <= $categoriesNumber) { + $category->setId(null) + ->setUrlKey(null) + ->setUrlPath(null) + ->setName("Category $categoryIndex") + ->setParentId($parentCategoryId[$groupNumber]) + ->setPath($nestingPath[$groupNumber]) + ->setLevel($nestingLevel[$groupNumber]) + ->setAvailableSortBy('name') + ->setDefaultSortBy('name') + ->setIsActive(true) + //->setIsAnchor($categoryIndex++ % $anchorStep == 0) + ->save(); + $categoryIndex++; + $categoryPath[$groupNumber] .= '/' . $category->getName(); + + if ($nestingLevel[$groupNumber]++ == $maxNestingLevel) { + $nestingLevel[$groupNumber] = 1; + $parentCategoryId[$groupNumber] = $defaultParentCategoryId[$groupNumber]; + $nestingPath[$groupNumber] = '1'; + $categoryPath[$groupNumber] = ''; + } else { + $parentCategoryId[$groupNumber] = $category->getId(); + } + $nestingPath[$groupNumber] .= "/$parentCategoryId[$groupNumber]"; + + $groupNumber++; + if ($groupNumber==count($defaultParentCategoryId)) { + $groupNumber = 0; + } +} diff --git a/dev/tools/performance-toolkit/fixtures/configurable_products.php b/dev/tools/performance-toolkit/fixtures/configurable_products.php new file mode 100644 index 0000000000000000000000000000000000000000..6db97f7cbf9edaa592a70d916b67f674e75ae215 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/configurable_products.php @@ -0,0 +1,878 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$configurablesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('configurable_products', 90); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); + +$result = array(); +//Get all websites +$websites = $storeManager->getWebsites(); +foreach ($websites as $website) { + $websiteCode = $website->getCode(); + //Get all groups + $websiteGroups = $website->getGroups(); + foreach ($websiteGroups as $websiteGroup) { + $websiteGroupRootCategory = $websiteGroup->getRootCategoryId(); + $category->load($websiteGroupRootCategory); + $categoryResource = $category->getResource(); + $rootCategoryName = $category->getName(); + //Get all categories + $resultsCategories = $categoryResource->getAllChildren($category); + foreach ($resultsCategories as $resultsCategory) { + $category->load($resultsCategory); + $structure = explode('/', $category->getPath()); + $pathSize = count($structure); + if ($pathSize > 1) { + $path = array(); + for ($i = 1; $i < $pathSize; $i++) { + $path[] = $category->load($structure[$i])->getName(); + } + array_shift($path); + $resultsCategoryName = implode('/', $path); + } else { + $resultsCategoryName = $category->getName(); + } + //Deleted root categories + if (trim($resultsCategoryName)!='') { + $result[$resultsCategory] = array($websiteCode, $resultsCategoryName, $rootCategoryName); + } + } + } +} +$result = array_values($result); + +$productWebsite = function ($index) use ($result) { + return $result[$index % count($result)][0]; +}; +$productCategory = function ($index) use ($result) { + return $result[$index % count($result)][1]; +}; +$productRootCategory = function ($index) use ($result) { + return $result[$index % count($result)][2]; +}; + +$headers = array ( + 'sku', + '_store', + '_attribute_set', + '_type', + '_category', + '_root_category', + '_product_websites', + 'color', + 'configurable_variations', + 'cost', + 'country_of_manufacture', + 'created_at', + 'custom_design', + 'custom_design_from', + 'custom_design_to', + 'custom_layout_update', + 'description', + 'enable_googlecheckout', + 'gallery', + 'gift_message_available', + 'gift_wrapping_available', + 'gift_wrapping_price', + 'has_options', + 'image', + 'image_label', + 'is_returnable', + 'manufacturer', + 'meta_description', + 'meta_keyword', + 'meta_title', + 'minimal_price', + 'msrp', + 'msrp_display_actual_price_type', + 'name', + 'news_from_date', + 'news_to_date', + 'options_container', + 'page_layout', + 'price', + 'quantity_and_stock_status', + 'related_tgtr_position_behavior', + 'related_tgtr_position_limit', + 'required_options', + 'short_description', + 'small_image', + 'small_image_label', + 'special_from_date', + 'special_price', + 'special_to_date', + 'status', + 'tax_class_id', + 'thumbnail', + 'thumbnail_label', + 'updated_at', + 'upsell_tgtr_position_behavior', + 'upsell_tgtr_position_limit', + 'url_key', + 'url_path', + 'variations', + 'variations_1382710717', + 'variations_1382710773', + 'variations_1382710861', + 'visibility', + 'weight', + 'qty', + 'min_qty', + 'use_config_min_qty', + 'is_qty_decimal', + 'backorders', + 'use_config_backorders', + 'min_sale_qty', + 'use_config_min_sale_qty', + 'max_sale_qty', + 'use_config_max_sale_qty', + 'is_in_stock', + 'notify_stock_qty', + 'use_config_notify_stock_qty', + 'manage_stock', + 'use_config_manage_stock', + 'use_config_qty_increments', + 'qty_increments', + 'use_config_enable_qty_inc', + 'enable_qty_increments', + 'is_decimal_divided', + '_related_sku', + '_related_position', + '_crosssell_sku', + '_crosssell_position', + '_upsell_sku', + '_upsell_position', + '_associated_sku', + '_associated_default_qty', + '_associated_position', + '_tier_price_website', + '_tier_price_customer_group', + '_tier_price_qty', + '_tier_price_price', + '_group_price_website', + '_group_price_customer_group', + '_group_price_price', + '_media_attribute_id', + '_media_image', + '_media_label', + '_media_position', + '_media_is_disabled', + '_super_products_sku', + '_super_attribute_code', + '_super_attribute_option', + '_super_attribute_price_corr', +); + +$rows = array ( + array ( + 'sku' => 'Configurable Product %s-option 1', + '_store' => '', + '_attribute_set' => 'Default', + '_type' => 'simple', + '_category' => $productCategory, + '_root_category' => $productRootCategory, + '_product_websites' => $productWebsite, + 'color' => '', + 'configurable_variations' => 'option 1', + 'cost' => '', + 'country_of_manufacture' => '', + 'created_at' => '2013-10-25 15:12:32', + 'custom_design' => '', + 'custom_design_from' => '', + 'custom_design_to' => '', + 'custom_layout_update' => '', + 'description' => '<p>Configurable product description %s</p>', + 'enable_googlecheckout' => '1', + 'gallery' => '', + 'gift_message_available' => '', + 'gift_wrapping_available' => '', + 'gift_wrapping_price' => '', + 'has_options' => '0', + 'image' => '', + 'image_label' => '', + 'is_returnable' => 'Use config', + 'manufacturer' => '', + 'meta_description' => 'Configurable Product %s <p>Configurable product description 1</p>', + 'meta_keyword' => 'Configurable Product 1', + 'meta_title' => 'Configurable Product %s', + 'minimal_price' => '', + 'msrp' => '', + 'msrp_display_actual_price_type' => 'Use config', + 'name' => 'Configurable Product %s-option 1', + 'news_from_date' => '', + 'news_to_date' => '', + 'options_container' => 'Block after Info Column', + 'page_layout' => '', + 'price' => '10.0000', + 'quantity_and_stock_status' => 'In Stock', + 'related_tgtr_position_behavior' => '', + 'related_tgtr_position_limit' => '', + 'required_options' => '0', + 'short_description' => '', + 'small_image' => '', + 'small_image_label' => '', + 'special_from_date' => '', + 'special_price' => '', + 'special_to_date' => '', + 'status' => '1', + 'tax_class_id' => '2', + 'thumbnail' => '', + 'thumbnail_label' => '', + 'updated_at' => '2013-10-25 15:12:32', + 'upsell_tgtr_position_behavior' => '', + 'upsell_tgtr_position_limit' => '', + 'url_key' => 'configurable-product-%s-option-1', + 'url_path' => 'configurable-product-%s-option-1.html', + 'variations' => '', + 'variations_1382710717' => '', + 'variations_1382710773' => '', + 'variations_1382710861' => '', + 'visibility' => '1', + 'weight' => '1.0000', + 'qty' => '111.0000', + 'min_qty' => '0.0000', + 'use_config_min_qty' => '1', + 'is_qty_decimal' => '0', + 'backorders' => '0', + 'use_config_backorders' => '1', + 'min_sale_qty' => '1.0000', + 'use_config_min_sale_qty' => '1', + 'max_sale_qty' => '0.0000', + 'use_config_max_sale_qty' => '1', + 'is_in_stock' => '1', + 'notify_stock_qty' => '', + 'use_config_notify_stock_qty' => '1', + 'manage_stock' => '1', + 'use_config_manage_stock' => '1', + 'use_config_qty_increments' => '1', + 'qty_increments' => '0.0000', + 'use_config_enable_qty_inc' => '1', + 'enable_qty_increments' => '0', + 'is_decimal_divided' => '0', + '_related_sku' => '', + '_related_position' => '', + '_crosssell_sku' => '', + '_crosssell_position' => '', + '_upsell_sku' => '', + '_upsell_position' => '', + '_associated_sku' => '', + '_associated_default_qty' => '', + '_associated_position' => '', + '_tier_price_website' => '', + '_tier_price_customer_group' => '', + '_tier_price_qty' => '', + '_tier_price_price' => '', + '_group_price_website' => '', + '_group_price_customer_group' => '', + '_group_price_price' => '', + '_media_attribute_id' => '', + '_media_image' => '', + '_media_label' => '', + '_media_position' => '', + '_media_is_disabled' => '', + '_super_products_sku' => '', + '_super_attribute_code' => '', + '_super_attribute_option' => '', + '_super_attribute_price_corr' => '', + ), + array ( + 'sku' => 'Configurable Product %s-option 2', + '_store' => '', + '_attribute_set' => 'Default', + '_type' => 'simple', + '_category' => $productCategory, + '_root_category' => $productRootCategory, + '_product_websites' => $productWebsite, + 'color' => '', + 'configurable_variations' => 'option 2', + 'cost' => '', + 'country_of_manufacture' => '', + 'created_at' => '2013-10-25 15:12:35', + 'custom_design' => '', + 'custom_design_from' => '', + 'custom_design_to' => '', + 'custom_layout_update' => '', + 'description' => '<p>Configurable product description %s</p>', + 'enable_googlecheckout' => '1', + 'gallery' => '', + 'gift_message_available' => '', + 'gift_wrapping_available' => '', + 'gift_wrapping_price' => '', + 'has_options' => '0', + 'image' => '', + 'image_label' => '', + 'is_returnable' => 'Use config', + 'manufacturer' => '', + 'meta_description' => 'Configurable Product %s <p>Configurable product description 1</p>', + 'meta_keyword' => 'Configurable Product 1', + 'meta_title' => 'Configurable Product %s', + 'minimal_price' => '', + 'msrp' => '', + 'msrp_display_actual_price_type' => 'Use config', + 'name' => 'Configurable Product %s-option 2', + 'news_from_date' => '', + 'news_to_date' => '', + 'options_container' => 'Block after Info Column', + 'page_layout' => '', + 'price' => '10.0000', + 'quantity_and_stock_status' => 'In Stock', + 'related_tgtr_position_behavior' => '', + 'related_tgtr_position_limit' => '', + 'required_options' => '0', + 'short_description' => '', + 'small_image' => '', + 'small_image_label' => '', + 'special_from_date' => '', + 'special_price' => '', + 'special_to_date' => '', + 'status' => '1', + 'tax_class_id' => '2', + 'thumbnail' => '', + 'thumbnail_label' => '', + 'updated_at' => '2013-10-25 15:12:35', + 'upsell_tgtr_position_behavior' => '', + 'upsell_tgtr_position_limit' => '', + 'url_key' => 'configurable-product-%s-option-2', + 'url_path' => 'configurable-product-%s-option-2.html', + 'variations' => '', + 'variations_1382710717' => '', + 'variations_1382710773' => '', + 'variations_1382710861' => '', + 'visibility' => '1', + 'weight' => '1.0000', + 'qty' => '111.0000', + 'min_qty' => '0.0000', + 'use_config_min_qty' => '1', + 'is_qty_decimal' => '0', + 'backorders' => '0', + 'use_config_backorders' => '1', + 'min_sale_qty' => '1.0000', + 'use_config_min_sale_qty' => '1', + 'max_sale_qty' => '0.0000', + 'use_config_max_sale_qty' => '1', + 'is_in_stock' => '1', + 'notify_stock_qty' => '', + 'use_config_notify_stock_qty' => '1', + 'manage_stock' => '1', + 'use_config_manage_stock' => '1', + 'use_config_qty_increments' => '1', + 'qty_increments' => '0.0000', + 'use_config_enable_qty_inc' => '1', + 'enable_qty_increments' => '0', + 'is_decimal_divided' => '0', + '_related_sku' => '', + '_related_position' => '', + '_crosssell_sku' => '', + '_crosssell_position' => '', + '_upsell_sku' => '', + '_upsell_position' => '', + '_associated_sku' => '', + '_associated_default_qty' => '', + '_associated_position' => '', + '_tier_price_website' => '', + '_tier_price_customer_group' => '', + '_tier_price_qty' => '', + '_tier_price_price' => '', + '_group_price_website' => '', + '_group_price_customer_group' => '', + '_group_price_price' => '', + '_media_attribute_id' => '', + '_media_image' => '', + '_media_label' => '', + '_media_position' => '', + '_media_is_disabled' => '', + '_super_products_sku' => '', + '_super_attribute_code' => '', + '_super_attribute_option' => '', + '_super_attribute_price_corr' => '', + ), + array ( + 'sku' => 'Configurable Product %s-option 3', + '_store' => '', + '_attribute_set' => 'Default', + '_type' => 'simple', + '_category' => $productCategory, + '_root_category' => $productRootCategory, + '_product_websites' => $productWebsite, + 'color' => '', + 'configurable_variations' => 'option 3', + 'cost' => '', + 'country_of_manufacture' => '', + 'created_at' => '2013-10-25 15:12:37', + 'custom_design' => '', + 'custom_design_from' => '', + 'custom_design_to' => '', + 'custom_layout_update' => '', + 'description' => '<p>Configurable product description %s</p>', + 'enable_googlecheckout' => '1', + 'gallery' => '', + 'gift_message_available' => '', + 'gift_wrapping_available' => '', + 'gift_wrapping_price' => '', + 'has_options' => '0', + 'image' => '', + 'image_label' => '', + 'is_returnable' => 'Use config', + 'manufacturer' => '', + 'meta_description' => 'Configurable Product %s <p>Configurable product description 1</p>', + 'meta_keyword' => 'Configurable Product 1', + 'meta_title' => 'Configurable Product %s', + 'minimal_price' => '', + 'msrp' => '', + 'msrp_display_actual_price_type' => 'Use config', + 'name' => 'Configurable Product %s-option 3', + 'news_from_date' => '', + 'news_to_date' => '', + 'options_container' => 'Block after Info Column', + 'page_layout' => '', + 'price' => '10.0000', + 'quantity_and_stock_status' => 'In Stock', + 'related_tgtr_position_behavior' => '', + 'related_tgtr_position_limit' => '', + 'required_options' => '0', + 'short_description' => '', + 'small_image' => '', + 'small_image_label' => '', + 'special_from_date' => '', + 'special_price' => '', + 'special_to_date' => '', + 'status' => '1', + 'tax_class_id' => '2', + 'thumbnail' => '', + 'thumbnail_label' => '', + 'updated_at' => '2013-10-25 15:12:37', + 'upsell_tgtr_position_behavior' => '', + 'upsell_tgtr_position_limit' => '', + 'url_key' => 'configurable-product-%s-option-3', + 'url_path' => 'configurable-product-%s-option-3.html', + 'variations' => '', + 'variations_1382710717' => '', + 'variations_1382710773' => '', + 'variations_1382710861' => '', + 'visibility' => '1', + 'weight' => '1.0000', + 'qty' => '111.0000', + 'min_qty' => '0.0000', + 'use_config_min_qty' => '1', + 'is_qty_decimal' => '0', + 'backorders' => '0', + 'use_config_backorders' => '1', + 'min_sale_qty' => '1.0000', + 'use_config_min_sale_qty' => '1', + 'max_sale_qty' => '0.0000', + 'use_config_max_sale_qty' => '1', + 'is_in_stock' => '1', + 'notify_stock_qty' => '', + 'use_config_notify_stock_qty' => '1', + 'manage_stock' => '1', + 'use_config_manage_stock' => '1', + 'use_config_qty_increments' => '1', + 'qty_increments' => '0.0000', + 'use_config_enable_qty_inc' => '1', + 'enable_qty_increments' => '0', + 'is_decimal_divided' => '0', + '_related_sku' => '', + '_related_position' => '', + '_crosssell_sku' => '', + '_crosssell_position' => '', + '_upsell_sku' => '', + '_upsell_position' => '', + '_associated_sku' => '', + '_associated_default_qty' => '', + '_associated_position' => '', + '_tier_price_website' => '', + '_tier_price_customer_group' => '', + '_tier_price_qty' => '', + '_tier_price_price' => '', + '_group_price_website' => '', + '_group_price_customer_group' => '', + '_group_price_price' => '', + '_media_attribute_id' => '', + '_media_image' => '', + '_media_label' => '', + '_media_position' => '', + '_media_is_disabled' => '', + '_super_products_sku' => '', + '_super_attribute_code' => '', + '_super_attribute_option' => '', + '_super_attribute_price_corr' => '', + ), + array ( + 'sku' => 'Configurable Product %s', + '_store' => '', + '_attribute_set' => 'Default', + '_type' => 'configurable', + '_category' => $productCategory, + '_root_category' => $productRootCategory, + '_product_websites' => $productWebsite, + 'color' => '', + 'configurable_variations' => '', + 'cost' => '', + 'country_of_manufacture' => '', + 'created_at' => '2013-10-25 15:12:39', + 'custom_design' => '', + 'custom_design_from' => '', + 'custom_design_to' => '', + 'custom_layout_update' => '', + 'description' => '<p>Configurable product description %s</p>', + 'enable_googlecheckout' => '1', + 'gallery' => '', + 'gift_message_available' => '', + 'gift_wrapping_available' => '', + 'gift_wrapping_price' => '', + 'has_options' => '1', + 'image' => '', + 'image_label' => '', + 'is_returnable' => 'Use config', + 'manufacturer' => '', + 'meta_description' => 'Configurable Product %s <p>Configurable product description %s</p>', + 'meta_keyword' => 'Configurable Product %s', + 'meta_title' => 'Configurable Product %s', + 'minimal_price' => '', + 'msrp' => '', + 'msrp_display_actual_price_type' => 'Use config', + 'name' => 'Configurable Product %s', + 'news_from_date' => '', + 'news_to_date' => '', + 'options_container' => 'Block after Info Column', + 'page_layout' => '', + 'price' => '10.0000', + 'quantity_and_stock_status' => 'In Stock', + 'related_tgtr_position_behavior' => '', + 'related_tgtr_position_limit' => '', + 'required_options' => '1', + 'short_description' => '', + 'small_image' => '', + 'small_image_label' => '', + 'special_from_date' => '', + 'special_price' => '', + 'special_to_date' => '', + 'status' => '1', + 'tax_class_id' => '2', + 'thumbnail' => '', + 'thumbnail_label' => '', + 'updated_at' => '2013-10-25 15:12:39', + 'upsell_tgtr_position_behavior' => '', + 'upsell_tgtr_position_limit' => '', + 'url_key' => 'configurable-product-%s', + 'url_path' => 'configurable-product-%s.html', + 'variations' => '', + 'variations_1382710717' => '', + 'variations_1382710773' => '', + 'variations_1382710861' => '', + 'visibility' => '4', + 'weight' => '', + 'qty' => 333, + 'min_qty' => '0.0000', + 'use_config_min_qty' => '1', + 'is_qty_decimal' => '0', + 'backorders' => '0', + 'use_config_backorders' => '1', + 'min_sale_qty' => '1.0000', + 'use_config_min_sale_qty' => '1', + 'max_sale_qty' => '0.0000', + 'use_config_max_sale_qty' => '1', + 'is_in_stock' => '1', + 'notify_stock_qty' => '', + 'use_config_notify_stock_qty' => '1', + 'manage_stock' => '1', + 'use_config_manage_stock' => '1', + 'use_config_qty_increments' => '1', + 'qty_increments' => '0.0000', + 'use_config_enable_qty_inc' => '1', + 'enable_qty_increments' => '0', + 'is_decimal_divided' => '0', + '_related_sku' => '', + '_related_position' => '', + '_crosssell_sku' => '', + '_crosssell_position' => '', + '_upsell_sku' => '', + '_upsell_position' => '', + '_associated_sku' => '', + '_associated_default_qty' => '', + '_associated_position' => '', + '_tier_price_website' => '', + '_tier_price_customer_group' => '', + '_tier_price_qty' => '', + '_tier_price_price' => '', + '_group_price_website' => '', + '_group_price_customer_group' => '', + '_group_price_price' => '', + '_media_attribute_id' => '', + '_media_image' => '', + '_media_label' => '', + '_media_position' => '', + '_media_is_disabled' => '', + '_super_products_sku' => 'Configurable Product %s-option 1', + '_super_attribute_code' => 'configurable_variations', + '_super_attribute_option' => 'option 1', + '_super_attribute_price_corr' => '10.0000', + ), + array ( + 'sku' => '', + '_store' => '', + '_attribute_set' => '', + '_type' => '', + '_category' => '', + '_root_category' => '', + '_product_websites' => '', + 'color' => '', + 'configurable_variations' => '', + 'cost' => '', + 'country_of_manufacture' => '', + 'created_at' => '', + 'custom_design' => '', + 'custom_design_from' => '', + 'custom_design_to' => '', + 'custom_layout_update' => '', + 'description' => '', + 'enable_googlecheckout' => '', + 'gallery' => '', + 'gift_message_available' => '', + 'gift_wrapping_available' => '', + 'gift_wrapping_price' => '', + 'has_options' => '', + 'image' => '', + 'image_label' => '', + 'is_returnable' => '', + 'manufacturer' => '', + 'meta_description' => '', + 'meta_keyword' => '', + 'meta_title' => '', + 'minimal_price' => '', + 'msrp' => '', + 'msrp_display_actual_price_type' => '', + 'name' => '', + 'news_from_date' => '', + 'news_to_date' => '', + 'options_container' => '', + 'page_layout' => '', + 'price' => '', + 'quantity_and_stock_status' => '', + 'related_tgtr_position_behavior' => '', + 'related_tgtr_position_limit' => '', + 'required_options' => '', + 'short_description' => '', + 'small_image' => '', + 'small_image_label' => '', + 'special_from_date' => '', + 'special_price' => '', + 'special_to_date' => '', + 'status' => '', + 'tax_class_id' => '', + 'thumbnail' => '', + 'thumbnail_label' => '', + 'updated_at' => '', + 'upsell_tgtr_position_behavior' => '', + 'upsell_tgtr_position_limit' => '', + 'url_key' => '', + 'url_path' => '', + 'variations' => '', + 'variations_1382710717' => '', + 'variations_1382710773' => '', + 'variations_1382710861' => '', + 'visibility' => '', + 'weight' => '', + 'qty' => 333, + 'min_qty' => '', + 'use_config_min_qty' => '', + 'is_qty_decimal' => '', + 'backorders' => '', + 'use_config_backorders' => '', + 'min_sale_qty' => '', + 'use_config_min_sale_qty' => '', + 'max_sale_qty' => '', + 'use_config_max_sale_qty' => '', + 'is_in_stock' => '', + 'notify_stock_qty' => '', + 'use_config_notify_stock_qty' => '', + 'manage_stock' => '', + 'use_config_manage_stock' => '', + 'use_config_qty_increments' => '', + 'qty_increments' => '', + 'use_config_enable_qty_inc' => '', + 'enable_qty_increments' => '', + 'is_decimal_divided' => '', + '_related_sku' => '', + '_related_position' => '', + '_crosssell_sku' => '', + '_crosssell_position' => '', + '_upsell_sku' => '', + '_upsell_position' => '', + '_associated_sku' => '', + '_associated_default_qty' => '', + '_associated_position' => '', + '_tier_price_website' => '', + '_tier_price_customer_group' => '', + '_tier_price_qty' => '', + '_tier_price_price' => '', + '_group_price_website' => '', + '_group_price_customer_group' => '', + '_group_price_price' => '', + '_media_attribute_id' => '', + '_media_image' => '', + '_media_label' => '', + '_media_position' => '', + '_media_is_disabled' => '', + '_super_products_sku' => 'Configurable Product %s-option 2', + '_super_attribute_code' => 'configurable_variations', + '_super_attribute_option' => 'option 2', + '_super_attribute_price_corr' => '20.0000', + ), + array ( + 'sku' => '', + '_store' => '', + '_attribute_set' => '', + '_type' => '', + '_category' => '', + '_root_category' => '', + '_product_websites' => '', + 'color' => '', + 'configurable_variations' => '', + 'cost' => '', + 'country_of_manufacture' => '', + 'created_at' => '', + 'custom_design' => '', + 'custom_design_from' => '', + 'custom_design_to' => '', + 'custom_layout_update' => '', + 'description' => '', + 'enable_googlecheckout' => '', + 'gallery' => '', + 'gift_message_available' => '', + 'gift_wrapping_available' => '', + 'gift_wrapping_price' => '', + 'has_options' => '', + 'image' => '', + 'image_label' => '', + 'is_returnable' => '', + 'manufacturer' => '', + 'meta_description' => '', + 'meta_keyword' => '', + 'meta_title' => '', + 'minimal_price' => '', + 'msrp' => '', + 'msrp_display_actual_price_type' => '', + 'name' => '', + 'news_from_date' => '', + 'news_to_date' => '', + 'options_container' => '', + 'page_layout' => '', + 'price' => '', + 'quantity_and_stock_status' => '', + 'related_tgtr_position_behavior' => '', + 'related_tgtr_position_limit' => '', + 'required_options' => '', + 'short_description' => '', + 'small_image' => '', + 'small_image_label' => '', + 'special_from_date' => '', + 'special_price' => '', + 'special_to_date' => '', + 'status' => '', + 'tax_class_id' => '', + 'thumbnail' => '', + 'thumbnail_label' => '', + 'updated_at' => '', + 'upsell_tgtr_position_behavior' => '', + 'upsell_tgtr_position_limit' => '', + 'url_key' => '', + 'url_path' => '', + 'variations' => '', + 'variations_1382710717' => '', + 'variations_1382710773' => '', + 'variations_1382710861' => '', + 'visibility' => '', + 'weight' => '', + 'qty' => 333, + 'min_qty' => '', + 'use_config_min_qty' => '', + 'is_qty_decimal' => '', + 'backorders' => '', + 'use_config_backorders' => '', + 'min_sale_qty' => '', + 'use_config_min_sale_qty' => '', + 'max_sale_qty' => '', + 'use_config_max_sale_qty' => '', + 'is_in_stock' => '', + 'notify_stock_qty' => '', + 'use_config_notify_stock_qty' => '', + 'manage_stock' => '', + 'use_config_manage_stock' => '', + 'use_config_qty_increments' => '', + 'qty_increments' => '', + 'use_config_enable_qty_inc' => '', + 'enable_qty_increments' => '', + 'is_decimal_divided' => '', + '_related_sku' => '', + '_related_position' => '', + '_crosssell_sku' => '', + '_crosssell_position' => '', + '_upsell_sku' => '', + '_upsell_position' => '', + '_associated_sku' => '', + '_associated_default_qty' => '', + '_associated_position' => '', + '_tier_price_website' => '', + '_tier_price_customer_group' => '', + '_tier_price_qty' => '', + '_tier_price_price' => '', + '_group_price_website' => '', + '_group_price_customer_group' => '', + '_group_price_price' => '', + '_media_attribute_id' => '', + '_media_image' => '', + '_media_label' => '', + '_media_position' => '', + '_media_is_disabled' => '', + '_super_products_sku' => 'Configurable Product %s-option 3', + '_super_attribute_code' => 'configurable_variations', + '_super_attribute_option' => 'option 3', + '_super_attribute_price_corr' => '30.0000', + ), +); + +/** + * Create configurable products + */ +$pattern = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern(); +$pattern->setHeaders($headers); +$pattern->setRowsSet($rows); + +/** @var \Magento\ImportExport\Model\Import $import */ +$import = $this->getObjectManager()->create( + 'Magento\ImportExport\Model\Import', + array('data' => array('entity' => 'catalog_product', 'behavior' => 'append')) +); + +$source = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Generator($pattern, $configurablesCount); +// it is not obvious, but the validateSource() will actually save import queue data to DB +$import->validateSource($source); +// this converts import queue into actual entities +$import->importSource(); diff --git a/dev/tools/performance-toolkit/fixtures/customers.php b/dev/tools/performance-toolkit/fixtures/customers.php new file mode 100644 index 0000000000000000000000000000000000000000..718cbe134b3863c536bcab2b623953294f907559 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/customers.php @@ -0,0 +1,96 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$customersNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('customers', 10); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); + +$result = array(); +//Get all websites +$websites = $storeManager->getWebsites(); +foreach ($websites as $website) { + $result[] = $website->getCode(); +} +$result = array_values($result); + +$productWebsite = function ($index) use ($result) { + return $result[$index % count($result)]; +}; + +$pattern = array( + 'email' => 'user_%s@example.com', + '_website' => $productWebsite, + '_store' => '', + 'confirmation' => null, + 'created_at' => '30-08-2012 17:43', + 'created_in' => 'Default', + 'default_billing' => '1', + 'default_shipping' => '1', + 'disable_auto_group_change' => '0', + 'dob' => '12-10-1991', + 'firstname' => 'Firstname', + 'gender' => 'Male', + 'group_id' => '1', + 'lastname' => 'Lastname', + 'middlename' => '', + 'password_hash' => '', + 'prefix' => null, + 'rp_token' => null, + 'rp_token_created_at' => null, + 'store_id' => '0', + 'suffix' => null, + 'taxvat' => null, + 'website_id' => '1', + 'password' => '123123q', + '_address_city' => 'Fayetteville', + '_address_company' => '', + '_address_country_id' => 'US', + '_address_fax' => '', + '_address_firstname' => 'Anthony', + '_address_lastname' => 'Nealy', + '_address_middlename' => '', + '_address_postcode' => '123123', + '_address_prefix' => '', + '_address_region' => 'Arkansas', + '_address_street' => '123 Freedom Blvd. #123', + '_address_suffix' => '', + '_address_telephone' => '022-333-4455', + '_address_vat_id' => '', + '_address_default_billing_' => '1', + '_address_default_shipping_' => '1' +); +$generator = new \Magento\ToolkitFramework\ImportExport\Fixture\Generator($pattern, $customersNumber); +/** @var Magento\ImportExport\Model\Import $import */ +$import = $this->getObjectManager()->create( + 'Magento\ImportExport\Model\Import', + array('data' => array('entity' => 'customer_composite', 'behavior' => 'append')) +); +// it is not obvious, but the validateSource() will actually save import queue data to DB +$import->validateSource($generator); +// this converts import queue into actual entities +$import->importSource(); diff --git a/dev/tools/performance-toolkit/fixtures/disable_form_key_usage.php b/dev/tools/performance-toolkit/fixtures/disable_form_key_usage.php new file mode 100644 index 0000000000000000000000000000000000000000..3a0365fbc3913380ce4f879b49742724231c7f67 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/disable_form_key_usage.php @@ -0,0 +1,37 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$this->resetObjectManager(); +/** + * @var \Magento\Framework\App\Config\Value $configData + */ +$configData = $this->getObjectManager()->create('Magento\Framework\App\Config\Value'); +$configData->setPath(\Magento\Backend\Model\Url::XML_PATH_USE_SECURE_KEY) + ->setScope(\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT) + ->setScopeId(0) + ->setValue(0) + ->save(); + +$this->getObjectManager()->get('Magento\Framework\App\CacheInterface') + ->clean(array(\Magento\Framework\App\Config::CACHE_TAG)); diff --git a/dev/tools/performance-toolkit/fixtures/eav_variations.php b/dev/tools/performance-toolkit/fixtures/eav_variations.php new file mode 100644 index 0000000000000000000000000000000000000000..1b5ce595984b016e6743d6ee03ebb8acc9b2b890 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/eav_variations.php @@ -0,0 +1,98 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +define('ATTRIBUTE_SET_ID', 4); +$this->resetObjectManager(); + +/* @var $model \Magento\Catalog\Model\Resource\Eav\Attribute */ +$model = $this->getObjectManager()->create('Magento\Catalog\Model\Resource\Eav\Attribute'); +/* @var $helper \Magento\Catalog\Helper\Product */ +$helper = $this->getObjectManager()->get('Magento\Catalog\Helper\Product'); +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$stores = $storeManager->getStores(); +$storeViewsCount = count($stores); + +$data = array( + 'frontend_label' => array_fill(0, $storeViewsCount + 1, 'configurable variations'), + 'frontend_input' => 'select', + 'is_required' => '0', + 'option' => array( + 'order' => array( + 'option_0' => '1', + 'option_1' => '2', + 'option_2' => '3', + ), + 'value' => array( + 'option_0' => array_fill(0, $storeViewsCount + 1, 'option 1'), + 'option_1' => array_fill(0, $storeViewsCount + 1, 'option 2'), + 'option_2' => array_fill(0, $storeViewsCount + 1, 'option 3'), + ), + 'delete' => array( + 'option_0' => '', + 'option_1' => '', + 'option_2' => '', + ), + ), + 'default' => array('option_0'), + 'attribute_code' => 'configurable_variations', + 'is_global' => '1', + 'default_value_text' => '', + 'default_value_yesno' => '0', + 'default_value_date' => '', + 'default_value_textarea' => '', + 'is_unique' => '0', + 'is_configurable' => '1', + 'is_searchable' => '0', + 'is_visible_in_advanced_search' => '0', + 'is_comparable' => '0', + 'is_filterable' => '0', + 'is_filterable_in_search' => '0', + 'is_used_for_promo_rules' => '0', + 'is_html_allowed_on_front' => '1', + 'is_visible_on_front' => '0', + 'used_in_product_listing' => '0', + 'used_for_sort_by' => '0', + 'source_model' => null, + 'backend_model' => null, + 'apply_to' => array(), + 'backend_type' => 'int', + 'entity_type_id' => 4, + 'is_user_defined' => 1, +); +/** + * The logic is not obvious, but looking to the controller logic for configurable products this attribute requires + * to be saved twice to become a child of Default attribute set and become available for creating and|or importing + * configurable products. + * See MAGETWO-16492 + */ +$model->addData($data); +$attributeSet = $this->getObjectManager()->get('Magento\Eav\Model\Entity\Attribute\Set'); +$attributeSet->load(ATTRIBUTE_SET_ID); +$model->setAttributeSetId(ATTRIBUTE_SET_ID) + ->setAttributeGroupId($attributeSet->getDefaultGroupId(4)) + ->save(); + +$model->setAttributeSetId(ATTRIBUTE_SET_ID); +$model->save(); diff --git a/dev/tools/performance-toolkit/fixtures/shipping_flatrate_enabled.php b/dev/tools/performance-toolkit/fixtures/shipping_flatrate_enabled.php new file mode 100644 index 0000000000000000000000000000000000000000..be9407c62beed1eec84ae420e8843b152a8e6c7e --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/shipping_flatrate_enabled.php @@ -0,0 +1,37 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$this->resetObjectManager(); +/** + * @var \Magento\Framework\App\Config\Value $configData + */ +$configData = $this->getObjectManager()->create('Magento\Framework\App\Config\Value'); +$configData->setPath('carriers/flatrate/active') + ->setScope(\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT) + ->setScopeId(0) + ->setValue(1) + ->save(); + +$this->getObjectManager()->get('Magento\Framework\App\CacheInterface') + ->clean(array(\Magento\Framework\App\Config::CACHE_TAG)); diff --git a/dev/tools/performance-toolkit/fixtures/simple_products.php b/dev/tools/performance-toolkit/fixtures/simple_products.php new file mode 100644 index 0000000000000000000000000000000000000000..dd286a02f7978d37f25e3a9bae50249f593b647d --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/simple_products.php @@ -0,0 +1,116 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$simpleProductsCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('simple_products', 180); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); + +$result = array(); +//Get all websites +$websites = $storeManager->getWebsites(); +foreach ($websites as $website) { + $websiteCode = $website->getCode(); + //Get all groups + $websiteGroups = $website->getGroups(); + foreach ($websiteGroups as $websiteGroup) { + $websiteGroupRootCategory = $websiteGroup->getRootCategoryId(); + $category->load($websiteGroupRootCategory); + $categoryResource = $category->getResource(); + //Get all categories + $resultsCategories = $categoryResource->getAllChildren($category); + foreach ($resultsCategories as $resultsCategory) { + $category->load($resultsCategory); + $structure = explode('/', $category->getPath()); + $pathSize = count($structure); + if ($pathSize > 1) { + $path = array(); + for ($i = 1; $i < $pathSize; $i++) { + $path[] = $category->load($structure[$i])->getName(); + } + array_shift($path); + $resultsCategoryName = implode('/', $path); + } else { + $resultsCategoryName = $category->getName(); + } + //Deleted root categories + if (trim($resultsCategoryName)!='') { + $result[$resultsCategory] = array($websiteCode, $resultsCategoryName); + } + } + } +} +$result = array_values($result); + +$productWebsite = function ($index) use ($result) { + return $result[$index % count($result)][0]; +}; +$productCategory = function ($index) use ($result) { + return $result[$index % count($result)][1]; +}; + +/** + * Create products + */ +$pattern = array( + '_attribute_set' => 'Default', + '_type' => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE, + '_product_websites' => $productWebsite, + '_category' => $productCategory, + 'name' => 'Simple Product %s', + 'short_description' => 'Short simple product description %s', + 'weight' => 1, + 'description' => 'Full simple product Description %s', + 'sku' => 'product_dynamic_%s', + 'price' => 10, + 'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH, + 'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED, + 'tax_class_id' => 2, + + // actually it saves without stock data, but by default system won't show on the frontend products out of stock + 'is_in_stock' => 1, + 'qty' => 100500, + 'use_config_min_qty' => '1', + 'use_config_backorders' => '1', + 'use_config_min_sale_qty' => '1', + 'use_config_max_sale_qty' => '1', + 'use_config_notify_stock_qty' => '1', + 'use_config_manage_stock' => '1', + 'use_config_qty_increments' => '1', + 'use_config_enable_qty_inc' => '1', + 'stock_id' => \Magento\CatalogInventory\Model\Stock::DEFAULT_STOCK_ID, +); +$generator = new \Magento\ToolkitFramework\ImportExport\Fixture\Generator($pattern, $simpleProductsCount); +/** @var \Magento\ImportExport\Model\Import $import */ +$import = $this->getObjectManager()->create( + 'Magento\ImportExport\Model\Import', + array('data' => array('entity' => 'catalog_product', 'behavior' => 'append')) +); +// it is not obvious, but the validateSource() will actually save import queue data to DB +$import->validateSource($generator); +// this converts import queue into actual entities +$import->importSource(); diff --git a/dev/tools/performance-toolkit/fixtures/stores.php b/dev/tools/performance-toolkit/fixtures/stores.php new file mode 100644 index 0000000000000000000000000000000000000000..9c958b7d3631e1c175551fcd1d4f960a8f3c65a4 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/stores.php @@ -0,0 +1,157 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$websitesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('websites', 2); +$storeGroupsCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('store_groups', 3); +$storesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('store_views', 5); +$this->resetObjectManager(); + +/** @var \Magento\Store\Model\StoreManager $storeManager */ +$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +/** @var $category \Magento\Catalog\Model\Category */ +$category = $this->getObjectManager()->create('Magento\Catalog\Model\Category'); + +/** @var $defaultWebsite \Magento\Store\Model\Website */ +$defaultWebsite = $storeManager->getWebsite(); +/** @var $defaultStoreGroup \Magento\Store\Model\Group */ +$defaultStoreGroup = $storeManager->getGroup(); +/** @var $defaultStoreView \Magento\Store\Model\Store */ +$defaultStoreView = $storeManager->getDefaultStoreView(); + +$defaultParentCategoryId = $storeManager->getStore()->getRootCategoryId(); + +$defaultWebsiteId = $defaultWebsite->getId(); +$defaultStoreGroupId = $defaultStoreGroup->getId(); +$defaultStoreViewId = $defaultStoreView->getId(); + +$websitesId = array(); +$groupsId = array(); + +//Create $websitesCount websites +for ($i = 0; $i < $websitesCount; $i++) { + $websiteId = null; + if ($i == 0) { + $websiteId = $defaultWebsiteId; + } + $website = clone $defaultWebsite; + $websiteCode = sprintf('website_%d', $i+1); + $websiteName = sprintf('Website %d', $i+1); + $website->addData( + array( + 'website_id' => $websiteId, + 'code' => $websiteCode, + 'name' => $websiteName + ) + ); + $website->save(); + $websitesId[$i] = $website->getId(); + usleep(20); +} + +//Create $storeGroupsCount websites +$websiteNumber = 0; +for ($i = 0; $i < $storeGroupsCount; $i++) { + $websiteId = $websitesId[$websiteNumber]; + $groupId = null; + $parentCategoryId = null; + $categoryPath = '1'; + + $storeGroupName = sprintf('Store Group %d - website_id_%d', $i+1, $websiteId); + + if ($i == 0 && $websiteId == $defaultWebsiteId) { + $groupId = $defaultStoreGroupId; + $parentCategoryId = $defaultParentCategoryId; + $categoryPath = '1/' . $defaultParentCategoryId; + } + + $category->setId($parentCategoryId) + ->setName("Category $storeGroupName") + ->setPath($categoryPath) + ->setLevel(1) + ->setAvailableSortBy('name') + ->setDefaultSortBy('name') + ->setIsActive(true) + ->save(); + + $storeGroup = clone $defaultStoreGroup; + $storeGroup->addData( + array( + 'group_id' => $groupId, + 'website_id' => $websiteId, + 'name' => $storeGroupName, + 'root_category_id' => $category->getId() + ) + ); + $storeGroup->save(); + $groupsId[$websiteId][] = $storeGroup->getId(); + + $websiteNumber++; + if ($websiteNumber==count($websitesId)) { + $websiteNumber = 0; + } + usleep(20); +} + +//Create $storesCount stores +$websiteNumber = 0; +$groupNumber = 0; +for ($i = 0; $i < $storesCount; $i++) { + $websiteId = $websitesId[$websiteNumber]; + $groupId = $groupsId[$websiteId][$groupNumber]; + $storeId = null; + if ($i == 0 && $groupId == $defaultStoreGroupId) { + $storeId = $defaultStoreViewId; + } + $store = clone $defaultStoreView; + $storeCode = sprintf('store_view_%d_w_%d_g_%d', $i+1, $websiteId, $groupId); + $storeName = sprintf('Store view %d - website_id_%d - group_id_%d', $i+1, $websiteId, $groupId); + $store->addData( + array( + 'store_id' => $storeId, + 'name' => $storeName, + 'website_id' => $websiteId, + 'group_id' => $groupId + ) + ); + + if ($storeId == null) { + $store->addData( + array( + 'code' => $storeCode + ) + ); + } + + $store->save(); + + $groupNumber++; + if ($groupNumber==count($groupsId[$websiteId])) { + $groupNumber = 0; + $websiteNumber++; + if ($websiteNumber==count($websitesId)) { + $websiteNumber = 0; + } + } + usleep(20); +} diff --git a/dev/tools/performance-toolkit/fixtures/tax_rates.csv b/dev/tools/performance-toolkit/fixtures/tax_rates.csv new file mode 100644 index 0000000000000000000000000000000000000000..8dd382b40e0c0506146bc27f675854607706af87 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/tax_rates.csv @@ -0,0 +1,39714 @@ +Code,Country,State,"Zip/Post Code",Rate,"Zip/Post is Range","Range From","Range To",default +US-AK-99547,US,AK,99547,3,,,, +US-AK-99554,US,AK,99554,4,,,, +US-AK-99555,US,AK,99555,5,,,, +US-AK-99556,US,AK,99556,3,,,, +US-AK-99557,US,AK,99557,2,,,, +US-AK-99559,US,AK,99559,6,,,, +US-AK-99561,US,AK,99561,2,,,, +US-AK-99563,US,AK,99563,3,,,, +US-AK-99568,US,AK,99568,3,,,, +US-AK-99569,US,AK,99569,5,,,, +US-AK-99572,US,AK,99572,3,,,, +US-AK-99574,US,AK,99574,6,,,, +US-AK-99576,US,AK,99576,6,,,, +US-AK-99578,US,AK,99578,2,,,, +US-AK-99581,US,AK,99581,3,,,, +US-AK-99583,US,AK,99583,3,,,, +US-AK-99585,US,AK,99585,4,,,, +US-AK-99591,US,AK,99591,3,,,, +US-AK-99603,US,AK,99603,7.5,,,, +US-AK-99604,US,AK,99604,4,,,, +US-AK-99605,US,AK,99605,3,,,, +US-AK-99609,US,AK,99609,3,,,, +US-AK-99610,US,AK,99610,3,,,, +US-AK-99611,US,AK,99611,6,,,, +US-AK-99612,US,AK,99612,4,,,, +US-AK-99615,US,AK,99615,7,,,, +US-AK-99619,US,AK,99619,7,,,, +US-AK-99620,US,AK,99620,3,,,, +US-AK-99621,US,AK,99621,5,,,, +US-AK-99624,US,AK,99624,3,,,, +US-AK-99628,US,AK,99628,2,,,, +US-AK-99629,US,AK,99629,2,,,, +US-AK-99630,US,AK,99630,4,,,, +US-AK-99631,US,AK,99631,3,,,, +US-AK-99632,US,AK,99632,3,,,, +US-AK-99634,US,AK,99634,4,,,, +US-AK-99635,US,AK,99635,6,,,, +US-AK-99637,US,AK,99637,6,,,, +US-AK-99639,US,AK,99639,3,,,, +US-AK-99640,US,AK,99640,3,,,, +US-AK-99641,US,AK,99641,4,,,, +US-AK-99643,US,AK,99643,3,,,, +US-AK-99644,US,AK,99644,3,,,, +US-AK-99650,US,AK,99650,4,,,, +US-AK-99652,US,AK,99652,3,,,, +US-AK-99655,US,AK,99655,3,,,, +US-AK-99658,US,AK,99658,3,,,, +US-AK-99659,US,AK,99659,4,,,, +US-AK-99660,US,AK,99660,3,,,, +US-AK-99661,US,AK,99661,3,,,, +US-AK-99662,US,AK,99662,4,,,, +US-AK-99663,US,AK,99663,5,,,, +US-AK-99664,US,AK,99664,3,,,, +US-AK-99666,US,AK,99666,3,,,, +US-AK-99669,US,AK,99669,3,,,, +US-AK-99671,US,AK,99671,3,,,, +US-AK-99672,US,AK,99672,3,,,, +US-AK-99677,US,AK,99677,6,,,, +US-AK-99678,US,AK,99678,2,,,, +US-AK-99679,US,AK,99679,6,,,, +US-AK-99680,US,AK,99680,6,,,, +US-AK-99682,US,AK,99682,3,,,, +US-AK-99684,US,AK,99684,5,,,, +US-AK-99685,US,AK,99685,3,,,, +US-AK-99687,US,AK,99687,2,,,, +US-AK-99689,US,AK,99689,5,,,, +US-AK-99690,US,AK,99690,6,,,, +US-AK-99692,US,AK,99692,3,,,, +US-AK-99694,US,AK,99694,3,,,, +US-AK-99697,US,AK,99697,7,,,, +US-AK-99704,US,AK,99704,6,,,, +US-AK-99711,US,AK,99711,4,,,, +US-AK-99727,US,AK,99727,6,,,, +US-AK-99736,US,AK,99736,3,,,, +US-AK-99739,US,AK,99739,3,,,, +US-AK-99740,US,AK,99740,3,,,, +US-AK-99741,US,AK,99741,3,,,, +US-AK-99742,US,AK,99742,3,,,, +US-AK-99744,US,AK,99744,4,,,, +US-AK-99749,US,AK,99749,3,,,, +US-AK-99750,US,AK,99750,2,,,, +US-AK-99752,US,AK,99752,6,,,, +US-AK-99753,US,AK,99753,2,,,, +US-AK-99760,US,AK,99760,4,,,, +US-AK-99761,US,AK,99761,3,,,, +US-AK-99762,US,AK,99762,5,,,, +US-AK-99763,US,AK,99763,4,,,, +US-AK-99766,US,AK,99766,3,,,, +US-AK-99770,US,AK,99770,5,,,, +US-AK-99772,US,AK,99772,2,,,, +US-AK-99773,US,AK,99773,2,,,, +US-AK-99777,US,AK,99777,2,,,, +US-AK-99778,US,AK,99778,3,,,, +US-AK-99783,US,AK,99783,3,,,, +US-AK-99784,US,AK,99784,1,,,, +US-AK-99785,US,AK,99785,3,,,, +US-AK-99786,US,AK,99786,3,,,, +US-AK-99788,US,AK,99788,3,,,, +US-AK-99801,US,AK,99801,5,,,, +US-AK-99802,US,AK,99802,5,,,, +US-AK-99803,US,AK,99803,5,,,, +US-AK-99811,US,AK,99811,5,,,, +US-AK-99812,US,AK,99812,5,,,, +US-AK-99820,US,AK,99820,3,,,, +US-AK-99821,US,AK,99821,5,,,, +US-AK-99824,US,AK,99824,5,,,, +US-AK-99826,US,AK,99826,3,,,, +US-AK-99827,US,AK,99827,4,,,, +US-AK-99829,US,AK,99829,6.5,,,, +US-AK-99830,US,AK,99830,5,,,, +US-AK-99832,US,AK,99832,4,,,, +US-AK-99833,US,AK,99833,6,,,, +US-AK-99835,US,AK,99835,5,,,, +US-AK-99836,US,AK,99836,5,,,, +US-AK-99840,US,AK,99840,3,,,, +US-AK-99841,US,AK,99841,2,,,, +US-AK-99850,US,AK,99850,5,,,, +US-AK-99901,US,AK,99901,6,,,, +US-AK-99903,US,AK,99903,6,,,, +US-AK-99918,US,AK,99918,6,,,, +US-AK-99919,US,AK,99919,6,,,, +US-AK-99921,US,AK,99921,5,,,, +US-AK-99922,US,AK,99922,4,,,, +US-AK-99925,US,AK,99925,5.5,,,, +US-AK-99928,US,AK,99928,2.5,,,, +US-AK-99929,US,AK,99929,7,,,, +US-AK-99950,US,AK,99950,6,,,, +US-AL-35004,US,AL,35004,9,,,, +US-AL-35005,US,AL,35005,9.5,,,, +US-AL-35006,US,AL,35006,6,,,, +US-AL-35007,US,AL,35007,9,,,, +US-AL-35010,US,AL,35010,8.5,,,, +US-AL-35011,US,AL,35011,8.5,,,, +US-AL-35013,US,AL,35013,7,,,, +US-AL-35014,US,AL,35014,7,,,, +US-AL-35015,US,AL,35015,10,,,, +US-AL-35016,US,AL,35016,9,,,, +US-AL-35019,US,AL,35019,8.5,,,, +US-AL-35020,US,AL,35020,10,,,, +US-AL-35021,US,AL,35021,10,,,, +US-AL-35022,US,AL,35022,10,,,, +US-AL-35023,US,AL,35023,10,,,, +US-AL-35031,US,AL,35031,6,,,, +US-AL-35032,US,AL,35032,7.5,,,, +US-AL-35033,US,AL,35033,8.5,,,, +US-AL-35034,US,AL,35034,8,,,, +US-AL-35035,US,AL,35035,8,,,, +US-AL-35036,US,AL,35036,10,,,, +US-AL-35038,US,AL,35038,8,,,, +US-AL-35040,US,AL,35040,9,,,, +US-AL-35042,US,AL,35042,9,,,, +US-AL-35043,US,AL,35043,9,,,, +US-AL-35044,US,AL,35044,8,,,, +US-AL-35045,US,AL,35045,8,,,, +US-AL-35046,US,AL,35046,5,,,, +US-AL-35048,US,AL,35048,10,,,, +US-AL-35049,US,AL,35049,8,,,, +US-AL-35051,US,AL,35051,5,,,, +US-AL-35052,US,AL,35052,9,,,, +US-AL-35053,US,AL,35053,8.5,,,, +US-AL-35054,US,AL,35054,6,,,, +US-AL-35055,US,AL,35055,9,,,, +US-AL-35056,US,AL,35056,9,,,, +US-AL-35057,US,AL,35057,8.5,,,, +US-AL-35058,US,AL,35058,8.5,,,, +US-AL-35060,US,AL,35060,7.75,,,, +US-AL-35061,US,AL,35061,10,,,, +US-AL-35062,US,AL,35062,8,,,, +US-AL-35063,US,AL,35063,6,,,, +US-AL-35064,US,AL,35064,10,,,, +US-AL-35068,US,AL,35068,10,,,, +US-AL-35070,US,AL,35070,8.5,,,, +US-AL-35071,US,AL,35071,10,,,, +US-AL-35072,US,AL,35072,6,,,, +US-AL-35073,US,AL,35073,9,,,, +US-AL-35074,US,AL,35074,9,,,, +US-AL-35077,US,AL,35077,8.5,,,, +US-AL-35078,US,AL,35078,9,,,, +US-AL-35079,US,AL,35079,6,,,, +US-AL-35080,US,AL,35080,9,,,, +US-AL-35082,US,AL,35082,6,,,, +US-AL-35083,US,AL,35083,8.5,,,, +US-AL-35085,US,AL,35085,5,,,, +US-AL-35087,US,AL,35087,8.5,,,, +US-AL-35089,US,AL,35089,6,,,, +US-AL-35091,US,AL,35091,10,,,, +US-AL-35094,US,AL,35094,10,,,, +US-AL-35096,US,AL,35096,10,,,, +US-AL-35097,US,AL,35097,8,,,, +US-AL-35098,US,AL,35098,8.5,,,, +US-AL-35111,US,AL,35111,6,,,, +US-AL-35112,US,AL,35112,10,,,, +US-AL-35114,US,AL,35114,9,,,, +US-AL-35115,US,AL,35115,9,,,, +US-AL-35116,US,AL,35116,10,,,, +US-AL-35117,US,AL,35117,6,,,, +US-AL-35118,US,AL,35118,9,,,, +US-AL-35119,US,AL,35119,8,,,, +US-AL-35120,US,AL,35120,9,,,, +US-AL-35121,US,AL,35121,9,,,, +US-AL-35123,US,AL,35123,8,,,, +US-AL-35124,US,AL,35124,9,,,, +US-AL-35125,US,AL,35125,6,,,, +US-AL-35126,US,AL,35126,6,,,, +US-AL-35127,US,AL,35127,9,,,, +US-AL-35128,US,AL,35128,10,,,, +US-AL-35130,US,AL,35130,6,,,, +US-AL-35131,US,AL,35131,10,,,, +US-AL-35133,US,AL,35133,6,,,, +US-AL-35135,US,AL,35135,10,,,, +US-AL-35136,US,AL,35136,8,,,, +US-AL-35137,US,AL,35137,7,,,, +US-AL-35139,US,AL,35139,9,,,, +US-AL-35142,US,AL,35142,9,,,, +US-AL-35143,US,AL,35143,5,,,, +US-AL-35144,US,AL,35144,9,,,, +US-AL-35146,US,AL,35146,6,,,, +US-AL-35147,US,AL,35147,5,,,, +US-AL-35148,US,AL,35148,9.5,,,, +US-AL-35149,US,AL,35149,7,,,, +US-AL-35150,US,AL,35150,8,,,, +US-AL-35151,US,AL,35151,7,,,, +US-AL-35160,US,AL,35160,10,,,, +US-AL-35161,US,AL,35161,10,,,, +US-AL-35171,US,AL,35171,8,,,, +US-AL-35172,US,AL,35172,6,,,, +US-AL-35173,US,AL,35173,10,,,, +US-AL-35175,US,AL,35175,5,,,, +US-AL-35176,US,AL,35176,5,,,, +US-AL-35178,US,AL,35178,9,,,, +US-AL-35179,US,AL,35179,8.5,,,, +US-AL-35180,US,AL,35180,6,,,, +US-AL-35181,US,AL,35181,8,,,, +US-AL-35182,US,AL,35182,6,,,, +US-AL-35183,US,AL,35183,6,,,, +US-AL-35184,US,AL,35184,8,,,, +US-AL-35185,US,AL,35185,7,,,, +US-AL-35186,US,AL,35186,8,,,, +US-AL-35187,US,AL,35187,6.5,,,, +US-AL-35188,US,AL,35188,10,,,, +US-AL-35201,US,AL,35201,10,,,, +US-AL-35202,US,AL,35202,10,,,, +US-AL-35203,US,AL,35203,10,,,, +US-AL-35204,US,AL,35204,10,,,, +US-AL-35205,US,AL,35205,10,,,, +US-AL-35206,US,AL,35206,10,,,, +US-AL-35207,US,AL,35207,10,,,, +US-AL-35208,US,AL,35208,10,,,, +US-AL-35209,US,AL,35209,9,,,, +US-AL-35210,US,AL,35210,10,,,, +US-AL-35211,US,AL,35211,10,,,, +US-AL-35212,US,AL,35212,10,,,, +US-AL-35213,US,AL,35213,9,,,, +US-AL-35214,US,AL,35214,6,,,, +US-AL-35215,US,AL,35215,8,,,, +US-AL-35216,US,AL,35216,9,,,, +US-AL-35217,US,AL,35217,10,,,, +US-AL-35218,US,AL,35218,10,,,, +US-AL-35219,US,AL,35219,9,,,, +US-AL-35220,US,AL,35220,8,,,, +US-AL-35221,US,AL,35221,10,,,, +US-AL-35222,US,AL,35222,10,,,, +US-AL-35223,US,AL,35223,9,,,, +US-AL-35224,US,AL,35224,10,,,, +US-AL-35226,US,AL,35226,9,,,, +US-AL-35228,US,AL,35228,10,,,, +US-AL-35229,US,AL,35229,10,,,, +US-AL-35231,US,AL,35231,6,,,, +US-AL-35232,US,AL,35232,10,,,, +US-AL-35233,US,AL,35233,10,,,, +US-AL-35234,US,AL,35234,10,,,, +US-AL-35235,US,AL,35235,10,,,, +US-AL-35236,US,AL,35236,9,,,, +US-AL-35237,US,AL,35237,10,,,, +US-AL-35238,US,AL,35238,8,,,, +US-AL-35242,US,AL,35242,6.5,,,, +US-AL-35243,US,AL,35243,9,,,, +US-AL-35244,US,AL,35244,9,,,, +US-AL-35246,US,AL,35246,10,,,, +US-AL-35249,US,AL,35249,10,,,, +US-AL-35253,US,AL,35253,9,,,, +US-AL-35254,US,AL,35254,10,,,, +US-AL-35255,US,AL,35255,10,,,, +US-AL-35259,US,AL,35259,9,,,, +US-AL-35260,US,AL,35260,9,,,, +US-AL-35261,US,AL,35261,10,,,, +US-AL-35266,US,AL,35266,9,,,, +US-AL-35270,US,AL,35270,10,,,, +US-AL-35282,US,AL,35282,10,,,, +US-AL-35283,US,AL,35283,10,,,, +US-AL-35285,US,AL,35285,10,,,, +US-AL-35287,US,AL,35287,10,,,, +US-AL-35288,US,AL,35288,10,,,, +US-AL-35290,US,AL,35290,10,,,, +US-AL-35291,US,AL,35291,10,,,, +US-AL-35292,US,AL,35292,10,,,, +US-AL-35293,US,AL,35293,9,,,, +US-AL-35294,US,AL,35294,10,,,, +US-AL-35295,US,AL,35295,10,,,, +US-AL-35296,US,AL,35296,10,,,, +US-AL-35297,US,AL,35297,10,,,, +US-AL-35298,US,AL,35298,10,,,, +US-AL-35401,US,AL,35401,9,,,, +US-AL-35402,US,AL,35402,9,,,, +US-AL-35403,US,AL,35403,9,,,, +US-AL-35404,US,AL,35404,9,,,, +US-AL-35405,US,AL,35405,9,,,, +US-AL-35406,US,AL,35406,9,,,, +US-AL-35407,US,AL,35407,9,,,, +US-AL-35440,US,AL,35440,9,,,, +US-AL-35441,US,AL,35441,7,,,, +US-AL-35442,US,AL,35442,8,,,, +US-AL-35443,US,AL,35443,7,,,, +US-AL-35444,US,AL,35444,9,,,, +US-AL-35446,US,AL,35446,9,,,, +US-AL-35447,US,AL,35447,7,,,, +US-AL-35448,US,AL,35448,7,,,, +US-AL-35449,US,AL,35449,9,,,, +US-AL-35452,US,AL,35452,9,,,, +US-AL-35453,US,AL,35453,9,,,, +US-AL-35456,US,AL,35456,9,,,, +US-AL-35457,US,AL,35457,9,,,, +US-AL-35458,US,AL,35458,9,,,, +US-AL-35459,US,AL,35459,7,,,, +US-AL-35460,US,AL,35460,7,,,, +US-AL-35461,US,AL,35461,7,,,, +US-AL-35462,US,AL,35462,10,,,, +US-AL-35463,US,AL,35463,9,,,, +US-AL-35464,US,AL,35464,7,,,, +US-AL-35466,US,AL,35466,7,,,, +US-AL-35468,US,AL,35468,9,,,, +US-AL-35469,US,AL,35469,7,,,, +US-AL-35470,US,AL,35470,7,,,, +US-AL-35471,US,AL,35471,8,,,, +US-AL-35473,US,AL,35473,9,,,, +US-AL-35474,US,AL,35474,7,,,, +US-AL-35475,US,AL,35475,9,,,, +US-AL-35476,US,AL,35476,9,,,, +US-AL-35477,US,AL,35477,7,,,, +US-AL-35478,US,AL,35478,9,,,, +US-AL-35480,US,AL,35480,9,,,, +US-AL-35481,US,AL,35481,7,,,, +US-AL-35482,US,AL,35482,9,,,, +US-AL-35485,US,AL,35485,9,,,, +US-AL-35486,US,AL,35486,9,,,, +US-AL-35487,US,AL,35487,9,,,, +US-AL-35490,US,AL,35490,9,,,, +US-AL-35491,US,AL,35491,7,,,, +US-AL-35501,US,AL,35501,9,,,, +US-AL-35502,US,AL,35502,9,,,, +US-AL-35503,US,AL,35503,6,,,, +US-AL-35504,US,AL,35504,6,,,, +US-AL-35540,US,AL,35540,6,,,, +US-AL-35541,US,AL,35541,6,,,, +US-AL-35542,US,AL,35542,6,,,, +US-AL-35543,US,AL,35543,8,,,, +US-AL-35544,US,AL,35544,6,,,, +US-AL-35545,US,AL,35545,7,,,, +US-AL-35546,US,AL,35546,6,,,, +US-AL-35548,US,AL,35548,9,,,, +US-AL-35549,US,AL,35549,9,,,, +US-AL-35550,US,AL,35550,6,,,, +US-AL-35551,US,AL,35551,9,,,, +US-AL-35552,US,AL,35552,6,,,, +US-AL-35553,US,AL,35553,6,,,, +US-AL-35554,US,AL,35554,6,,,, +US-AL-35555,US,AL,35555,6,,,, +US-AL-35559,US,AL,35559,7,,,, +US-AL-35560,US,AL,35560,6,,,, +US-AL-35563,US,AL,35563,9,,,, +US-AL-35564,US,AL,35564,8,,,, +US-AL-35565,US,AL,35565,9,,,, +US-AL-35570,US,AL,35570,9,,,, +US-AL-35571,US,AL,35571,6,,,, +US-AL-35572,US,AL,35572,6,,,, +US-AL-35573,US,AL,35573,7,,,, +US-AL-35574,US,AL,35574,7,,,, +US-AL-35575,US,AL,35575,8,,,, +US-AL-35576,US,AL,35576,6,,,, +US-AL-35577,US,AL,35577,6,,,, +US-AL-35578,US,AL,35578,6,,,, +US-AL-35579,US,AL,35579,6,,,, +US-AL-35580,US,AL,35580,6,,,, +US-AL-35581,US,AL,35581,6,,,, +US-AL-35582,US,AL,35582,8.5,,,, +US-AL-35584,US,AL,35584,8,,,, +US-AL-35585,US,AL,35585,6,,,, +US-AL-35586,US,AL,35586,6,,,, +US-AL-35587,US,AL,35587,6,,,, +US-AL-35592,US,AL,35592,6,,,, +US-AL-35593,US,AL,35593,6,,,, +US-AL-35594,US,AL,35594,9,,,, +US-AL-35601,US,AL,35601,9,,,, +US-AL-35602,US,AL,35602,9,,,, +US-AL-35603,US,AL,35603,9,,,, +US-AL-35609,US,AL,35609,9,,,, +US-AL-35610,US,AL,35610,5.5,,,, +US-AL-35611,US,AL,35611,9,,,, +US-AL-35612,US,AL,35612,9,,,, +US-AL-35613,US,AL,35613,6,,,, +US-AL-35614,US,AL,35614,6,,,, +US-AL-35615,US,AL,35615,6,,,, +US-AL-35616,US,AL,35616,5.5,,,, +US-AL-35617,US,AL,35617,5.5,,,, +US-AL-35618,US,AL,35618,7,,,, +US-AL-35619,US,AL,35619,7,,,, +US-AL-35620,US,AL,35620,6,,,, +US-AL-35621,US,AL,35621,7,,,, +US-AL-35622,US,AL,35622,7,,,, +US-AL-35630,US,AL,35630,8.5,,,, +US-AL-35631,US,AL,35631,8.5,,,, +US-AL-35632,US,AL,35632,8.5,,,, +US-AL-35633,US,AL,35633,5.5,,,, +US-AL-35634,US,AL,35634,5.5,,,, +US-AL-35640,US,AL,35640,9,,,, +US-AL-35643,US,AL,35643,7,,,, +US-AL-35645,US,AL,35645,5.5,,,, +US-AL-35646,US,AL,35646,5.5,,,, +US-AL-35647,US,AL,35647,6,,,, +US-AL-35648,US,AL,35648,5.5,,,, +US-AL-35649,US,AL,35649,6,,,, +US-AL-35650,US,AL,35650,7,,,, +US-AL-35651,US,AL,35651,7,,,, +US-AL-35652,US,AL,35652,5.5,,,, +US-AL-35653,US,AL,35653,9,,,, +US-AL-35654,US,AL,35654,6,,,, +US-AL-35660,US,AL,35660,9,,,, +US-AL-35661,US,AL,35661,9,,,, +US-AL-35662,US,AL,35662,9,,,, +US-AL-35670,US,AL,35670,7,,,, +US-AL-35671,US,AL,35671,6,,,, +US-AL-35672,US,AL,35672,7,,,, +US-AL-35673,US,AL,35673,7,,,, +US-AL-35674,US,AL,35674,9,,,, +US-AL-35677,US,AL,35677,5.5,,,, +US-AL-35699,US,AL,35699,9,,,, +US-AL-35739,US,AL,35739,6,,,, +US-AL-35740,US,AL,35740,9,,,, +US-AL-35741,US,AL,35741,5.5,,,, +US-AL-35742,US,AL,35742,6,,,, +US-AL-35744,US,AL,35744,6,,,, +US-AL-35745,US,AL,35745,6,,,, +US-AL-35746,US,AL,35746,6,,,, +US-AL-35747,US,AL,35747,5,,,, +US-AL-35748,US,AL,35748,5.5,,,, +US-AL-35749,US,AL,35749,5.5,,,, +US-AL-35750,US,AL,35750,5.5,,,, +US-AL-35751,US,AL,35751,6,,,, +US-AL-35752,US,AL,35752,9,,,, +US-AL-35754,US,AL,35754,7,,,, +US-AL-35755,US,AL,35755,8,,,, +US-AL-35756,US,AL,35756,6,,,, +US-AL-35757,US,AL,35757,5.5,,,, +US-AL-35758,US,AL,35758,9,,,, +US-AL-35759,US,AL,35759,5.5,,,, +US-AL-35760,US,AL,35760,5.5,,,, +US-AL-35761,US,AL,35761,5.5,,,, +US-AL-35762,US,AL,35762,8,,,, +US-AL-35763,US,AL,35763,8,,,, +US-AL-35764,US,AL,35764,6,,,, +US-AL-35765,US,AL,35765,6,,,, +US-AL-35766,US,AL,35766,6,,,, +US-AL-35767,US,AL,35767,5.5,,,, +US-AL-35768,US,AL,35768,9,,,, +US-AL-35769,US,AL,35769,9,,,, +US-AL-35771,US,AL,35771,6,,,, +US-AL-35772,US,AL,35772,9,,,, +US-AL-35773,US,AL,35773,5.5,,,, +US-AL-35774,US,AL,35774,6,,,, +US-AL-35775,US,AL,35775,7,,,, +US-AL-35776,US,AL,35776,6,,,, +US-AL-35801,US,AL,35801,8,,,, +US-AL-35802,US,AL,35802,8,,,, +US-AL-35803,US,AL,35803,8,,,, +US-AL-35804,US,AL,35804,8,,,, +US-AL-35805,US,AL,35805,8,,,, +US-AL-35806,US,AL,35806,8,,,, +US-AL-35807,US,AL,35807,8,,,, +US-AL-35808,US,AL,35808,5.5,,,, +US-AL-35809,US,AL,35809,8,,,, +US-AL-35810,US,AL,35810,8,,,, +US-AL-35811,US,AL,35811,5.5,,,, +US-AL-35812,US,AL,35812,8,,,, +US-AL-35813,US,AL,35813,8,,,, +US-AL-35814,US,AL,35814,8,,,, +US-AL-35815,US,AL,35815,8,,,, +US-AL-35816,US,AL,35816,8,,,, +US-AL-35824,US,AL,35824,8,,,, +US-AL-35893,US,AL,35893,8,,,, +US-AL-35894,US,AL,35894,8,,,, +US-AL-35895,US,AL,35895,8,,,, +US-AL-35896,US,AL,35896,8,,,, +US-AL-35897,US,AL,35897,5.5,,,, +US-AL-35899,US,AL,35899,8,,,, +US-AL-35901,US,AL,35901,9,,,, +US-AL-35902,US,AL,35902,9,,,, +US-AL-35903,US,AL,35903,9,,,, +US-AL-35904,US,AL,35904,9,,,, +US-AL-35905,US,AL,35905,9,,,, +US-AL-35906,US,AL,35906,9,,,, +US-AL-35907,US,AL,35907,9,,,, +US-AL-35950,US,AL,35950,8,,,, +US-AL-35951,US,AL,35951,7,,,, +US-AL-35952,US,AL,35952,5,,,, +US-AL-35953,US,AL,35953,6,,,, +US-AL-35954,US,AL,35954,5,,,, +US-AL-35956,US,AL,35956,5,,,, +US-AL-35957,US,AL,35957,8,,,, +US-AL-35958,US,AL,35958,6,,,, +US-AL-35959,US,AL,35959,7.5,,,, +US-AL-35960,US,AL,35960,7.5,,,, +US-AL-35961,US,AL,35961,5,,,, +US-AL-35962,US,AL,35962,5,,,, +US-AL-35963,US,AL,35963,5,,,, +US-AL-35964,US,AL,35964,8,,,, +US-AL-35966,US,AL,35966,6,,,, +US-AL-35967,US,AL,35967,8,,,, +US-AL-35968,US,AL,35968,5,,,, +US-AL-35971,US,AL,35971,5,,,, +US-AL-35972,US,AL,35972,5,,,, +US-AL-35973,US,AL,35973,7.5,,,, +US-AL-35974,US,AL,35974,8,,,, +US-AL-35975,US,AL,35975,5,,,, +US-AL-35976,US,AL,35976,7,,,, +US-AL-35978,US,AL,35978,9,,,, +US-AL-35979,US,AL,35979,5,,,, +US-AL-35980,US,AL,35980,5,,,, +US-AL-35981,US,AL,35981,7,,,, +US-AL-35983,US,AL,35983,9,,,, +US-AL-35984,US,AL,35984,5,,,, +US-AL-35986,US,AL,35986,9,,,, +US-AL-35987,US,AL,35987,8,,,, +US-AL-35988,US,AL,35988,9,,,, +US-AL-35989,US,AL,35989,5,,,, +US-AL-35990,US,AL,35990,8,,,, +US-AL-36003,US,AL,36003,6,,,, +US-AL-36005,US,AL,36005,6,,,, +US-AL-36006,US,AL,36006,6,,,, +US-AL-36008,US,AL,36008,6,,,, +US-AL-36009,US,AL,36009,7,,,, +US-AL-36010,US,AL,36010,8,,,, +US-AL-36013,US,AL,36013,8.75,,,, +US-AL-36015,US,AL,36015,5.5,,,, +US-AL-36016,US,AL,36016,5.5,,,, +US-AL-36017,US,AL,36017,8.5,,,, +US-AL-36020,US,AL,36020,8,,,, +US-AL-36022,US,AL,36022,5,,,, +US-AL-36023,US,AL,36023,9,,,, +US-AL-36024,US,AL,36024,5,,,, +US-AL-36025,US,AL,36025,6.5,,,, +US-AL-36026,US,AL,36026,5,,,, +US-AL-36027,US,AL,36027,9,,,, +US-AL-36028,US,AL,36028,8,,,, +US-AL-36029,US,AL,36029,6.5,,,, +US-AL-36030,US,AL,36030,5.5,,,, +US-AL-36031,US,AL,36031,5,,,, +US-AL-36032,US,AL,36032,10.5,,,, +US-AL-36033,US,AL,36033,9.5,,,, +US-AL-36034,US,AL,36034,5,,,, +US-AL-36035,US,AL,36035,6,,,, +US-AL-36036,US,AL,36036,6.5,,,, +US-AL-36037,US,AL,36037,5.5,,,, +US-AL-36038,US,AL,36038,7,,,, +US-AL-36039,US,AL,36039,5,,,, +US-AL-36040,US,AL,36040,10,,,, +US-AL-36041,US,AL,36041,7,,,, +US-AL-36042,US,AL,36042,7,,,, +US-AL-36043,US,AL,36043,8,,,, +US-AL-36045,US,AL,36045,9,,,, +US-AL-36046,US,AL,36046,7,,,, +US-AL-36047,US,AL,36047,8,,,, +US-AL-36048,US,AL,36048,5.5,,,, +US-AL-36049,US,AL,36049,9,,,, +US-AL-36051,US,AL,36051,6,,,, +US-AL-36052,US,AL,36052,6.5,,,, +US-AL-36053,US,AL,36053,5.5,,,, +US-AL-36054,US,AL,36054,8.5,,,, +US-AL-36057,US,AL,36057,7.625,,,, +US-AL-36061,US,AL,36061,7,,,, +US-AL-36062,US,AL,36062,9,,,, +US-AL-36064,US,AL,36064,8.75,,,, +US-AL-36065,US,AL,36065,6.5,,,, +US-AL-36066,US,AL,36066,9.5,,,, +US-AL-36067,US,AL,36067,9.5,,,, +US-AL-36068,US,AL,36068,9.5,,,, +US-AL-36069,US,AL,36069,6.5,,,, +US-AL-36071,US,AL,36071,7,,,, +US-AL-36072,US,AL,36072,9,,,, +US-AL-36075,US,AL,36075,7.5,,,, +US-AL-36078,US,AL,36078,9,,,, +US-AL-36079,US,AL,36079,9,,,, +US-AL-36080,US,AL,36080,5,,,, +US-AL-36081,US,AL,36081,9,,,, +US-AL-36082,US,AL,36082,9,,,, +US-AL-36083,US,AL,36083,10,,,, +US-AL-36087,US,AL,36087,10,,,, +US-AL-36088,US,AL,36088,10,,,, +US-AL-36089,US,AL,36089,9,,,, +US-AL-36091,US,AL,36091,5,,,, +US-AL-36092,US,AL,36092,5,,,, +US-AL-36093,US,AL,36093,5,,,, +US-AL-36101,US,AL,36101,10,,,, +US-AL-36102,US,AL,36102,10,,,, +US-AL-36103,US,AL,36103,10,,,, +US-AL-36104,US,AL,36104,10,,,, +US-AL-36105,US,AL,36105,10,,,, +US-AL-36106,US,AL,36106,10,,,, +US-AL-36107,US,AL,36107,10,,,, +US-AL-36108,US,AL,36108,10,,,, +US-AL-36109,US,AL,36109,10,,,, +US-AL-36110,US,AL,36110,10,,,, +US-AL-36111,US,AL,36111,10,,,, +US-AL-36112,US,AL,36112,10,,,, +US-AL-36113,US,AL,36113,10,,,, +US-AL-36114,US,AL,36114,10,,,, +US-AL-36115,US,AL,36115,10,,,, +US-AL-36116,US,AL,36116,10,,,, +US-AL-36117,US,AL,36117,10,,,, +US-AL-36118,US,AL,36118,10,,,, +US-AL-36119,US,AL,36119,10,,,, +US-AL-36120,US,AL,36120,10,,,, +US-AL-36121,US,AL,36121,10,,,, +US-AL-36123,US,AL,36123,10,,,, +US-AL-36124,US,AL,36124,10,,,, +US-AL-36125,US,AL,36125,10,,,, +US-AL-36130,US,AL,36130,10,,,, +US-AL-36131,US,AL,36131,10,,,, +US-AL-36132,US,AL,36132,10,,,, +US-AL-36133,US,AL,36133,10,,,, +US-AL-36134,US,AL,36134,10,,,, +US-AL-36135,US,AL,36135,10,,,, +US-AL-36140,US,AL,36140,10,,,, +US-AL-36141,US,AL,36141,10,,,, +US-AL-36142,US,AL,36142,10,,,, +US-AL-36177,US,AL,36177,10,,,, +US-AL-36191,US,AL,36191,10,,,, +US-AL-36201,US,AL,36201,10,,,, +US-AL-36202,US,AL,36202,10,,,, +US-AL-36203,US,AL,36203,10,,,, +US-AL-36204,US,AL,36204,10,,,, +US-AL-36205,US,AL,36205,10,,,, +US-AL-36206,US,AL,36206,9.5,,,, +US-AL-36207,US,AL,36207,10,,,, +US-AL-36250,US,AL,36250,7,,,, +US-AL-36251,US,AL,36251,6,,,, +US-AL-36253,US,AL,36253,10,,,, +US-AL-36254,US,AL,36254,7,,,, +US-AL-36255,US,AL,36255,6,,,, +US-AL-36256,US,AL,36256,8,,,, +US-AL-36257,US,AL,36257,10,,,, +US-AL-36258,US,AL,36258,6,,,, +US-AL-36260,US,AL,36260,10,,,, +US-AL-36261,US,AL,36261,8,,,, +US-AL-36262,US,AL,36262,6,,,, +US-AL-36263,US,AL,36263,5,,,, +US-AL-36264,US,AL,36264,6,,,, +US-AL-36265,US,AL,36265,10,,,, +US-AL-36266,US,AL,36266,6,,,, +US-AL-36267,US,AL,36267,6,,,, +US-AL-36268,US,AL,36268,7,,,, +US-AL-36269,US,AL,36269,6,,,, +US-AL-36271,US,AL,36271,7,,,, +US-AL-36272,US,AL,36272,9,,,, +US-AL-36273,US,AL,36273,6,,,, +US-AL-36274,US,AL,36274,8.5,,,, +US-AL-36275,US,AL,36275,7.5,,,, +US-AL-36276,US,AL,36276,5,,,, +US-AL-36277,US,AL,36277,10,,,, +US-AL-36278,US,AL,36278,5,,,, +US-AL-36279,US,AL,36279,7,,,, +US-AL-36280,US,AL,36280,5,,,, +US-AL-36301,US,AL,36301,9,,,, +US-AL-36302,US,AL,36302,9,,,, +US-AL-36303,US,AL,36303,9,,,, +US-AL-36304,US,AL,36304,9,,,, +US-AL-36305,US,AL,36305,9,,,, +US-AL-36310,US,AL,36310,6,,,, +US-AL-36311,US,AL,36311,6,,,, +US-AL-36312,US,AL,36312,5,,,, +US-AL-36313,US,AL,36313,5,,,, +US-AL-36314,US,AL,36314,7,,,, +US-AL-36316,US,AL,36316,5,,,, +US-AL-36317,US,AL,36317,6,,,, +US-AL-36318,US,AL,36318,5,,,, +US-AL-36319,US,AL,36319,6,,,, +US-AL-36320,US,AL,36320,5,,,, +US-AL-36321,US,AL,36321,7,,,, +US-AL-36322,US,AL,36322,9,,,, +US-AL-36323,US,AL,36323,5,,,, +US-AL-36330,US,AL,36330,8.5,,,, +US-AL-36331,US,AL,36331,8.5,,,, +US-AL-36340,US,AL,36340,8,,,, +US-AL-36343,US,AL,36343,5,,,, +US-AL-36344,US,AL,36344,5,,,, +US-AL-36345,US,AL,36345,9,,,, +US-AL-36346,US,AL,36346,5,,,, +US-AL-36349,US,AL,36349,8,,,, +US-AL-36350,US,AL,36350,6,,,, +US-AL-36351,US,AL,36351,5,,,, +US-AL-36352,US,AL,36352,5,,,, +US-AL-36353,US,AL,36353,6,,,, +US-AL-36360,US,AL,36360,9,,,, +US-AL-36361,US,AL,36361,9,,,, +US-AL-36362,US,AL,36362,6,,,, +US-AL-36370,US,AL,36370,5,,,, +US-AL-36371,US,AL,36371,8,,,, +US-AL-36373,US,AL,36373,6,,,, +US-AL-36374,US,AL,36374,6,,,, +US-AL-36375,US,AL,36375,5,,,, +US-AL-36376,US,AL,36376,8,,,, +US-AL-36401,US,AL,36401,6,,,, +US-AL-36420,US,AL,36420,9.5,,,, +US-AL-36421,US,AL,36421,6,,,, +US-AL-36425,US,AL,36425,6.5,,,, +US-AL-36426,US,AL,36426,8,,,, +US-AL-36427,US,AL,36427,9,,,, +US-AL-36429,US,AL,36429,6,,,, +US-AL-36432,US,AL,36432,6,,,, +US-AL-36435,US,AL,36435,7.5,,,, +US-AL-36436,US,AL,36436,5,,,, +US-AL-36439,US,AL,36439,7.5,,,, +US-AL-36441,US,AL,36441,8,,,, +US-AL-36442,US,AL,36442,8,,,, +US-AL-36444,US,AL,36444,6.5,,,, +US-AL-36445,US,AL,36445,6.5,,,, +US-AL-36446,US,AL,36446,8,,,, +US-AL-36449,US,AL,36449,6.5,,,, +US-AL-36451,US,AL,36451,5,,,, +US-AL-36453,US,AL,36453,5,,,, +US-AL-36454,US,AL,36454,6,,,, +US-AL-36455,US,AL,36455,8,,,, +US-AL-36456,US,AL,36456,5.5,,,, +US-AL-36458,US,AL,36458,7.75,,,, +US-AL-36460,US,AL,36460,9,,,, +US-AL-36461,US,AL,36461,9,,,, +US-AL-36467,US,AL,36467,9,,,, +US-AL-36470,US,AL,36470,6.5,,,, +US-AL-36471,US,AL,36471,6.5,,,, +US-AL-36473,US,AL,36473,6,,,, +US-AL-36474,US,AL,36474,6,,,, +US-AL-36475,US,AL,36475,6,,,, +US-AL-36476,US,AL,36476,8,,,, +US-AL-36477,US,AL,36477,8,,,, +US-AL-36480,US,AL,36480,6.5,,,, +US-AL-36481,US,AL,36481,6.5,,,, +US-AL-36482,US,AL,36482,5,,,, +US-AL-36483,US,AL,36483,6,,,, +US-AL-36502,US,AL,36502,9,,,, +US-AL-36503,US,AL,36503,9,,,, +US-AL-36504,US,AL,36504,9,,,, +US-AL-36505,US,AL,36505,7.5,,,, +US-AL-36507,US,AL,36507,10,,,, +US-AL-36509,US,AL,36509,10,,,, +US-AL-36511,US,AL,36511,8.5,,,, +US-AL-36512,US,AL,36512,5.5,,,, +US-AL-36513,US,AL,36513,4,,,, +US-AL-36515,US,AL,36515,9,,,, +US-AL-36518,US,AL,36518,4,,,, +US-AL-36521,US,AL,36521,5.5,,,, +US-AL-36522,US,AL,36522,9,,,, +US-AL-36523,US,AL,36523,5.5,,,, +US-AL-36524,US,AL,36524,5,,,, +US-AL-36525,US,AL,36525,9.5,,,, +US-AL-36526,US,AL,36526,9.5,,,, +US-AL-36527,US,AL,36527,8.5,,,, +US-AL-36528,US,AL,36528,10,,,, +US-AL-36529,US,AL,36529,4,,,, +US-AL-36530,US,AL,36530,8.5,,,, +US-AL-36532,US,AL,36532,9,,,, +US-AL-36533,US,AL,36533,9,,,, +US-AL-36535,US,AL,36535,9,,,, +US-AL-36536,US,AL,36536,9,,,, +US-AL-36538,US,AL,36538,4,,,, +US-AL-36539,US,AL,36539,4,,,, +US-AL-36540,US,AL,36540,5,,,, +US-AL-36541,US,AL,36541,5.5,,,, +US-AL-36542,US,AL,36542,10,,,, +US-AL-36543,US,AL,36543,9,,,, +US-AL-36544,US,AL,36544,5.5,,,, +US-AL-36545,US,AL,36545,9,,,, +US-AL-36547,US,AL,36547,10,,,, +US-AL-36548,US,AL,36548,4,,,, +US-AL-36549,US,AL,36549,7,,,, +US-AL-36550,US,AL,36550,7,,,, +US-AL-36551,US,AL,36551,8,,,, +US-AL-36553,US,AL,36553,4,,,, +US-AL-36555,US,AL,36555,9,,,, +US-AL-36556,US,AL,36556,4,,,, +US-AL-36558,US,AL,36558,4,,,, +US-AL-36559,US,AL,36559,8,,,, +US-AL-36560,US,AL,36560,5.5,,,, +US-AL-36561,US,AL,36561,10,,,, +US-AL-36562,US,AL,36562,7,,,, +US-AL-36564,US,AL,36564,8,,,, +US-AL-36567,US,AL,36567,7,,,, +US-AL-36568,US,AL,36568,5.5,,,, +US-AL-36569,US,AL,36569,4,,,, +US-AL-36571,US,AL,36571,10,,,, +US-AL-36572,US,AL,36572,10,,,, +US-AL-36574,US,AL,36574,7,,,, +US-AL-36575,US,AL,36575,6.75,,,, +US-AL-36576,US,AL,36576,8,,,, +US-AL-36577,US,AL,36577,9.5,,,, +US-AL-36578,US,AL,36578,8,,,, +US-AL-36579,US,AL,36579,7,,,, +US-AL-36580,US,AL,36580,7,,,, +US-AL-36581,US,AL,36581,4,,,, +US-AL-36582,US,AL,36582,5.5,,,, +US-AL-36583,US,AL,36583,4,,,, +US-AL-36584,US,AL,36584,4,,,, +US-AL-36585,US,AL,36585,4,,,, +US-AL-36587,US,AL,36587,5.5,,,, +US-AL-36590,US,AL,36590,10,,,, +US-AL-36601,US,AL,36601,10,,,, +US-AL-36602,US,AL,36602,10,,,, +US-AL-36603,US,AL,36603,10,,,, +US-AL-36604,US,AL,36604,10,,,, +US-AL-36605,US,AL,36605,10,,,, +US-AL-36606,US,AL,36606,10,,,, +US-AL-36607,US,AL,36607,10,,,, +US-AL-36608,US,AL,36608,10,,,, +US-AL-36609,US,AL,36609,10,,,, +US-AL-36610,US,AL,36610,10,,,, +US-AL-36611,US,AL,36611,10,,,, +US-AL-36612,US,AL,36612,10,,,, +US-AL-36613,US,AL,36613,10,,,, +US-AL-36615,US,AL,36615,10,,,, +US-AL-36616,US,AL,36616,10,,,, +US-AL-36617,US,AL,36617,10,,,, +US-AL-36618,US,AL,36618,10,,,, +US-AL-36619,US,AL,36619,5.5,,,, +US-AL-36625,US,AL,36625,10,,,, +US-AL-36628,US,AL,36628,10,,,, +US-AL-36630,US,AL,36630,10,,,, +US-AL-36633,US,AL,36633,10,,,, +US-AL-36640,US,AL,36640,10,,,, +US-AL-36641,US,AL,36641,10,,,, +US-AL-36644,US,AL,36644,10,,,, +US-AL-36652,US,AL,36652,10,,,, +US-AL-36660,US,AL,36660,10,,,, +US-AL-36663,US,AL,36663,10,,,, +US-AL-36670,US,AL,36670,10,,,, +US-AL-36671,US,AL,36671,10,,,, +US-AL-36675,US,AL,36675,10,,,, +US-AL-36685,US,AL,36685,10,,,, +US-AL-36688,US,AL,36688,10,,,, +US-AL-36689,US,AL,36689,10,,,, +US-AL-36691,US,AL,36691,10,,,, +US-AL-36693,US,AL,36693,10,,,, +US-AL-36695,US,AL,36695,8,,,, +US-AL-36701,US,AL,36701,10,,,, +US-AL-36702,US,AL,36702,10,,,, +US-AL-36703,US,AL,36703,10,,,, +US-AL-36720,US,AL,36720,7.5,,,, +US-AL-36721,US,AL,36721,7.5,,,, +US-AL-36722,US,AL,36722,7.5,,,, +US-AL-36723,US,AL,36723,7.5,,,, +US-AL-36726,US,AL,36726,7.5,,,, +US-AL-36727,US,AL,36727,5,,,, +US-AL-36728,US,AL,36728,7.5,,,, +US-AL-36732,US,AL,36732,9,,,, +US-AL-36736,US,AL,36736,6,,,, +US-AL-36738,US,AL,36738,6,,,, +US-AL-36740,US,AL,36740,9,,,, +US-AL-36741,US,AL,36741,7.5,,,, +US-AL-36742,US,AL,36742,6,,,, +US-AL-36744,US,AL,36744,7,,,, +US-AL-36745,US,AL,36745,6,,,, +US-AL-36748,US,AL,36748,9,,,, +US-AL-36749,US,AL,36749,6,,,, +US-AL-36750,US,AL,36750,5,,,, +US-AL-36751,US,AL,36751,7.5,,,, +US-AL-36752,US,AL,36752,8,,,, +US-AL-36753,US,AL,36753,7.5,,,, +US-AL-36754,US,AL,36754,6,,,, +US-AL-36756,US,AL,36756,10,,,, +US-AL-36758,US,AL,36758,5.5,,,, +US-AL-36759,US,AL,36759,5.5,,,, +US-AL-36761,US,AL,36761,5.5,,,, +US-AL-36762,US,AL,36762,5,,,, +US-AL-36763,US,AL,36763,8,,,, +US-AL-36764,US,AL,36764,6,,,, +US-AL-36765,US,AL,36765,7.5,,,, +US-AL-36766,US,AL,36766,7.5,,,, +US-AL-36767,US,AL,36767,5.5,,,, +US-AL-36768,US,AL,36768,7.5,,,, +US-AL-36769,US,AL,36769,7.5,,,, +US-AL-36773,US,AL,36773,5.5,,,, +US-AL-36775,US,AL,36775,5.5,,,, +US-AL-36776,US,AL,36776,7,,,, +US-AL-36782,US,AL,36782,6,,,, +US-AL-36783,US,AL,36783,6,,,, +US-AL-36784,US,AL,36784,10,,,, +US-AL-36785,US,AL,36785,8,,,, +US-AL-36786,US,AL,36786,10,,,, +US-AL-36790,US,AL,36790,5,,,, +US-AL-36792,US,AL,36792,8,,,, +US-AL-36793,US,AL,36793,8,,,, +US-AL-36801,US,AL,36801,9,,,, +US-AL-36802,US,AL,36802,9,,,, +US-AL-36803,US,AL,36803,9,,,, +US-AL-36804,US,AL,36804,6,,,, +US-AL-36830,US,AL,36830,9,,,, +US-AL-36831,US,AL,36831,9,,,, +US-AL-36832,US,AL,36832,9,,,, +US-AL-36849,US,AL,36849,9,,,, +US-AL-36850,US,AL,36850,5,,,, +US-AL-36851,US,AL,36851,8,,,, +US-AL-36852,US,AL,36852,6,,,, +US-AL-36853,US,AL,36853,5,,,, +US-AL-36854,US,AL,36854,10,,,, +US-AL-36855,US,AL,36855,9,,,, +US-AL-36856,US,AL,36856,8,,,, +US-AL-36858,US,AL,36858,8,,,, +US-AL-36859,US,AL,36859,8,,,, +US-AL-36860,US,AL,36860,8,,,, +US-AL-36861,US,AL,36861,6.5,,,, +US-AL-36862,US,AL,36862,9,,,, +US-AL-36863,US,AL,36863,9,,,, +US-AL-36865,US,AL,36865,7,,,, +US-AL-36866,US,AL,36866,5,,,, +US-AL-36867,US,AL,36867,8.75,,,, +US-AL-36868,US,AL,36868,8.75,,,, +US-AL-36869,US,AL,36869,8.75,,,, +US-AL-36870,US,AL,36870,7.875,,,, +US-AL-36871,US,AL,36871,8,,,, +US-AL-36872,US,AL,36872,10,,,, +US-AL-36874,US,AL,36874,7,,,, +US-AL-36875,US,AL,36875,8,,,, +US-AL-36877,US,AL,36877,8,,,, +US-AL-36879,US,AL,36879,7,,,, +US-AL-36901,US,AL,36901,7,,,, +US-AL-36904,US,AL,36904,7,,,, +US-AL-36907,US,AL,36907,7,,,, +US-AL-36908,US,AL,36908,7,,,, +US-AL-36910,US,AL,36910,7,,,, +US-AL-36912,US,AL,36912,7,,,, +US-AL-36913,US,AL,36913,7,,,, +US-AL-36915,US,AL,36915,7,,,, +US-AL-36916,US,AL,36916,10,,,, +US-AL-36919,US,AL,36919,7,,,, +US-AL-36921,US,AL,36921,7,,,, +US-AL-36922,US,AL,36922,7,,,, +US-AL-36925,US,AL,36925,10,,,, +US-AR-71601,US,AR,71601,9.75,,,, +US-AR-71602,US,AR,71602,9.75,,,, +US-AR-71603,US,AR,71603,9.75,,,, +US-AR-71611,US,AR,71611,9.75,,,, +US-AR-71612,US,AR,71612,9.125,,,, +US-AR-71613,US,AR,71613,9.75,,,, +US-AR-71630,US,AR,71630,8,,,, +US-AR-71631,US,AR,71631,8.5,,,, +US-AR-71635,US,AR,71635,8,,,, +US-AR-71638,US,AR,71638,12,,,, +US-AR-71639,US,AR,71639,10.5,,,, +US-AR-71640,US,AR,71640,11.5,,,, +US-AR-71642,US,AR,71642,8,,,, +US-AR-71643,US,AR,71643,8.5,,,, +US-AR-71644,US,AR,71644,8.125,,,, +US-AR-71646,US,AR,71646,8,,,, +US-AR-71647,US,AR,71647,8.5,,,, +US-AR-71651,US,AR,71651,8.5,,,, +US-AR-71652,US,AR,71652,7.75,,,, +US-AR-71653,US,AR,71653,11.5,,,, +US-AR-71654,US,AR,71654,11,,,, +US-AR-71655,US,AR,71655,10,,,, +US-AR-71656,US,AR,71656,10,,,, +US-AR-71657,US,AR,71657,10,,,, +US-AR-71658,US,AR,71658,8,,,, +US-AR-71659,US,AR,71659,8.125,,,, +US-AR-71660,US,AR,71660,7.75,,,, +US-AR-71661,US,AR,71661,8,,,, +US-AR-71662,US,AR,71662,8,,,, +US-AR-71663,US,AR,71663,8,,,, +US-AR-71665,US,AR,71665,7.75,,,, +US-AR-71666,US,AR,71666,11,,,, +US-AR-71667,US,AR,71667,7.5,,,, +US-AR-71670,US,AR,71670,8,,,, +US-AR-71671,US,AR,71671,9.5,,,, +US-AR-71674,US,AR,71674,8,,,, +US-AR-71675,US,AR,71675,9,,,, +US-AR-71676,US,AR,71676,8,,,, +US-AR-71677,US,AR,71677,9,,,, +US-AR-71678,US,AR,71678,7.5,,,, +US-AR-71701,US,AR,71701,10.25,,,, +US-AR-71711,US,AR,71711,10.25,,,, +US-AR-71720,US,AR,71720,8.5,,,, +US-AR-71721,US,AR,71721,8,,,, +US-AR-71722,US,AR,71722,7.5,,,, +US-AR-71724,US,AR,71724,8.5,,,, +US-AR-71725,US,AR,71725,8.5,,,, +US-AR-71726,US,AR,71726,8.5,,,, +US-AR-71728,US,AR,71728,8,,,, +US-AR-71730,US,AR,71730,9.75,,,, +US-AR-71731,US,AR,71731,9.75,,,, +US-AR-71740,US,AR,71740,8,,,, +US-AR-71742,US,AR,71742,10,,,, +US-AR-71743,US,AR,71743,9.5,,,, +US-AR-71744,US,AR,71744,8,,,, +US-AR-71745,US,AR,71745,8,,,, +US-AR-71747,US,AR,71747,8.5,,,, +US-AR-71748,US,AR,71748,8.5,,,, +US-AR-71749,US,AR,71749,8.5,,,, +US-AR-71750,US,AR,71750,8.5,,,, +US-AR-71751,US,AR,71751,8.5,,,, +US-AR-71752,US,AR,71752,8,,,, +US-AR-71753,US,AR,71753,10.375,,,, +US-AR-71754,US,AR,71754,10.375,,,, +US-AR-71758,US,AR,71758,8.5,,,, +US-AR-71759,US,AR,71759,8.5,,,, +US-AR-71762,US,AR,71762,8.5,,,, +US-AR-71763,US,AR,71763,8.5,,,, +US-AR-71764,US,AR,71764,8.5,,,, +US-AR-71765,US,AR,71765,8.5,,,, +US-AR-71766,US,AR,71766,9,,,, +US-AR-71770,US,AR,71770,8,,,, +US-AR-71772,US,AR,71772,8,,,, +US-AR-71801,US,AR,71801,9.5,,,, +US-AR-71802,US,AR,71802,9.5,,,, +US-AR-71820,US,AR,71820,8.75,,,, +US-AR-71822,US,AR,71822,10.75,,,, +US-AR-71823,US,AR,71823,8.875,,,, +US-AR-71825,US,AR,71825,8.5,,,, +US-AR-71826,US,AR,71826,8.75,,,, +US-AR-71827,US,AR,71827,8.75,,,, +US-AR-71828,US,AR,71828,7.5,,,, +US-AR-71831,US,AR,71831,8.5,,,, +US-AR-71832,US,AR,71832,9.875,,,, +US-AR-71833,US,AR,71833,9.25,,,, +US-AR-71834,US,AR,71834,7.75,,,, +US-AR-71835,US,AR,71835,7.5,,,, +US-AR-71836,US,AR,71836,8.75,,,, +US-AR-71837,US,AR,71837,7.75,,,, +US-AR-71838,US,AR,71838,8.5,,,, +US-AR-71839,US,AR,71839,8.75,,,, +US-AR-71840,US,AR,71840,7.75,,,, +US-AR-71841,US,AR,71841,8.875,,,, +US-AR-71842,US,AR,71842,8.875,,,, +US-AR-71845,US,AR,71845,8.75,,,, +US-AR-71846,US,AR,71846,8.875,,,, +US-AR-71847,US,AR,71847,8.5,,,, +US-AR-71851,US,AR,71851,9.25,,,, +US-AR-71852,US,AR,71852,10.25,,,, +US-AR-71853,US,AR,71853,8.75,,,, +US-AR-71854,US,AR,71854,10.25,,,, +US-AR-71855,US,AR,71855,8.5,,,, +US-AR-71857,US,AR,71857,8.5,,,, +US-AR-71858,US,AR,71858,7.5,,,, +US-AR-71859,US,AR,71859,8.5,,,, +US-AR-71860,US,AR,71860,9.75,,,, +US-AR-71861,US,AR,71861,8,,,, +US-AR-71862,US,AR,71862,8.5,,,, +US-AR-71864,US,AR,71864,7.5,,,, +US-AR-71865,US,AR,71865,9.75,,,, +US-AR-71866,US,AR,71866,8.75,,,, +US-AR-71901,US,AR,71901,9.5,,,, +US-AR-71902,US,AR,71902,9.5,,,, +US-AR-71903,US,AR,71903,9.5,,,, +US-AR-71909,US,AR,71909,8,,,, +US-AR-71910,US,AR,71910,8,,,, +US-AR-71913,US,AR,71913,8,,,, +US-AR-71914,US,AR,71914,9.5,,,, +US-AR-71920,US,AR,71920,9.5,,,, +US-AR-71921,US,AR,71921,8,,,, +US-AR-71922,US,AR,71922,8.5,,,, +US-AR-71923,US,AR,71923,9,,,, +US-AR-71929,US,AR,71929,8,,,, +US-AR-71932,US,AR,71932,8.5,,,, +US-AR-71933,US,AR,71933,8,,,, +US-AR-71935,US,AR,71935,7.5,,,, +US-AR-71937,US,AR,71937,8.5,,,, +US-AR-71940,US,AR,71940,8.5,,,, +US-AR-71941,US,AR,71941,8,,,, +US-AR-71942,US,AR,71942,8,,,, +US-AR-71943,US,AR,71943,10,,,, +US-AR-71944,US,AR,71944,8.5,,,, +US-AR-71945,US,AR,71945,8.5,,,, +US-AR-71949,US,AR,71949,8,,,, +US-AR-71950,US,AR,71950,8.5,,,, +US-AR-71952,US,AR,71952,8.5,,,, +US-AR-71953,US,AR,71953,9.5,,,, +US-AR-71956,US,AR,71956,8,,,, +US-AR-71957,US,AR,71957,7.5,,,, +US-AR-71958,US,AR,71958,10,,,, +US-AR-71959,US,AR,71959,8.5,,,, +US-AR-71960,US,AR,71960,7.5,,,, +US-AR-71961,US,AR,71961,7.5,,,, +US-AR-71962,US,AR,71962,8,,,, +US-AR-71964,US,AR,71964,8,,,, +US-AR-71965,US,AR,71965,7.5,,,, +US-AR-71966,US,AR,71966,7.5,,,, +US-AR-71968,US,AR,71968,8,,,, +US-AR-71969,US,AR,71969,7.5,,,, +US-AR-71970,US,AR,71970,7.5,,,, +US-AR-71971,US,AR,71971,9.25,,,, +US-AR-71972,US,AR,71972,8.5,,,, +US-AR-71973,US,AR,71973,8.5,,,, +US-AR-71998,US,AR,71998,9,,,, +US-AR-71999,US,AR,71999,9,,,, +US-AR-72001,US,AR,72001,9,,,, +US-AR-72002,US,AR,72002,6.5,,,, +US-AR-72003,US,AR,72003,7.5,,,, +US-AR-72004,US,AR,72004,8.125,,,, +US-AR-72005,US,AR,72005,8.75,,,, +US-AR-72006,US,AR,72006,8.5,,,, +US-AR-72007,US,AR,72007,7.5,,,, +US-AR-72010,US,AR,72010,9.5,,,, +US-AR-72011,US,AR,72011,6.5,,,, +US-AR-72012,US,AR,72012,9,,,, +US-AR-72013,US,AR,72013,8.5,,,, +US-AR-72014,US,AR,72014,9.25,,,, +US-AR-72015,US,AR,72015,8,,,, +US-AR-72016,US,AR,72016,9,,,, +US-AR-72017,US,AR,72017,7.5,,,, +US-AR-72018,US,AR,72018,8,,,, +US-AR-72019,US,AR,72019,6.5,,,, +US-AR-72020,US,AR,72020,8.75,,,, +US-AR-72021,US,AR,72021,8.5,,,, +US-AR-72022,US,AR,72022,9.5,,,, +US-AR-72023,US,AR,72023,9.5,,,, +US-AR-72024,US,AR,72024,7.5,,,, +US-AR-72025,US,AR,72025,9,,,, +US-AR-72026,US,AR,72026,7.5,,,, +US-AR-72027,US,AR,72027,8.25,,,, +US-AR-72028,US,AR,72028,8.5,,,, +US-AR-72029,US,AR,72029,9.5,,,, +US-AR-72030,US,AR,72030,8.25,,,, +US-AR-72031,US,AR,72031,8.5,,,, +US-AR-72032,US,AR,72032,8.75,,,, +US-AR-72033,US,AR,72033,8.75,,,, +US-AR-72034,US,AR,72034,8.75,,,, +US-AR-72035,US,AR,72035,8.75,,,, +US-AR-72036,US,AR,72036,8.5,,,, +US-AR-72037,US,AR,72037,8.5,,,, +US-AR-72038,US,AR,72038,7.5,,,, +US-AR-72039,US,AR,72039,8.5,,,, +US-AR-72040,US,AR,72040,8.5,,,, +US-AR-72041,US,AR,72041,7.5,,,, +US-AR-72042,US,AR,72042,11,,,, +US-AR-72043,US,AR,72043,9.75,,,, +US-AR-72044,US,AR,72044,8.125,,,, +US-AR-72045,US,AR,72045,8,,,, +US-AR-72046,US,AR,72046,10.5,,,, +US-AR-72047,US,AR,72047,7,,,, +US-AR-72048,US,AR,72048,7.5,,,, +US-AR-72051,US,AR,72051,7.5,,,, +US-AR-72052,US,AR,72052,8,,,, +US-AR-72053,US,AR,72053,7.5,,,, +US-AR-72055,US,AR,72055,7.5,,,, +US-AR-72057,US,AR,72057,7.75,,,, +US-AR-72058,US,AR,72058,7,,,, +US-AR-72059,US,AR,72059,7.5,,,, +US-AR-72060,US,AR,72060,8,,,, +US-AR-72061,US,AR,72061,9,,,, +US-AR-72063,US,AR,72063,8.25,,,, +US-AR-72064,US,AR,72064,7.5,,,, +US-AR-72065,US,AR,72065,6.5,,,, +US-AR-72066,US,AR,72066,7.5,,,, +US-AR-72067,US,AR,72067,8.125,,,, +US-AR-72068,US,AR,72068,8,,,, +US-AR-72069,US,AR,72069,6.5,,,, +US-AR-72070,US,AR,72070,9,,,, +US-AR-72072,US,AR,72072,7.5,,,, +US-AR-72073,US,AR,72073,7.5,,,, +US-AR-72074,US,AR,72074,7.5,,,, +US-AR-72075,US,AR,72075,8.75,,,, +US-AR-72076,US,AR,72076,9.5,,,, +US-AR-72078,US,AR,72078,9.5,,,, +US-AR-72079,US,AR,72079,8.125,,,, +US-AR-72080,US,AR,72080,8.5,,,, +US-AR-72081,US,AR,72081,8,,,, +US-AR-72082,US,AR,72082,8,,,, +US-AR-72083,US,AR,72083,8.5,,,, +US-AR-72084,US,AR,72084,7.75,,,, +US-AR-72085,US,AR,72085,8,,,, +US-AR-72086,US,AR,72086,7.5,,,, +US-AR-72087,US,AR,72087,6.5,,,, +US-AR-72088,US,AR,72088,10,,,, +US-AR-72089,US,AR,72089,9.5,,,, +US-AR-72099,US,AR,72099,9.5,,,, +US-AR-72101,US,AR,72101,7.5,,,, +US-AR-72102,US,AR,72102,8,,,, +US-AR-72103,US,AR,72103,6.5,,,, +US-AR-72104,US,AR,72104,8,,,, +US-AR-72105,US,AR,72105,8,,,, +US-AR-72106,US,AR,72106,9,,,, +US-AR-72107,US,AR,72107,11.25,,,, +US-AR-72108,US,AR,72108,6.5,,,, +US-AR-72110,US,AR,72110,9.25,,,, +US-AR-72111,US,AR,72111,7,,,, +US-AR-72112,US,AR,72112,10.25,,,, +US-AR-72113,US,AR,72113,8.5,,,, +US-AR-72114,US,AR,72114,8.5,,,, +US-AR-72115,US,AR,72115,8.5,,,, +US-AR-72116,US,AR,72116,8.5,,,, +US-AR-72117,US,AR,72117,8.5,,,, +US-AR-72118,US,AR,72118,8.5,,,, +US-AR-72119,US,AR,72119,8.5,,,, +US-AR-72120,US,AR,72120,8.5,,,, +US-AR-72121,US,AR,72121,8,,,, +US-AR-72122,US,AR,72122,6.5,,,, +US-AR-72123,US,AR,72123,8.5,,,, +US-AR-72124,US,AR,72124,8.5,,,, +US-AR-72125,US,AR,72125,9,,,, +US-AR-72126,US,AR,72126,9,,,, +US-AR-72127,US,AR,72127,10.25,,,, +US-AR-72128,US,AR,72128,7.75,,,, +US-AR-72129,US,AR,72129,7.75,,,, +US-AR-72130,US,AR,72130,8.125,,,, +US-AR-72131,US,AR,72131,8.125,,,, +US-AR-72132,US,AR,72132,8.125,,,, +US-AR-72133,US,AR,72133,8.125,,,, +US-AR-72134,US,AR,72134,6.5,,,, +US-AR-72135,US,AR,72135,7.5,,,, +US-AR-72136,US,AR,72136,8,,,, +US-AR-72137,US,AR,72137,8,,,, +US-AR-72139,US,AR,72139,8,,,, +US-AR-72140,US,AR,72140,9.5,,,, +US-AR-72141,US,AR,72141,8.5,,,, +US-AR-72142,US,AR,72142,7.5,,,, +US-AR-72143,US,AR,72143,8.5,,,, +US-AR-72145,US,AR,72145,8.5,,,, +US-AR-72149,US,AR,72149,8.5,,,, +US-AR-72150,US,AR,72150,7.75,,,, +US-AR-72152,US,AR,72152,8.125,,,, +US-AR-72153,US,AR,72153,8.5,,,, +US-AR-72156,US,AR,72156,8.25,,,, +US-AR-72157,US,AR,72157,8.25,,,, +US-AR-72158,US,AR,72158,8,,,, +US-AR-72160,US,AR,72160,9.5,,,, +US-AR-72164,US,AR,72164,7.5,,,, +US-AR-72165,US,AR,72165,8.5,,,, +US-AR-72166,US,AR,72166,7.5,,,, +US-AR-72167,US,AR,72167,6.5,,,, +US-AR-72168,US,AR,72168,8.125,,,, +US-AR-72169,US,AR,72169,8.75,,,, +US-AR-72170,US,AR,72170,7.5,,,, +US-AR-72173,US,AR,72173,7,,,, +US-AR-72175,US,AR,72175,8.125,,,, +US-AR-72176,US,AR,72176,7.5,,,, +US-AR-72178,US,AR,72178,8,,,, +US-AR-72179,US,AR,72179,8.125,,,, +US-AR-72180,US,AR,72180,7.5,,,, +US-AR-72181,US,AR,72181,7,,,, +US-AR-72182,US,AR,72182,8.125,,,, +US-AR-72183,US,AR,72183,7.5,,,, +US-AR-72190,US,AR,72190,8.5,,,, +US-AR-72199,US,AR,72199,7.5,,,, +US-AR-72201,US,AR,72201,9,,,, +US-AR-72202,US,AR,72202,9,,,, +US-AR-72203,US,AR,72203,9,,,, +US-AR-72204,US,AR,72204,9,,,, +US-AR-72205,US,AR,72205,9,,,, +US-AR-72206,US,AR,72206,7.5,,,, +US-AR-72207,US,AR,72207,9,,,, +US-AR-72209,US,AR,72209,9,,,, +US-AR-72210,US,AR,72210,7.5,,,, +US-AR-72211,US,AR,72211,9,,,, +US-AR-72212,US,AR,72212,9,,,, +US-AR-72214,US,AR,72214,9,,,, +US-AR-72215,US,AR,72215,9,,,, +US-AR-72216,US,AR,72216,9,,,, +US-AR-72217,US,AR,72217,9,,,, +US-AR-72219,US,AR,72219,9,,,, +US-AR-72221,US,AR,72221,9,,,, +US-AR-72222,US,AR,72222,9,,,, +US-AR-72223,US,AR,72223,9,,,, +US-AR-72225,US,AR,72225,9,,,, +US-AR-72227,US,AR,72227,9,,,, +US-AR-72231,US,AR,72231,8.5,,,, +US-AR-72255,US,AR,72255,9,,,, +US-AR-72260,US,AR,72260,9,,,, +US-AR-72295,US,AR,72295,9,,,, +US-AR-72301,US,AR,72301,9.75,,,, +US-AR-72303,US,AR,72303,9.75,,,, +US-AR-72310,US,AR,72310,8.5,,,, +US-AR-72311,US,AR,72311,7.5,,,, +US-AR-72312,US,AR,72312,8.5,,,, +US-AR-72313,US,AR,72313,8.5,,,, +US-AR-72315,US,AR,72315,9.75,,,, +US-AR-72316,US,AR,72316,9.75,,,, +US-AR-72319,US,AR,72319,9.75,,,, +US-AR-72320,US,AR,72320,7.5,,,, +US-AR-72321,US,AR,72321,8.5,,,, +US-AR-72322,US,AR,72322,8.5,,,, +US-AR-72324,US,AR,72324,8.5,,,, +US-AR-72325,US,AR,72325,8.25,,,, +US-AR-72326,US,AR,72326,8.5,,,, +US-AR-72327,US,AR,72327,8.25,,,, +US-AR-72328,US,AR,72328,8.5,,,, +US-AR-72329,US,AR,72329,8.5,,,, +US-AR-72330,US,AR,72330,8.5,,,, +US-AR-72331,US,AR,72331,10.25,,,, +US-AR-72332,US,AR,72332,8.25,,,, +US-AR-72333,US,AR,72333,8.5,,,, +US-AR-72335,US,AR,72335,9.5,,,, +US-AR-72336,US,AR,72336,9.5,,,, +US-AR-72338,US,AR,72338,8.5,,,, +US-AR-72339,US,AR,72339,9.25,,,, +US-AR-72340,US,AR,72340,8.5,,,, +US-AR-72341,US,AR,72341,7.5,,,, +US-AR-72342,US,AR,72342,10.5,,,, +US-AR-72346,US,AR,72346,8.5,,,, +US-AR-72347,US,AR,72347,8.5,,,, +US-AR-72348,US,AR,72348,8.25,,,, +US-AR-72350,US,AR,72350,8.5,,,, +US-AR-72352,US,AR,72352,7.5,,,, +US-AR-72353,US,AR,72353,8.5,,,, +US-AR-72354,US,AR,72354,9.5,,,, +US-AR-72355,US,AR,72355,8.5,,,, +US-AR-72358,US,AR,72358,9.5,,,, +US-AR-72359,US,AR,72359,9.5,,,, +US-AR-72360,US,AR,72360,9.5,,,, +US-AR-72364,US,AR,72364,10.25,,,, +US-AR-72365,US,AR,72365,9.75,,,, +US-AR-72366,US,AR,72366,8.5,,,, +US-AR-72367,US,AR,72367,8.5,,,, +US-AR-72368,US,AR,72368,7.5,,,, +US-AR-72369,US,AR,72369,8.5,,,, +US-AR-72370,US,AR,72370,9.5,,,, +US-AR-72372,US,AR,72372,8.5,,,, +US-AR-72373,US,AR,72373,8.5,,,, +US-AR-72374,US,AR,72374,8.5,,,, +US-AR-72376,US,AR,72376,8.25,,,, +US-AR-72377,US,AR,72377,7.75,,,, +US-AR-72379,US,AR,72379,8,,,, +US-AR-72383,US,AR,72383,8.5,,,, +US-AR-72384,US,AR,72384,8.25,,,, +US-AR-72386,US,AR,72386,7.75,,,, +US-AR-72387,US,AR,72387,8.5,,,, +US-AR-72389,US,AR,72389,8.5,,,, +US-AR-72390,US,AR,72390,10.5,,,, +US-AR-72391,US,AR,72391,8.5,,,, +US-AR-72392,US,AR,72392,8.5,,,, +US-AR-72394,US,AR,72394,8.5,,,, +US-AR-72395,US,AR,72395,8.5,,,, +US-AR-72396,US,AR,72396,9.5,,,, +US-AR-72401,US,AR,72401,9,,,, +US-AR-72402,US,AR,72402,9,,,, +US-AR-72403,US,AR,72403,9,,,, +US-AR-72404,US,AR,72404,9,,,, +US-AR-72410,US,AR,72410,8,,,, +US-AR-72411,US,AR,72411,8.5,,,, +US-AR-72412,US,AR,72412,8.25,,,, +US-AR-72413,US,AR,72413,7.75,,,, +US-AR-72414,US,AR,72414,7.5,,,, +US-AR-72415,US,AR,72415,9,,,, +US-AR-72416,US,AR,72416,7.5,,,, +US-AR-72417,US,AR,72417,7.5,,,, +US-AR-72419,US,AR,72419,7.5,,,, +US-AR-72421,US,AR,72421,7.5,,,, +US-AR-72422,US,AR,72422,8.75,,,, +US-AR-72424,US,AR,72424,7,,,, +US-AR-72425,US,AR,72425,8.25,,,, +US-AR-72426,US,AR,72426,8.5,,,, +US-AR-72427,US,AR,72427,7.5,,,, +US-AR-72428,US,AR,72428,9.5,,,, +US-AR-72429,US,AR,72429,7.75,,,, +US-AR-72430,US,AR,72430,7,,,, +US-AR-72431,US,AR,72431,8.75,,,, +US-AR-72432,US,AR,72432,7.75,,,, +US-AR-72433,US,AR,72433,9,,,, +US-AR-72434,US,AR,72434,7.75,,,, +US-AR-72435,US,AR,72435,7,,,, +US-AR-72436,US,AR,72436,8.25,,,, +US-AR-72437,US,AR,72437,7.5,,,, +US-AR-72438,US,AR,72438,8.5,,,, +US-AR-72440,US,AR,72440,8,,,, +US-AR-72441,US,AR,72441,7,,,, +US-AR-72442,US,AR,72442,8.5,,,, +US-AR-72443,US,AR,72443,8.25,,,, +US-AR-72444,US,AR,72444,7.75,,,, +US-AR-72445,US,AR,72445,8,,,, +US-AR-72447,US,AR,72447,8.5,,,, +US-AR-72449,US,AR,72449,7.75,,,, +US-AR-72450,US,AR,72450,9,,,, +US-AR-72451,US,AR,72451,9,,,, +US-AR-72453,US,AR,72453,7,,,, +US-AR-72454,US,AR,72454,9,,,, +US-AR-72455,US,AR,72455,7.75,,,, +US-AR-72456,US,AR,72456,7,,,, +US-AR-72457,US,AR,72457,9,,,, +US-AR-72458,US,AR,72458,8,,,, +US-AR-72459,US,AR,72459,7.75,,,, +US-AR-72460,US,AR,72460,7.75,,,, +US-AR-72461,US,AR,72461,9,,,, +US-AR-72462,US,AR,72462,7.75,,,, +US-AR-72464,US,AR,72464,7,,,, +US-AR-72465,US,AR,72465,8,,,, +US-AR-72466,US,AR,72466,8,,,, +US-AR-72467,US,AR,72467,9,,,, +US-AR-72469,US,AR,72469,8,,,, +US-AR-72470,US,AR,72470,7,,,, +US-AR-72471,US,AR,72471,9.75,,,, +US-AR-72472,US,AR,72472,8.75,,,, +US-AR-72473,US,AR,72473,10,,,, +US-AR-72474,US,AR,72474,8.25,,,, +US-AR-72475,US,AR,72475,9.75,,,, +US-AR-72476,US,AR,72476,9,,,, +US-AR-72478,US,AR,72478,7.75,,,, +US-AR-72479,US,AR,72479,7.75,,,, +US-AR-72482,US,AR,72482,7.5,,,, +US-AR-72501,US,AR,72501,8.5,,,, +US-AR-72503,US,AR,72503,10.5,,,, +US-AR-72512,US,AR,72512,9,,,, +US-AR-72513,US,AR,72513,8.5,,,, +US-AR-72515,US,AR,72515,8.5,,,, +US-AR-72517,US,AR,72517,7,,,, +US-AR-72519,US,AR,72519,7.5,,,, +US-AR-72520,US,AR,72520,8.5,,,, +US-AR-72521,US,AR,72521,7.5,,,, +US-AR-72522,US,AR,72522,8.5,,,, +US-AR-72523,US,AR,72523,8.125,,,, +US-AR-72524,US,AR,72524,8.5,,,, +US-AR-72525,US,AR,72525,8.5,,,, +US-AR-72526,US,AR,72526,8.5,,,, +US-AR-72527,US,AR,72527,8.5,,,, +US-AR-72528,US,AR,72528,7,,,, +US-AR-72529,US,AR,72529,8.5,,,, +US-AR-72530,US,AR,72530,8.125,,,, +US-AR-72531,US,AR,72531,7.5,,,, +US-AR-72532,US,AR,72532,7.5,,,, +US-AR-72533,US,AR,72533,7.5,,,, +US-AR-72534,US,AR,72534,8.5,,,, +US-AR-72536,US,AR,72536,8,,,, +US-AR-72537,US,AR,72537,7.5,,,, +US-AR-72538,US,AR,72538,8.5,,,, +US-AR-72539,US,AR,72539,8.5,,,, +US-AR-72540,US,AR,72540,7,,,, +US-AR-72542,US,AR,72542,8.5,,,, +US-AR-72543,US,AR,72543,8.125,,,, +US-AR-72544,US,AR,72544,7.5,,,, +US-AR-72545,US,AR,72545,9.125,,,, +US-AR-72546,US,AR,72546,8.125,,,, +US-AR-72550,US,AR,72550,8.5,,,, +US-AR-72553,US,AR,72553,8.5,,,, +US-AR-72554,US,AR,72554,8.5,,,, +US-AR-72555,US,AR,72555,7.5,,,, +US-AR-72556,US,AR,72556,9,,,, +US-AR-72560,US,AR,72560,7.5,,,, +US-AR-72561,US,AR,72561,7,,,, +US-AR-72562,US,AR,72562,8.5,,,, +US-AR-72564,US,AR,72564,8.5,,,, +US-AR-72565,US,AR,72565,8,,,, +US-AR-72566,US,AR,72566,7,,,, +US-AR-72567,US,AR,72567,7.5,,,, +US-AR-72568,US,AR,72568,8.5,,,, +US-AR-72569,US,AR,72569,7.5,,,, +US-AR-72571,US,AR,72571,8.5,,,, +US-AR-72572,US,AR,72572,8,,,, +US-AR-72573,US,AR,72573,7,,,, +US-AR-72575,US,AR,72575,8.5,,,, +US-AR-72576,US,AR,72576,8.5,,,, +US-AR-72577,US,AR,72577,7,,,, +US-AR-72578,US,AR,72578,8.5,,,, +US-AR-72579,US,AR,72579,8.5,,,, +US-AR-72581,US,AR,72581,8.125,,,, +US-AR-72583,US,AR,72583,8.5,,,, +US-AR-72584,US,AR,72584,7,,,, +US-AR-72585,US,AR,72585,7,,,, +US-AR-72587,US,AR,72587,7,,,, +US-AR-72601,US,AR,72601,7.75,,,, +US-AR-72602,US,AR,72602,8.5,,,, +US-AR-72611,US,AR,72611,7,,,, +US-AR-72613,US,AR,72613,7,,,, +US-AR-72615,US,AR,72615,7.75,,,, +US-AR-72616,US,AR,72616,7,,,, +US-AR-72617,US,AR,72617,7.5,,,, +US-AR-72619,US,AR,72619,8.5,,,, +US-AR-72623,US,AR,72623,7.5,,,, +US-AR-72624,US,AR,72624,8,,,, +US-AR-72626,US,AR,72626,9.5,,,, +US-AR-72628,US,AR,72628,8,,,, +US-AR-72629,US,AR,72629,8.5,,,, +US-AR-72630,US,AR,72630,7.75,,,, +US-AR-72631,US,AR,72631,7,,,, +US-AR-72632,US,AR,72632,7,,,, +US-AR-72633,US,AR,72633,7.75,,,, +US-AR-72634,US,AR,72634,7.5,,,, +US-AR-72635,US,AR,72635,7.5,,,, +US-AR-72636,US,AR,72636,8.5,,,, +US-AR-72638,US,AR,72638,7,,,, +US-AR-72639,US,AR,72639,7.5,,,, +US-AR-72640,US,AR,72640,8,,,, +US-AR-72641,US,AR,72641,10,,,, +US-AR-72642,US,AR,72642,7.5,,,, +US-AR-72644,US,AR,72644,7.75,,,, +US-AR-72645,US,AR,72645,7.5,,,, +US-AR-72648,US,AR,72648,8,,,, +US-AR-72650,US,AR,72650,7.5,,,, +US-AR-72651,US,AR,72651,7.5,,,, +US-AR-72653,US,AR,72653,7.5,,,, +US-AR-72654,US,AR,72654,8.5,,,, +US-AR-72655,US,AR,72655,8,,,, +US-AR-72657,US,AR,72657,7.5,,,, +US-AR-72658,US,AR,72658,7.5,,,, +US-AR-72659,US,AR,72659,8.5,,,, +US-AR-72660,US,AR,72660,7,,,, +US-AR-72661,US,AR,72661,7.5,,,, +US-AR-72662,US,AR,72662,7.75,,,, +US-AR-72663,US,AR,72663,7.5,,,, +US-AR-72666,US,AR,72666,8,,,, +US-AR-72668,US,AR,72668,7.5,,,, +US-AR-72669,US,AR,72669,7.5,,,, +US-AR-72670,US,AR,72670,8,,,, +US-AR-72672,US,AR,72672,8,,,, +US-AR-72675,US,AR,72675,7.5,,,, +US-AR-72677,US,AR,72677,8.5,,,, +US-AR-72679,US,AR,72679,7.5,,,, +US-AR-72680,US,AR,72680,7.5,,,, +US-AR-72682,US,AR,72682,7.5,,,, +US-AR-72683,US,AR,72683,8,,,, +US-AR-72685,US,AR,72685,7.75,,,, +US-AR-72686,US,AR,72686,7.5,,,, +US-AR-72687,US,AR,72687,7.5,,,, +US-AR-72701,US,AR,72701,9.75,,,, +US-AR-72702,US,AR,72702,9.75,,,, +US-AR-72703,US,AR,72703,9.75,,,, +US-AR-72704,US,AR,72704,9.75,,,, +US-AR-72711,US,AR,72711,8.5,,,, +US-AR-72712,US,AR,72712,9.5,,,, +US-AR-72714,US,AR,72714,8.5,,,, +US-AR-72715,US,AR,72715,8.5,,,, +US-AR-72716,US,AR,72716,9.5,,,, +US-AR-72717,US,AR,72717,7.75,,,, +US-AR-72718,US,AR,72718,8.5,,,, +US-AR-72719,US,AR,72719,9.5,,,, +US-AR-72721,US,AR,72721,8.5,,,, +US-AR-72722,US,AR,72722,7.5,,,, +US-AR-72727,US,AR,72727,8.5,,,, +US-AR-72728,US,AR,72728,8.75,,,, +US-AR-72729,US,AR,72729,7.75,,,, +US-AR-72730,US,AR,72730,10.75,,,, +US-AR-72732,US,AR,72732,7.5,,,, +US-AR-72733,US,AR,72733,7.5,,,, +US-AR-72734,US,AR,72734,7.5,,,, +US-AR-72735,US,AR,72735,7.75,,,, +US-AR-72736,US,AR,72736,7.5,,,, +US-AR-72737,US,AR,72737,9.75,,,, +US-AR-72738,US,AR,72738,8.5,,,, +US-AR-72739,US,AR,72739,9.5,,,, +US-AR-72740,US,AR,72740,8.5,,,, +US-AR-72741,US,AR,72741,9.75,,,, +US-AR-72742,US,AR,72742,8.5,,,, +US-AR-72744,US,AR,72744,7.75,,,, +US-AR-72745,US,AR,72745,9.5,,,, +US-AR-72747,US,AR,72747,7.5,,,, +US-AR-72749,US,AR,72749,7.75,,,, +US-AR-72751,US,AR,72751,8.5,,,, +US-AR-72752,US,AR,72752,8.5,,,, +US-AR-72753,US,AR,72753,7.75,,,, +US-AR-72756,US,AR,72756,9.5,,,, +US-AR-72757,US,AR,72757,9.5,,,, +US-AR-72758,US,AR,72758,9.5,,,, +US-AR-72760,US,AR,72760,8.5,,,, +US-AR-72761,US,AR,72761,9.5,,,, +US-AR-72762,US,AR,72762,9.75,,,, +US-AR-72764,US,AR,72764,9.75,,,, +US-AR-72765,US,AR,72765,9.75,,,, +US-AR-72766,US,AR,72766,9.75,,,, +US-AR-72768,US,AR,72768,7.5,,,, +US-AR-72769,US,AR,72769,7.75,,,, +US-AR-72770,US,AR,72770,9.75,,,, +US-AR-72773,US,AR,72773,8.5,,,, +US-AR-72774,US,AR,72774,7.75,,,, +US-AR-72776,US,AR,72776,8.5,,,, +US-AR-72801,US,AR,72801,9,,,, +US-AR-72802,US,AR,72802,7.5,,,, +US-AR-72811,US,AR,72811,9,,,, +US-AR-72812,US,AR,72812,9,,,, +US-AR-72820,US,AR,72820,8,,,, +US-AR-72821,US,AR,72821,8,,,, +US-AR-72823,US,AR,72823,7.5,,,, +US-AR-72824,US,AR,72824,7.5,,,, +US-AR-72826,US,AR,72826,7.5,,,, +US-AR-72827,US,AR,72827,7.5,,,, +US-AR-72828,US,AR,72828,7.5,,,, +US-AR-72829,US,AR,72829,7.5,,,, +US-AR-72830,US,AR,72830,7.5,,,, +US-AR-72832,US,AR,72832,8.5,,,, +US-AR-72833,US,AR,72833,7.5,,,, +US-AR-72834,US,AR,72834,7.5,,,, +US-AR-72835,US,AR,72835,7.5,,,, +US-AR-72837,US,AR,72837,7.5,,,, +US-AR-72838,US,AR,72838,7.5,,,, +US-AR-72839,US,AR,72839,7.5,,,, +US-AR-72840,US,AR,72840,7.5,,,, +US-AR-72841,US,AR,72841,9.125,,,, +US-AR-72842,US,AR,72842,7.5,,,, +US-AR-72843,US,AR,72843,7.5,,,, +US-AR-72845,US,AR,72845,7.5,,,, +US-AR-72846,US,AR,72846,7.5,,,, +US-AR-72847,US,AR,72847,7.5,,,, +US-AR-72851,US,AR,72851,7.5,,,, +US-AR-72852,US,AR,72852,7.5,,,, +US-AR-72853,US,AR,72853,7.5,,,, +US-AR-72854,US,AR,72854,7.5,,,, +US-AR-72855,US,AR,72855,8,,,, +US-AR-72856,US,AR,72856,7.5,,,, +US-AR-72857,US,AR,72857,7.5,,,, +US-AR-72858,US,AR,72858,9,,,, +US-AR-72860,US,AR,72860,7.5,,,, +US-AR-72863,US,AR,72863,7.5,,,, +US-AR-72865,US,AR,72865,7.5,,,, +US-AR-72901,US,AR,72901,9.75,,,, +US-AR-72902,US,AR,72902,9.75,,,, +US-AR-72903,US,AR,72903,9.75,,,, +US-AR-72904,US,AR,72904,9.75,,,, +US-AR-72905,US,AR,72905,9.75,,,, +US-AR-72906,US,AR,72906,9.75,,,, +US-AR-72908,US,AR,72908,9.75,,,, +US-AR-72913,US,AR,72913,9.75,,,, +US-AR-72914,US,AR,72914,9.75,,,, +US-AR-72916,US,AR,72916,7.75,,,, +US-AR-72917,US,AR,72917,9.75,,,, +US-AR-72918,US,AR,72918,9.75,,,, +US-AR-72919,US,AR,72919,7.75,,,, +US-AR-72921,US,AR,72921,7.5,,,, +US-AR-72923,US,AR,72923,8.75,,,, +US-AR-72926,US,AR,72926,9.125,,,, +US-AR-72927,US,AR,72927,7.5,,,, +US-AR-72928,US,AR,72928,9,,,, +US-AR-72930,US,AR,72930,8,,,, +US-AR-72932,US,AR,72932,7.5,,,, +US-AR-72933,US,AR,72933,9.5,,,, +US-AR-72934,US,AR,72934,7.5,,,, +US-AR-72935,US,AR,72935,8.5,,,, +US-AR-72936,US,AR,72936,7.75,,,, +US-AR-72937,US,AR,72937,7.75,,,, +US-AR-72938,US,AR,72938,8.75,,,, +US-AR-72940,US,AR,72940,7.75,,,, +US-AR-72941,US,AR,72941,7.75,,,, +US-AR-72943,US,AR,72943,7.5,,,, +US-AR-72944,US,AR,72944,7.75,,,, +US-AR-72945,US,AR,72945,7.75,,,, +US-AR-72946,US,AR,72946,7.5,,,, +US-AR-72947,US,AR,72947,7.5,,,, +US-AR-72948,US,AR,72948,7.5,,,, +US-AR-72949,US,AR,72949,8,,,, +US-AR-72950,US,AR,72950,9.125,,,, +US-AR-72951,US,AR,72951,7.5,,,, +US-AR-72952,US,AR,72952,7.5,,,, +US-AR-72955,US,AR,72955,7.5,,,, +US-AR-72956,US,AR,72956,9.5,,,, +US-AR-72957,US,AR,72957,9.5,,,, +US-AR-72958,US,AR,72958,9.125,,,, +US-AR-72959,US,AR,72959,7.75,,,, +US-AZ-85001,US,AZ,85001,8.3,,,, +US-AZ-85002,US,AZ,85002,8.3,,,, +US-AZ-85003,US,AZ,85003,8.3,,,, +US-AZ-85004,US,AZ,85004,8.3,,,, +US-AZ-85005,US,AZ,85005,8.3,,,, +US-AZ-85006,US,AZ,85006,8.3,,,, +US-AZ-85007,US,AZ,85007,8.3,,,, +US-AZ-85008,US,AZ,85008,8.3,,,, +US-AZ-85009,US,AZ,85009,8.3,,,, +US-AZ-85010,US,AZ,85010,8.3,,,, +US-AZ-85011,US,AZ,85011,8.3,,,, +US-AZ-85012,US,AZ,85012,8.3,,,, +US-AZ-85013,US,AZ,85013,8.3,,,, +US-AZ-85014,US,AZ,85014,8.3,,,, +US-AZ-85015,US,AZ,85015,8.3,,,, +US-AZ-85016,US,AZ,85016,8.3,,,, +US-AZ-85017,US,AZ,85017,8.3,,,, +US-AZ-85018,US,AZ,85018,8.3,,,, +US-AZ-85019,US,AZ,85019,8.3,,,, +US-AZ-85020,US,AZ,85020,8.3,,,, +US-AZ-85021,US,AZ,85021,8.3,,,, +US-AZ-85022,US,AZ,85022,8.3,,,, +US-AZ-85023,US,AZ,85023,8.3,,,, +US-AZ-85024,US,AZ,85024,8.3,,,, +US-AZ-85025,US,AZ,85025,8.3,,,, +US-AZ-85026,US,AZ,85026,8.3,,,, +US-AZ-85027,US,AZ,85027,8.3,,,, +US-AZ-85028,US,AZ,85028,8.3,,,, +US-AZ-85029,US,AZ,85029,8.3,,,, +US-AZ-85030,US,AZ,85030,8.3,,,, +US-AZ-85031,US,AZ,85031,8.3,,,, +US-AZ-85032,US,AZ,85032,8.3,,,, +US-AZ-85033,US,AZ,85033,8.3,,,, +US-AZ-85034,US,AZ,85034,8.3,,,, +US-AZ-85035,US,AZ,85035,8.3,,,, +US-AZ-85036,US,AZ,85036,8.3,,,, +US-AZ-85037,US,AZ,85037,8.3,,,, +US-AZ-85038,US,AZ,85038,8.3,,,, +US-AZ-85039,US,AZ,85039,6.3,,,, +US-AZ-85040,US,AZ,85040,8.3,,,, +US-AZ-85041,US,AZ,85041,8.3,,,, +US-AZ-85042,US,AZ,85042,8.3,,,, +US-AZ-85043,US,AZ,85043,8.3,,,, +US-AZ-85044,US,AZ,85044,8.3,,,, +US-AZ-85045,US,AZ,85045,8.3,,,, +US-AZ-85046,US,AZ,85046,8.3,,,, +US-AZ-85048,US,AZ,85048,8.3,,,, +US-AZ-85050,US,AZ,85050,8.3,,,, +US-AZ-85051,US,AZ,85051,8.3,,,, +US-AZ-85053,US,AZ,85053,8.3,,,, +US-AZ-85054,US,AZ,85054,8.3,,,, +US-AZ-85060,US,AZ,85060,8.3,,,, +US-AZ-85061,US,AZ,85061,8.3,,,, +US-AZ-85062,US,AZ,85062,8.3,,,, +US-AZ-85063,US,AZ,85063,8.3,,,, +US-AZ-85064,US,AZ,85064,8.3,,,, +US-AZ-85065,US,AZ,85065,8.3,,,, +US-AZ-85066,US,AZ,85066,8.3,,,, +US-AZ-85067,US,AZ,85067,8.3,,,, +US-AZ-85068,US,AZ,85068,8.3,,,, +US-AZ-85069,US,AZ,85069,8.3,,,, +US-AZ-85070,US,AZ,85070,8.3,,,, +US-AZ-85071,US,AZ,85071,8.3,,,, +US-AZ-85072,US,AZ,85072,8.3,,,, +US-AZ-85073,US,AZ,85073,6.3,,,, +US-AZ-85074,US,AZ,85074,8.3,,,, +US-AZ-85075,US,AZ,85075,8.3,,,, +US-AZ-85076,US,AZ,85076,8.3,,,, +US-AZ-85078,US,AZ,85078,8.3,,,, +US-AZ-85079,US,AZ,85079,8.3,,,, +US-AZ-85080,US,AZ,85080,8.3,,,, +US-AZ-85082,US,AZ,85082,8.3,,,, +US-AZ-85083,US,AZ,85083,8.3,,,, +US-AZ-85085,US,AZ,85085,8.3,,,, +US-AZ-85086,US,AZ,85086,6.3,,,, +US-AZ-85087,US,AZ,85087,6.3,,,, +US-AZ-85097,US,AZ,85097,8.3,,,, +US-AZ-85098,US,AZ,85098,8.3,,,, +US-AZ-85117,US,AZ,85117,8.9,,,, +US-AZ-85118,US,AZ,85118,6.7,,,, +US-AZ-85119,US,AZ,85119,8.9,,,, +US-AZ-85120,US,AZ,85120,8.9,,,, +US-AZ-85121,US,AZ,85121,6.7,,,, +US-AZ-85122,US,AZ,85122,8.5,,,, +US-AZ-85123,US,AZ,85123,8.5,,,, +US-AZ-85127,US,AZ,85127,8.55,,,, +US-AZ-85128,US,AZ,85128,9.7,,,, +US-AZ-85130,US,AZ,85130,8.5,,,, +US-AZ-85131,US,AZ,85131,9.7,,,, +US-AZ-85132,US,AZ,85132,6.7,,,, +US-AZ-85135,US,AZ,85135,9.6,,,, +US-AZ-85137,US,AZ,85137,6.7,,,, +US-AZ-85138,US,AZ,85138,8.7,,,, +US-AZ-85139,US,AZ,85139,6.7,,,, +US-AZ-85140,US,AZ,85140,6.7,,,, +US-AZ-85141,US,AZ,85141,6.7,,,, +US-AZ-85142,US,AZ,85142,8.55,,,, +US-AZ-85143,US,AZ,85143,6.7,,,, +US-AZ-85145,US,AZ,85145,6.7,,,, +US-AZ-85147,US,AZ,85147,6.7,,,, +US-AZ-85172,US,AZ,85172,6.7,,,, +US-AZ-85173,US,AZ,85173,8.7,,,, +US-AZ-85178,US,AZ,85178,8.9,,,, +US-AZ-85190,US,AZ,85190,8.9,,,, +US-AZ-85191,US,AZ,85191,6.7,,,, +US-AZ-85192,US,AZ,85192,6.7,,,, +US-AZ-85193,US,AZ,85193,6.7,,,, +US-AZ-85194,US,AZ,85194,6.7,,,, +US-AZ-85201,US,AZ,85201,8.05,,,, +US-AZ-85202,US,AZ,85202,8.05,,,, +US-AZ-85203,US,AZ,85203,8.05,,,, +US-AZ-85204,US,AZ,85204,8.05,,,, +US-AZ-85205,US,AZ,85205,8.05,,,, +US-AZ-85206,US,AZ,85206,8.05,,,, +US-AZ-85207,US,AZ,85207,8.05,,,, +US-AZ-85208,US,AZ,85208,8.05,,,, +US-AZ-85209,US,AZ,85209,8.05,,,, +US-AZ-85210,US,AZ,85210,8.05,,,, +US-AZ-85211,US,AZ,85211,8.05,,,, +US-AZ-85212,US,AZ,85212,8.05,,,, +US-AZ-85213,US,AZ,85213,8.05,,,, +US-AZ-85214,US,AZ,85214,8.05,,,, +US-AZ-85215,US,AZ,85215,8.05,,,, +US-AZ-85216,US,AZ,85216,8.05,,,, +US-AZ-85224,US,AZ,85224,7.8,,,, +US-AZ-85225,US,AZ,85225,7.8,,,, +US-AZ-85226,US,AZ,85226,7.8,,,, +US-AZ-85233,US,AZ,85233,7.8,,,, +US-AZ-85234,US,AZ,85234,7.8,,,, +US-AZ-85236,US,AZ,85236,7.8,,,, +US-AZ-85244,US,AZ,85244,7.8,,,, +US-AZ-85246,US,AZ,85246,7.8,,,, +US-AZ-85248,US,AZ,85248,7.8,,,, +US-AZ-85249,US,AZ,85249,7.8,,,, +US-AZ-85250,US,AZ,85250,7.95,,,, +US-AZ-85251,US,AZ,85251,7.95,,,, +US-AZ-85252,US,AZ,85252,7.95,,,, +US-AZ-85253,US,AZ,85253,8.8,,,, +US-AZ-85254,US,AZ,85254,8.3,,,, +US-AZ-85255,US,AZ,85255,7.95,,,, +US-AZ-85256,US,AZ,85256,7.95,,,, +US-AZ-85257,US,AZ,85257,7.95,,,, +US-AZ-85258,US,AZ,85258,7.95,,,, +US-AZ-85259,US,AZ,85259,7.95,,,, +US-AZ-85260,US,AZ,85260,7.95,,,, +US-AZ-85261,US,AZ,85261,7.95,,,, +US-AZ-85262,US,AZ,85262,7.95,,,, +US-AZ-85263,US,AZ,85263,6.3,,,, +US-AZ-85264,US,AZ,85264,6.3,,,, +US-AZ-85266,US,AZ,85266,7.95,,,, +US-AZ-85267,US,AZ,85267,7.95,,,, +US-AZ-85268,US,AZ,85268,8.9,,,, +US-AZ-85269,US,AZ,85269,8.9,,,, +US-AZ-85271,US,AZ,85271,7.95,,,, +US-AZ-85274,US,AZ,85274,8.05,,,, +US-AZ-85275,US,AZ,85275,8.05,,,, +US-AZ-85277,US,AZ,85277,8.05,,,, +US-AZ-85280,US,AZ,85280,8.3,,,, +US-AZ-85281,US,AZ,85281,8.3,,,, +US-AZ-85282,US,AZ,85282,8.3,,,, +US-AZ-85283,US,AZ,85283,8.3,,,, +US-AZ-85284,US,AZ,85284,8.3,,,, +US-AZ-85285,US,AZ,85285,8.3,,,, +US-AZ-85286,US,AZ,85286,7.8,,,, +US-AZ-85287,US,AZ,85287,8.3,,,, +US-AZ-85295,US,AZ,85295,7.8,,,, +US-AZ-85296,US,AZ,85296,7.8,,,, +US-AZ-85297,US,AZ,85297,7.8,,,, +US-AZ-85298,US,AZ,85298,7.8,,,, +US-AZ-85299,US,AZ,85299,7.8,,,, +US-AZ-85301,US,AZ,85301,9.2,,,, +US-AZ-85302,US,AZ,85302,9.2,,,, +US-AZ-85303,US,AZ,85303,9.2,,,, +US-AZ-85304,US,AZ,85304,9.2,,,, +US-AZ-85305,US,AZ,85305,9.2,,,, +US-AZ-85306,US,AZ,85306,9.2,,,, +US-AZ-85307,US,AZ,85307,9.2,,,, +US-AZ-85308,US,AZ,85308,9.2,,,, +US-AZ-85309,US,AZ,85309,9.2,,,, +US-AZ-85310,US,AZ,85310,8.3,,,, +US-AZ-85311,US,AZ,85311,9.2,,,, +US-AZ-85312,US,AZ,85312,9.2,,,, +US-AZ-85318,US,AZ,85318,9.2,,,, +US-AZ-85320,US,AZ,85320,6.3,,,, +US-AZ-85321,US,AZ,85321,6.1,,,, +US-AZ-85322,US,AZ,85322,6.3,,,, +US-AZ-85323,US,AZ,85323,8.8,,,, +US-AZ-85324,US,AZ,85324,6.35,,,, +US-AZ-85325,US,AZ,85325,7.6,,,, +US-AZ-85326,US,AZ,85326,9.3,,,, +US-AZ-85327,US,AZ,85327,9.3,,,, +US-AZ-85328,US,AZ,85328,7.6,,,, +US-AZ-85329,US,AZ,85329,8.8,,,, +US-AZ-85331,US,AZ,85331,8.3,,,, +US-AZ-85332,US,AZ,85332,6.35,,,, +US-AZ-85333,US,AZ,85333,6.712,,,, +US-AZ-85334,US,AZ,85334,7.6,,,, +US-AZ-85335,US,AZ,85335,9.3,,,, +US-AZ-85336,US,AZ,85336,10.712,,,, +US-AZ-85337,US,AZ,85337,9.3,,,, +US-AZ-85338,US,AZ,85338,8.8,,,, +US-AZ-85339,US,AZ,85339,8.3,,,, +US-AZ-85340,US,AZ,85340,6.3,,,, +US-AZ-85341,US,AZ,85341,6.1,,,, +US-AZ-85342,US,AZ,85342,6.3,,,, +US-AZ-85343,US,AZ,85343,9.3,,,, +US-AZ-85344,US,AZ,85344,7.6,,,, +US-AZ-85345,US,AZ,85345,8.1,,,, +US-AZ-85346,US,AZ,85346,10.1,,,, +US-AZ-85347,US,AZ,85347,6.712,,,, +US-AZ-85348,US,AZ,85348,7.6,,,, +US-AZ-85349,US,AZ,85349,10.712,,,, +US-AZ-85350,US,AZ,85350,6.712,,,, +US-AZ-85351,US,AZ,85351,6.3,,,, +US-AZ-85352,US,AZ,85352,6.712,,,, +US-AZ-85353,US,AZ,85353,8.3,,,, +US-AZ-85354,US,AZ,85354,6.3,,,, +US-AZ-85355,US,AZ,85355,6.3,,,, +US-AZ-85356,US,AZ,85356,9.212,,,, +US-AZ-85357,US,AZ,85357,7.6,,,, +US-AZ-85358,US,AZ,85358,8.5,,,, +US-AZ-85359,US,AZ,85359,10.1,,,, +US-AZ-85360,US,AZ,85360,5.85,,,, +US-AZ-85361,US,AZ,85361,6.3,,,, +US-AZ-85362,US,AZ,85362,6.35,,,, +US-AZ-85363,US,AZ,85363,9.3,,,, +US-AZ-85364,US,AZ,85364,8.412,,,, +US-AZ-85365,US,AZ,85365,8.412,,,, +US-AZ-85366,US,AZ,85366,8.412,,,, +US-AZ-85367,US,AZ,85367,6.712,,,, +US-AZ-85369,US,AZ,85369,8.412,,,, +US-AZ-85371,US,AZ,85371,9.6,,,, +US-AZ-85372,US,AZ,85372,6.3,,,, +US-AZ-85373,US,AZ,85373,6.3,,,, +US-AZ-85374,US,AZ,85374,8.5,,,, +US-AZ-85375,US,AZ,85375,6.3,,,, +US-AZ-85376,US,AZ,85376,6.3,,,, +US-AZ-85377,US,AZ,85377,9.3,,,, +US-AZ-85378,US,AZ,85378,8.5,,,, +US-AZ-85379,US,AZ,85379,8.5,,,, +US-AZ-85380,US,AZ,85380,8.1,,,, +US-AZ-85381,US,AZ,85381,8.1,,,, +US-AZ-85382,US,AZ,85382,8.1,,,, +US-AZ-85383,US,AZ,85383,8.1,,,, +US-AZ-85385,US,AZ,85385,8.1,,,, +US-AZ-85387,US,AZ,85387,8.5,,,, +US-AZ-85388,US,AZ,85388,8.5,,,, +US-AZ-85390,US,AZ,85390,8.5,,,, +US-AZ-85392,US,AZ,85392,8.8,,,, +US-AZ-85395,US,AZ,85395,8.8,,,, +US-AZ-85396,US,AZ,85396,9.3,,,, +US-AZ-85501,US,AZ,85501,8.6,,,, +US-AZ-85502,US,AZ,85502,8.6,,,, +US-AZ-85530,US,AZ,85530,6.1,,,, +US-AZ-85531,US,AZ,85531,6.1,,,, +US-AZ-85532,US,AZ,85532,6.6,,,, +US-AZ-85533,US,AZ,85533,6.1,,,, +US-AZ-85534,US,AZ,85534,6.1,,,, +US-AZ-85535,US,AZ,85535,8.1,,,, +US-AZ-85536,US,AZ,85536,6.1,,,, +US-AZ-85539,US,AZ,85539,9.1,,,, +US-AZ-85540,US,AZ,85540,9.1,,,, +US-AZ-85541,US,AZ,85541,8.72,,,, +US-AZ-85542,US,AZ,85542,6.6,,,, +US-AZ-85543,US,AZ,85543,8.1,,,, +US-AZ-85544,US,AZ,85544,6.6,,,, +US-AZ-85545,US,AZ,85545,6.6,,,, +US-AZ-85546,US,AZ,85546,8.6,,,, +US-AZ-85547,US,AZ,85547,8.72,,,, +US-AZ-85548,US,AZ,85548,8.6,,,, +US-AZ-85550,US,AZ,85550,6.6,,,, +US-AZ-85551,US,AZ,85551,6.1,,,, +US-AZ-85552,US,AZ,85552,8.6,,,, +US-AZ-85553,US,AZ,85553,6.6,,,, +US-AZ-85554,US,AZ,85554,6.6,,,, +US-AZ-85601,US,AZ,85601,6.1,,,, +US-AZ-85602,US,AZ,85602,8.6,,,, +US-AZ-85603,US,AZ,85603,8.6,,,, +US-AZ-85605,US,AZ,85605,6.1,,,, +US-AZ-85606,US,AZ,85606,6.1,,,, +US-AZ-85607,US,AZ,85607,8.9,,,, +US-AZ-85608,US,AZ,85608,8.9,,,, +US-AZ-85609,US,AZ,85609,6.1,,,, +US-AZ-85610,US,AZ,85610,6.1,,,, +US-AZ-85611,US,AZ,85611,6.6,,,, +US-AZ-85613,US,AZ,85613,7.85,,,, +US-AZ-85614,US,AZ,85614,6.1,,,, +US-AZ-85615,US,AZ,85615,6.1,,,, +US-AZ-85616,US,AZ,85616,6.1,,,, +US-AZ-85617,US,AZ,85617,6.1,,,, +US-AZ-85618,US,AZ,85618,8.7,,,, +US-AZ-85619,US,AZ,85619,6.1,,,, +US-AZ-85620,US,AZ,85620,6.1,,,, +US-AZ-85621,US,AZ,85621,8.6,,,, +US-AZ-85622,US,AZ,85622,6.1,,,, +US-AZ-85623,US,AZ,85623,6.7,,,, +US-AZ-85624,US,AZ,85624,6.6,,,, +US-AZ-85625,US,AZ,85625,6.1,,,, +US-AZ-85626,US,AZ,85626,6.1,,,, +US-AZ-85627,US,AZ,85627,6.1,,,, +US-AZ-85628,US,AZ,85628,8.6,,,, +US-AZ-85629,US,AZ,85629,8.1,,,, +US-AZ-85630,US,AZ,85630,6.1,,,, +US-AZ-85631,US,AZ,85631,6.7,,,, +US-AZ-85632,US,AZ,85632,6.1,,,, +US-AZ-85633,US,AZ,85633,6.1,,,, +US-AZ-85634,US,AZ,85634,6.1,,,, +US-AZ-85635,US,AZ,85635,7.85,,,, +US-AZ-85636,US,AZ,85636,7.85,,,, +US-AZ-85637,US,AZ,85637,6.1,,,, +US-AZ-85638,US,AZ,85638,9.6,,,, +US-AZ-85639,US,AZ,85639,6.1,,,, +US-AZ-85640,US,AZ,85640,6.6,,,, +US-AZ-85641,US,AZ,85641,6.1,,,, +US-AZ-85643,US,AZ,85643,6.1,,,, +US-AZ-85644,US,AZ,85644,9.1,,,, +US-AZ-85645,US,AZ,85645,6.1,,,, +US-AZ-85646,US,AZ,85646,6.6,,,, +US-AZ-85648,US,AZ,85648,6.6,,,, +US-AZ-85650,US,AZ,85650,6.1,,,, +US-AZ-85652,US,AZ,85652,8.1,,,, +US-AZ-85653,US,AZ,85653,6.1,,,, +US-AZ-85654,US,AZ,85654,8.1,,,, +US-AZ-85655,US,AZ,85655,8.9,,,, +US-AZ-85658,US,AZ,85658,8.1,,,, +US-AZ-85662,US,AZ,85662,8.6,,,, +US-AZ-85670,US,AZ,85670,7.85,,,, +US-AZ-85671,US,AZ,85671,6.1,,,, +US-AZ-85701,US,AZ,85701,8.1,,,, +US-AZ-85702,US,AZ,85702,8.1,,,, +US-AZ-85703,US,AZ,85703,8.1,,,, +US-AZ-85704,US,AZ,85704,6.1,,,, +US-AZ-85705,US,AZ,85705,8.1,,,, +US-AZ-85706,US,AZ,85706,8.1,,,, +US-AZ-85707,US,AZ,85707,8.1,,,, +US-AZ-85708,US,AZ,85708,8.1,,,, +US-AZ-85709,US,AZ,85709,8.1,,,, +US-AZ-85710,US,AZ,85710,8.1,,,, +US-AZ-85711,US,AZ,85711,8.1,,,, +US-AZ-85712,US,AZ,85712,8.1,,,, +US-AZ-85713,US,AZ,85713,8.1,,,, +US-AZ-85714,US,AZ,85714,8.1,,,, +US-AZ-85715,US,AZ,85715,8.1,,,, +US-AZ-85716,US,AZ,85716,8.1,,,, +US-AZ-85717,US,AZ,85717,8.1,,,, +US-AZ-85718,US,AZ,85718,6.1,,,, +US-AZ-85719,US,AZ,85719,8.1,,,, +US-AZ-85720,US,AZ,85720,6.1,,,, +US-AZ-85721,US,AZ,85721,8.1,,,, +US-AZ-85722,US,AZ,85722,8.1,,,, +US-AZ-85723,US,AZ,85723,8.1,,,, +US-AZ-85724,US,AZ,85724,8.1,,,, +US-AZ-85725,US,AZ,85725,8.6,,,, +US-AZ-85726,US,AZ,85726,8.1,,,, +US-AZ-85728,US,AZ,85728,8.1,,,, +US-AZ-85730,US,AZ,85730,8.1,,,, +US-AZ-85731,US,AZ,85731,8.1,,,, +US-AZ-85732,US,AZ,85732,8.1,,,, +US-AZ-85733,US,AZ,85733,8.1,,,, +US-AZ-85734,US,AZ,85734,8.1,,,, +US-AZ-85735,US,AZ,85735,6.1,,,, +US-AZ-85736,US,AZ,85736,6.1,,,, +US-AZ-85737,US,AZ,85737,8.1,,,, +US-AZ-85738,US,AZ,85738,6.1,,,, +US-AZ-85739,US,AZ,85739,6.7,,,, +US-AZ-85740,US,AZ,85740,6.1,,,, +US-AZ-85741,US,AZ,85741,6.1,,,, +US-AZ-85742,US,AZ,85742,6.1,,,, +US-AZ-85743,US,AZ,85743,6.1,,,, +US-AZ-85744,US,AZ,85744,8.1,,,, +US-AZ-85745,US,AZ,85745,8.1,,,, +US-AZ-85746,US,AZ,85746,6.1,,,, +US-AZ-85747,US,AZ,85747,8.1,,,, +US-AZ-85748,US,AZ,85748,8.1,,,, +US-AZ-85749,US,AZ,85749,6.1,,,, +US-AZ-85750,US,AZ,85750,6.1,,,, +US-AZ-85751,US,AZ,85751,8.1,,,, +US-AZ-85752,US,AZ,85752,6.1,,,, +US-AZ-85754,US,AZ,85754,8.1,,,, +US-AZ-85755,US,AZ,85755,8.1,,,, +US-AZ-85756,US,AZ,85756,6.1,,,, +US-AZ-85757,US,AZ,85757,6.1,,,, +US-AZ-85775,US,AZ,85775,6.1,,,, +US-AZ-85901,US,AZ,85901,8.1,,,, +US-AZ-85902,US,AZ,85902,8.1,,,, +US-AZ-85911,US,AZ,85911,8.1,,,, +US-AZ-85912,US,AZ,85912,8.1,,,, +US-AZ-85920,US,AZ,85920,6.1,,,, +US-AZ-85922,US,AZ,85922,6.1,,,, +US-AZ-85923,US,AZ,85923,6.1,,,, +US-AZ-85924,US,AZ,85924,6.1,,,, +US-AZ-85925,US,AZ,85925,9.1,,,, +US-AZ-85926,US,AZ,85926,6.1,,,, +US-AZ-85927,US,AZ,85927,6.1,,,, +US-AZ-85928,US,AZ,85928,6.1,,,, +US-AZ-85929,US,AZ,85929,6.1,,,, +US-AZ-85930,US,AZ,85930,6.1,,,, +US-AZ-85931,US,AZ,85931,6.1,,,, +US-AZ-85932,US,AZ,85932,6.1,,,, +US-AZ-85933,US,AZ,85933,6.1,,,, +US-AZ-85934,US,AZ,85934,6.1,,,, +US-AZ-85935,US,AZ,85935,6.1,,,, +US-AZ-85936,US,AZ,85936,9.1,,,, +US-AZ-85937,US,AZ,85937,8.1,,,, +US-AZ-85938,US,AZ,85938,9.1,,,, +US-AZ-85939,US,AZ,85939,8.1,,,, +US-AZ-85940,US,AZ,85940,6.1,,,, +US-AZ-85941,US,AZ,85941,6.1,,,, +US-AZ-85942,US,AZ,85942,8.1,,,, +US-AZ-86001,US,AZ,86001,8.446,,,, +US-AZ-86002,US,AZ,86002,8.446,,,, +US-AZ-86003,US,AZ,86003,8.446,,,, +US-AZ-86004,US,AZ,86004,8.446,,,, +US-AZ-86005,US,AZ,86005,8.446,,,, +US-AZ-86011,US,AZ,86011,8.446,,,, +US-AZ-86015,US,AZ,86015,8.446,,,, +US-AZ-86016,US,AZ,86016,6.725,,,, +US-AZ-86017,US,AZ,86017,8.446,,,, +US-AZ-86018,US,AZ,86018,8.446,,,, +US-AZ-86020,US,AZ,86020,6.725,,,, +US-AZ-86021,US,AZ,86021,7.85,,,, +US-AZ-86022,US,AZ,86022,5.85,,,, +US-AZ-86023,US,AZ,86023,6.725,,,, +US-AZ-86024,US,AZ,86024,6.725,,,, +US-AZ-86025,US,AZ,86025,9.1,,,, +US-AZ-86028,US,AZ,86028,8.446,,,, +US-AZ-86029,US,AZ,86029,8.446,,,, +US-AZ-86030,US,AZ,86030,6.1,,,, +US-AZ-86031,US,AZ,86031,8.446,,,, +US-AZ-86032,US,AZ,86032,6.1,,,, +US-AZ-86033,US,AZ,86033,6.1,,,, +US-AZ-86034,US,AZ,86034,6.1,,,, +US-AZ-86035,US,AZ,86035,8.446,,,, +US-AZ-86036,US,AZ,86036,9.725,,,, +US-AZ-86038,US,AZ,86038,6.725,,,, +US-AZ-86039,US,AZ,86039,6.1,,,, +US-AZ-86040,US,AZ,86040,9.725,,,, +US-AZ-86042,US,AZ,86042,6.1,,,, +US-AZ-86043,US,AZ,86043,6.1,,,, +US-AZ-86044,US,AZ,86044,6.725,,,, +US-AZ-86045,US,AZ,86045,6.725,,,, +US-AZ-86046,US,AZ,86046,6.725,,,, +US-AZ-86047,US,AZ,86047,9.1,,,, +US-AZ-86052,US,AZ,86052,5.85,,,, +US-AZ-86053,US,AZ,86053,6.725,,,, +US-AZ-86054,US,AZ,86054,6.725,,,, +US-AZ-86301,US,AZ,86301,8.35,,,, +US-AZ-86302,US,AZ,86302,8.35,,,, +US-AZ-86303,US,AZ,86303,8.35,,,, +US-AZ-86304,US,AZ,86304,8.35,,,, +US-AZ-86305,US,AZ,86305,6.35,,,, +US-AZ-86312,US,AZ,86312,8.68,,,, +US-AZ-86313,US,AZ,86313,8.35,,,, +US-AZ-86314,US,AZ,86314,8.68,,,, +US-AZ-86315,US,AZ,86315,6.35,,,, +US-AZ-86320,US,AZ,86320,6.35,,,, +US-AZ-86321,US,AZ,86321,6.35,,,, +US-AZ-86322,US,AZ,86322,9.35,,,, +US-AZ-86323,US,AZ,86323,10.35,,,, +US-AZ-86324,US,AZ,86324,9.35,,,, +US-AZ-86325,US,AZ,86325,6.35,,,, +US-AZ-86326,US,AZ,86326,9.35,,,, +US-AZ-86327,US,AZ,86327,6.35,,,, +US-AZ-86329,US,AZ,86329,8.35,,,, +US-AZ-86331,US,AZ,86331,9.85,,,, +US-AZ-86332,US,AZ,86332,6.35,,,, +US-AZ-86333,US,AZ,86333,6.35,,,, +US-AZ-86334,US,AZ,86334,6.35,,,, +US-AZ-86335,US,AZ,86335,6.35,,,, +US-AZ-86336,US,AZ,86336,9.35,,,, +US-AZ-86337,US,AZ,86337,6.35,,,, +US-AZ-86338,US,AZ,86338,6.35,,,, +US-AZ-86339,US,AZ,86339,9.725,,,, +US-AZ-86340,US,AZ,86340,9.35,,,, +US-AZ-86341,US,AZ,86341,6.35,,,, +US-AZ-86342,US,AZ,86342,6.35,,,, +US-AZ-86343,US,AZ,86343,6.35,,,, +US-AZ-86351,US,AZ,86351,6.35,,,, +US-AZ-86401,US,AZ,86401,8.35,,,, +US-AZ-86402,US,AZ,86402,8.35,,,, +US-AZ-86403,US,AZ,86403,7.85,,,, +US-AZ-86404,US,AZ,86404,7.85,,,, +US-AZ-86405,US,AZ,86405,7.85,,,, +US-AZ-86406,US,AZ,86406,7.85,,,, +US-AZ-86409,US,AZ,86409,5.85,,,, +US-AZ-86411,US,AZ,86411,5.85,,,, +US-AZ-86412,US,AZ,86412,5.85,,,, +US-AZ-86413,US,AZ,86413,5.85,,,, +US-AZ-86426,US,AZ,86426,5.85,,,, +US-AZ-86427,US,AZ,86427,7.85,,,, +US-AZ-86429,US,AZ,86429,7.85,,,, +US-AZ-86430,US,AZ,86430,7.85,,,, +US-AZ-86431,US,AZ,86431,5.85,,,, +US-AZ-86432,US,AZ,86432,5.85,,,, +US-AZ-86433,US,AZ,86433,5.85,,,, +US-AZ-86434,US,AZ,86434,5.85,,,, +US-AZ-86435,US,AZ,86435,6.725,,,, +US-AZ-86436,US,AZ,86436,5.85,,,, +US-AZ-86437,US,AZ,86437,5.85,,,, +US-AZ-86438,US,AZ,86438,5.85,,,, +US-AZ-86439,US,AZ,86439,7.85,,,, +US-AZ-86440,US,AZ,86440,5.85,,,, +US-AZ-86441,US,AZ,86441,5.85,,,, +US-AZ-86442,US,AZ,86442,7.85,,,, +US-AZ-86443,US,AZ,86443,8.35,,,, +US-AZ-86444,US,AZ,86444,5.85,,,, +US-AZ-86445,US,AZ,86445,5.85,,,, +US-AZ-86446,US,AZ,86446,5.85,,,, +US-AZ-86502,US,AZ,86502,6.1,,,, +US-AZ-86503,US,AZ,86503,6.1,,,, +US-AZ-86504,US,AZ,86504,6.1,,,, +US-AZ-86505,US,AZ,86505,6.1,,,, +US-AZ-86506,US,AZ,86506,6.1,,,, +US-AZ-86507,US,AZ,86507,6.1,,,, +US-AZ-86508,US,AZ,86508,6.1,,,, +US-AZ-86510,US,AZ,86510,6.1,,,, +US-AZ-86511,US,AZ,86511,6.1,,,, +US-AZ-86512,US,AZ,86512,6.1,,,, +US-AZ-86514,US,AZ,86514,6.1,,,, +US-AZ-86515,US,AZ,86515,6.1,,,, +US-AZ-86520,US,AZ,86520,6.1,,,, +US-AZ-86535,US,AZ,86535,6.1,,,, +US-AZ-86538,US,AZ,86538,6.1,,,, +US-AZ-86540,US,AZ,86540,6.1,,,, +US-AZ-86545,US,AZ,86545,6.1,,,, +US-AZ-86547,US,AZ,86547,6.1,,,, +US-AZ-86556,US,AZ,86556,6.1,,,, +US-CA-90001,US,CA,90001,9,,,, +US-CA-90002,US,CA,90002,9,,,, +US-CA-90003,US,CA,90003,9,,,, +US-CA-90004,US,CA,90004,9,,,, +US-CA-90005,US,CA,90005,9,,,, +US-CA-90006,US,CA,90006,9,,,, +US-CA-90007,US,CA,90007,9,,,, +US-CA-90008,US,CA,90008,9,,,, +US-CA-90009,US,CA,90009,9,,,, +US-CA-90010,US,CA,90010,9,,,, +US-CA-90011,US,CA,90011,9,,,, +US-CA-90012,US,CA,90012,9,,,, +US-CA-90013,US,CA,90013,9,,,, +US-CA-90014,US,CA,90014,9,,,, +US-CA-90015,US,CA,90015,9,,,, +US-CA-90016,US,CA,90016,9,,,, +US-CA-90017,US,CA,90017,9,,,, +US-CA-90018,US,CA,90018,9,,,, +US-CA-90019,US,CA,90019,9,,,, +US-CA-90020,US,CA,90020,9,,,, +US-CA-90021,US,CA,90021,9,,,, +US-CA-90022,US,CA,90022,9,,,, +US-CA-90023,US,CA,90023,9,,,, +US-CA-90024,US,CA,90024,9,,,, +US-CA-90025,US,CA,90025,9,,,, +US-CA-90026,US,CA,90026,9,,,, +US-CA-90027,US,CA,90027,9,,,, +US-CA-90028,US,CA,90028,9,,,, +US-CA-90029,US,CA,90029,9,,,, +US-CA-90030,US,CA,90030,9,,,, +US-CA-90031,US,CA,90031,9,,,, +US-CA-90032,US,CA,90032,9,,,, +US-CA-90033,US,CA,90033,9,,,, +US-CA-90034,US,CA,90034,9,,,, +US-CA-90035,US,CA,90035,9,,,, +US-CA-90036,US,CA,90036,9,,,, +US-CA-90037,US,CA,90037,9,,,, +US-CA-90038,US,CA,90038,9,,,, +US-CA-90039,US,CA,90039,9,,,, +US-CA-90040,US,CA,90040,9.5,,,, +US-CA-90041,US,CA,90041,9,,,, +US-CA-90042,US,CA,90042,9,,,, +US-CA-90043,US,CA,90043,9,,,, +US-CA-90044,US,CA,90044,9,,,, +US-CA-90045,US,CA,90045,9,,,, +US-CA-90046,US,CA,90046,9,,,, +US-CA-90047,US,CA,90047,9,,,, +US-CA-90048,US,CA,90048,9,,,, +US-CA-90049,US,CA,90049,9,,,, +US-CA-90050,US,CA,90050,9,,,, +US-CA-90051,US,CA,90051,9,,,, +US-CA-90052,US,CA,90052,9,,,, +US-CA-90053,US,CA,90053,9,,,, +US-CA-90054,US,CA,90054,9,,,, +US-CA-90055,US,CA,90055,9,,,, +US-CA-90056,US,CA,90056,9,,,, +US-CA-90057,US,CA,90057,9,,,, +US-CA-90058,US,CA,90058,9,,,, +US-CA-90059,US,CA,90059,9,,,, +US-CA-90060,US,CA,90060,9,,,, +US-CA-90061,US,CA,90061,9,,,, +US-CA-90062,US,CA,90062,9,,,, +US-CA-90063,US,CA,90063,9,,,, +US-CA-90064,US,CA,90064,9,,,, +US-CA-90065,US,CA,90065,9,,,, +US-CA-90066,US,CA,90066,9,,,, +US-CA-90067,US,CA,90067,9,,,, +US-CA-90068,US,CA,90068,9,,,, +US-CA-90069,US,CA,90069,9,,,, +US-CA-90070,US,CA,90070,9,,,, +US-CA-90071,US,CA,90071,9,,,, +US-CA-90072,US,CA,90072,9,,,, +US-CA-90073,US,CA,90073,9,,,, +US-CA-90074,US,CA,90074,9,,,, +US-CA-90075,US,CA,90075,9,,,, +US-CA-90076,US,CA,90076,9,,,, +US-CA-90077,US,CA,90077,9,,,, +US-CA-90078,US,CA,90078,9,,,, +US-CA-90079,US,CA,90079,9,,,, +US-CA-90080,US,CA,90080,9,,,, +US-CA-90081,US,CA,90081,9,,,, +US-CA-90082,US,CA,90082,9,,,, +US-CA-90083,US,CA,90083,9,,,, +US-CA-90084,US,CA,90084,9,,,, +US-CA-90086,US,CA,90086,9,,,, +US-CA-90087,US,CA,90087,9,,,, +US-CA-90088,US,CA,90088,9,,,, +US-CA-90089,US,CA,90089,9,,,, +US-CA-90090,US,CA,90090,9,,,, +US-CA-90091,US,CA,90091,9,,,, +US-CA-90093,US,CA,90093,9,,,, +US-CA-90094,US,CA,90094,9,,,, +US-CA-90095,US,CA,90095,9,,,, +US-CA-90096,US,CA,90096,9,,,, +US-CA-90099,US,CA,90099,9,,,, +US-CA-90101,US,CA,90101,9,,,, +US-CA-90189,US,CA,90189,9,,,, +US-CA-90201,US,CA,90201,9,,,, +US-CA-90202,US,CA,90202,9,,,, +US-CA-90209,US,CA,90209,9,,,, +US-CA-90210,US,CA,90210,9,,,, +US-CA-90211,US,CA,90211,9,,,, +US-CA-90212,US,CA,90212,9,,,, +US-CA-90213,US,CA,90213,9,,,, +US-CA-90220,US,CA,90220,9,,,, +US-CA-90221,US,CA,90221,9,,,, +US-CA-90222,US,CA,90222,9,,,, +US-CA-90223,US,CA,90223,9,,,, +US-CA-90224,US,CA,90224,9,,,, +US-CA-90230,US,CA,90230,9.5,,,, +US-CA-90231,US,CA,90231,9.5,,,, +US-CA-90232,US,CA,90232,9.5,,,, +US-CA-90233,US,CA,90233,9.5,,,, +US-CA-90239,US,CA,90239,9,,,, +US-CA-90240,US,CA,90240,9,,,, +US-CA-90241,US,CA,90241,9,,,, +US-CA-90242,US,CA,90242,9,,,, +US-CA-90245,US,CA,90245,9,,,, +US-CA-90247,US,CA,90247,9,,,, +US-CA-90248,US,CA,90248,9,,,, +US-CA-90249,US,CA,90249,9,,,, +US-CA-90250,US,CA,90250,9,,,, +US-CA-90251,US,CA,90251,9,,,, +US-CA-90254,US,CA,90254,9,,,, +US-CA-90255,US,CA,90255,9,,,, +US-CA-90260,US,CA,90260,9,,,, +US-CA-90261,US,CA,90261,9,,,, +US-CA-90262,US,CA,90262,9,,,, +US-CA-90263,US,CA,90263,9,,,, +US-CA-90264,US,CA,90264,9,,,, +US-CA-90265,US,CA,90265,9,,,, +US-CA-90266,US,CA,90266,9,,,, +US-CA-90267,US,CA,90267,9,,,, +US-CA-90270,US,CA,90270,9,,,, +US-CA-90272,US,CA,90272,9,,,, +US-CA-90274,US,CA,90274,9,,,, +US-CA-90275,US,CA,90275,9,,,, +US-CA-90277,US,CA,90277,9,,,, +US-CA-90278,US,CA,90278,9,,,, +US-CA-90280,US,CA,90280,10,,,, +US-CA-90290,US,CA,90290,9,,,, +US-CA-90291,US,CA,90291,9,,,, +US-CA-90292,US,CA,90292,9,,,, +US-CA-90293,US,CA,90293,9,,,, +US-CA-90294,US,CA,90294,9,,,, +US-CA-90295,US,CA,90295,9,,,, +US-CA-90296,US,CA,90296,9,,,, +US-CA-90301,US,CA,90301,9.5,,,, +US-CA-90302,US,CA,90302,9.5,,,, +US-CA-90303,US,CA,90303,9.5,,,, +US-CA-90304,US,CA,90304,9,,,, +US-CA-90305,US,CA,90305,9.5,,,, +US-CA-90306,US,CA,90306,9.5,,,, +US-CA-90307,US,CA,90307,9.5,,,, +US-CA-90308,US,CA,90308,9.5,,,, +US-CA-90309,US,CA,90309,9.5,,,, +US-CA-90310,US,CA,90310,9.5,,,, +US-CA-90311,US,CA,90311,9.5,,,, +US-CA-90312,US,CA,90312,9,,,, +US-CA-90401,US,CA,90401,9.5,,,, +US-CA-90402,US,CA,90402,9.5,,,, +US-CA-90403,US,CA,90403,9.5,,,, +US-CA-90404,US,CA,90404,9.5,,,, +US-CA-90405,US,CA,90405,9.5,,,, +US-CA-90406,US,CA,90406,9.5,,,, +US-CA-90407,US,CA,90407,9.5,,,, +US-CA-90408,US,CA,90408,9.5,,,, +US-CA-90409,US,CA,90409,9.5,,,, +US-CA-90410,US,CA,90410,9.5,,,, +US-CA-90411,US,CA,90411,9.5,,,, +US-CA-90501,US,CA,90501,9,,,, +US-CA-90502,US,CA,90502,9,,,, +US-CA-90503,US,CA,90503,9,,,, +US-CA-90504,US,CA,90504,9,,,, +US-CA-90505,US,CA,90505,9,,,, +US-CA-90506,US,CA,90506,9,,,, +US-CA-90507,US,CA,90507,9,,,, +US-CA-90508,US,CA,90508,9,,,, +US-CA-90509,US,CA,90509,9,,,, +US-CA-90510,US,CA,90510,9,,,, +US-CA-90601,US,CA,90601,9,,,, +US-CA-90602,US,CA,90602,9,,,, +US-CA-90603,US,CA,90603,9,,,, +US-CA-90604,US,CA,90604,9,,,, +US-CA-90605,US,CA,90605,9,,,, +US-CA-90606,US,CA,90606,9,,,, +US-CA-90607,US,CA,90607,9,,,, +US-CA-90608,US,CA,90608,9,,,, +US-CA-90609,US,CA,90609,9,,,, +US-CA-90610,US,CA,90610,9,,,, +US-CA-90620,US,CA,90620,8,,,, +US-CA-90621,US,CA,90621,8,,,, +US-CA-90622,US,CA,90622,8,,,, +US-CA-90623,US,CA,90623,8,,,, +US-CA-90624,US,CA,90624,8,,,, +US-CA-90630,US,CA,90630,8,,,, +US-CA-90631,US,CA,90631,8.5,,,, +US-CA-90632,US,CA,90632,8.5,,,, +US-CA-90633,US,CA,90633,8.5,,,, +US-CA-90637,US,CA,90637,10,,,, +US-CA-90638,US,CA,90638,10,,,, +US-CA-90639,US,CA,90639,10,,,, +US-CA-90640,US,CA,90640,9,,,, +US-CA-90650,US,CA,90650,9,,,, +US-CA-90651,US,CA,90651,9,,,, +US-CA-90652,US,CA,90652,9,,,, +US-CA-90660,US,CA,90660,10,,,, +US-CA-90661,US,CA,90661,10,,,, +US-CA-90662,US,CA,90662,10,,,, +US-CA-90670,US,CA,90670,9,,,, +US-CA-90671,US,CA,90671,9,,,, +US-CA-90680,US,CA,90680,8,,,, +US-CA-90701,US,CA,90701,9,,,, +US-CA-90702,US,CA,90702,9,,,, +US-CA-90703,US,CA,90703,9,,,, +US-CA-90704,US,CA,90704,9.5,,,, +US-CA-90706,US,CA,90706,9,,,, +US-CA-90707,US,CA,90707,9,,,, +US-CA-90710,US,CA,90710,9,,,, +US-CA-90711,US,CA,90711,9,,,, +US-CA-90712,US,CA,90712,9,,,, +US-CA-90713,US,CA,90713,9,,,, +US-CA-90714,US,CA,90714,9,,,, +US-CA-90715,US,CA,90715,9,,,, +US-CA-90716,US,CA,90716,9,,,, +US-CA-90717,US,CA,90717,9,,,, +US-CA-90720,US,CA,90720,8,,,, +US-CA-90721,US,CA,90721,8,,,, +US-CA-90723,US,CA,90723,9,,,, +US-CA-90731,US,CA,90731,9,,,, +US-CA-90732,US,CA,90732,9,,,, +US-CA-90733,US,CA,90733,9,,,, +US-CA-90734,US,CA,90734,9,,,, +US-CA-90740,US,CA,90740,8,,,, +US-CA-90742,US,CA,90742,8,,,, +US-CA-90743,US,CA,90743,8,,,, +US-CA-90744,US,CA,90744,9,,,, +US-CA-90745,US,CA,90745,9,,,, +US-CA-90746,US,CA,90746,9,,,, +US-CA-90747,US,CA,90747,9,,,, +US-CA-90748,US,CA,90748,9,,,, +US-CA-90749,US,CA,90749,9,,,, +US-CA-90755,US,CA,90755,9,,,, +US-CA-90801,US,CA,90801,9,,,, +US-CA-90802,US,CA,90802,9,,,, +US-CA-90803,US,CA,90803,9,,,, +US-CA-90804,US,CA,90804,9,,,, +US-CA-90805,US,CA,90805,9,,,, +US-CA-90806,US,CA,90806,9,,,, +US-CA-90807,US,CA,90807,9,,,, +US-CA-90808,US,CA,90808,9,,,, +US-CA-90809,US,CA,90809,9,,,, +US-CA-90810,US,CA,90810,9,,,, +US-CA-90813,US,CA,90813,9,,,, +US-CA-90814,US,CA,90814,9,,,, +US-CA-90815,US,CA,90815,9,,,, +US-CA-90822,US,CA,90822,9,,,, +US-CA-90831,US,CA,90831,9,,,, +US-CA-90832,US,CA,90832,9,,,, +US-CA-90833,US,CA,90833,9,,,, +US-CA-90834,US,CA,90834,9,,,, +US-CA-90835,US,CA,90835,9,,,, +US-CA-90840,US,CA,90840,9,,,, +US-CA-90842,US,CA,90842,9,,,, +US-CA-90844,US,CA,90844,9,,,, +US-CA-90846,US,CA,90846,9,,,, +US-CA-90847,US,CA,90847,9,,,, +US-CA-90848,US,CA,90848,9,,,, +US-CA-90853,US,CA,90853,9,,,, +US-CA-90895,US,CA,90895,9,,,, +US-CA-90899,US,CA,90899,9,,,, +US-CA-91001,US,CA,91001,9,,,, +US-CA-91003,US,CA,91003,9,,,, +US-CA-91006,US,CA,91006,9,,,, +US-CA-91007,US,CA,91007,9,,,, +US-CA-91008,US,CA,91008,9,,,, +US-CA-91009,US,CA,91009,9,,,, +US-CA-91010,US,CA,91010,9,,,, +US-CA-91011,US,CA,91011,9,,,, +US-CA-91012,US,CA,91012,9,,,, +US-CA-91016,US,CA,91016,9,,,, +US-CA-91017,US,CA,91017,9,,,, +US-CA-91020,US,CA,91020,9,,,, +US-CA-91021,US,CA,91021,9,,,, +US-CA-91024,US,CA,91024,9,,,, +US-CA-91025,US,CA,91025,9,,,, +US-CA-91030,US,CA,91030,9,,,, +US-CA-91031,US,CA,91031,9,,,, +US-CA-91040,US,CA,91040,9,,,, +US-CA-91041,US,CA,91041,9,,,, +US-CA-91042,US,CA,91042,9,,,, +US-CA-91043,US,CA,91043,9,,,, +US-CA-91046,US,CA,91046,9,,,, +US-CA-91066,US,CA,91066,9,,,, +US-CA-91077,US,CA,91077,9,,,, +US-CA-91101,US,CA,91101,9,,,, +US-CA-91102,US,CA,91102,9,,,, +US-CA-91103,US,CA,91103,9,,,, +US-CA-91104,US,CA,91104,9,,,, +US-CA-91105,US,CA,91105,9,,,, +US-CA-91106,US,CA,91106,9,,,, +US-CA-91107,US,CA,91107,9,,,, +US-CA-91108,US,CA,91108,9,,,, +US-CA-91109,US,CA,91109,9,,,, +US-CA-91110,US,CA,91110,9,,,, +US-CA-91114,US,CA,91114,9,,,, +US-CA-91115,US,CA,91115,9,,,, +US-CA-91116,US,CA,91116,9,,,, +US-CA-91117,US,CA,91117,9,,,, +US-CA-91118,US,CA,91118,9,,,, +US-CA-91121,US,CA,91121,9,,,, +US-CA-91123,US,CA,91123,9,,,, +US-CA-91124,US,CA,91124,9,,,, +US-CA-91125,US,CA,91125,9,,,, +US-CA-91126,US,CA,91126,9,,,, +US-CA-91129,US,CA,91129,9,,,, +US-CA-91182,US,CA,91182,9,,,, +US-CA-91184,US,CA,91184,9,,,, +US-CA-91185,US,CA,91185,9,,,, +US-CA-91188,US,CA,91188,9,,,, +US-CA-91189,US,CA,91189,9,,,, +US-CA-91199,US,CA,91199,9,,,, +US-CA-91201,US,CA,91201,9,,,, +US-CA-91202,US,CA,91202,9,,,, +US-CA-91203,US,CA,91203,9,,,, +US-CA-91204,US,CA,91204,9,,,, +US-CA-91205,US,CA,91205,9,,,, +US-CA-91206,US,CA,91206,9,,,, +US-CA-91207,US,CA,91207,9,,,, +US-CA-91208,US,CA,91208,9,,,, +US-CA-91209,US,CA,91209,9,,,, +US-CA-91210,US,CA,91210,9,,,, +US-CA-91214,US,CA,91214,9,,,, +US-CA-91221,US,CA,91221,9,,,, +US-CA-91222,US,CA,91222,9,,,, +US-CA-91224,US,CA,91224,9,,,, +US-CA-91225,US,CA,91225,9,,,, +US-CA-91226,US,CA,91226,9,,,, +US-CA-91301,US,CA,91301,9,,,, +US-CA-91302,US,CA,91302,9,,,, +US-CA-91303,US,CA,91303,9,,,, +US-CA-91304,US,CA,91304,9,,,, +US-CA-91305,US,CA,91305,9,,,, +US-CA-91306,US,CA,91306,9,,,, +US-CA-91307,US,CA,91307,9,,,, +US-CA-91308,US,CA,91308,9,,,, +US-CA-91309,US,CA,91309,9,,,, +US-CA-91310,US,CA,91310,9,,,, +US-CA-91311,US,CA,91311,9,,,, +US-CA-91313,US,CA,91313,9,,,, +US-CA-91316,US,CA,91316,9,,,, +US-CA-91319,US,CA,91319,7.5,,,, +US-CA-91320,US,CA,91320,7.5,,,, +US-CA-91321,US,CA,91321,9,,,, +US-CA-91322,US,CA,91322,9,,,, +US-CA-91324,US,CA,91324,9,,,, +US-CA-91325,US,CA,91325,9,,,, +US-CA-91326,US,CA,91326,9,,,, +US-CA-91327,US,CA,91327,9,,,, +US-CA-91328,US,CA,91328,9,,,, +US-CA-91329,US,CA,91329,9,,,, +US-CA-91330,US,CA,91330,9,,,, +US-CA-91331,US,CA,91331,9,,,, +US-CA-91333,US,CA,91333,9,,,, +US-CA-91334,US,CA,91334,9,,,, +US-CA-91335,US,CA,91335,9,,,, +US-CA-91337,US,CA,91337,9,,,, +US-CA-91340,US,CA,91340,9.5,,,, +US-CA-91341,US,CA,91341,9.5,,,, +US-CA-91342,US,CA,91342,9,,,, +US-CA-91343,US,CA,91343,9,,,, +US-CA-91344,US,CA,91344,9,,,, +US-CA-91345,US,CA,91345,9,,,, +US-CA-91346,US,CA,91346,9,,,, +US-CA-91350,US,CA,91350,9,,,, +US-CA-91351,US,CA,91351,9,,,, +US-CA-91352,US,CA,91352,9,,,, +US-CA-91353,US,CA,91353,9,,,, +US-CA-91354,US,CA,91354,9,,,, +US-CA-91355,US,CA,91355,9,,,, +US-CA-91356,US,CA,91356,9,,,, +US-CA-91357,US,CA,91357,9,,,, +US-CA-91358,US,CA,91358,7.5,,,, +US-CA-91359,US,CA,91359,7.5,,,, +US-CA-91360,US,CA,91360,7.5,,,, +US-CA-91361,US,CA,91361,7.5,,,, +US-CA-91362,US,CA,91362,7.5,,,, +US-CA-91364,US,CA,91364,9,,,, +US-CA-91365,US,CA,91365,9,,,, +US-CA-91367,US,CA,91367,9,,,, +US-CA-91371,US,CA,91371,9,,,, +US-CA-91372,US,CA,91372,9,,,, +US-CA-91376,US,CA,91376,9,,,, +US-CA-91377,US,CA,91377,7.5,,,, +US-CA-91380,US,CA,91380,9,,,, +US-CA-91381,US,CA,91381,9,,,, +US-CA-91382,US,CA,91382,9,,,, +US-CA-91383,US,CA,91383,9,,,, +US-CA-91384,US,CA,91384,9,,,, +US-CA-91385,US,CA,91385,9,,,, +US-CA-91386,US,CA,91386,9,,,, +US-CA-91387,US,CA,91387,9,,,, +US-CA-91390,US,CA,91390,9,,,, +US-CA-91392,US,CA,91392,9,,,, +US-CA-91393,US,CA,91393,9,,,, +US-CA-91394,US,CA,91394,9,,,, +US-CA-91395,US,CA,91395,9,,,, +US-CA-91396,US,CA,91396,9,,,, +US-CA-91401,US,CA,91401,9,,,, +US-CA-91402,US,CA,91402,9,,,, +US-CA-91403,US,CA,91403,9,,,, +US-CA-91404,US,CA,91404,9,,,, +US-CA-91405,US,CA,91405,9,,,, +US-CA-91406,US,CA,91406,9,,,, +US-CA-91407,US,CA,91407,9,,,, +US-CA-91408,US,CA,91408,9,,,, +US-CA-91409,US,CA,91409,9,,,, +US-CA-91410,US,CA,91410,9,,,, +US-CA-91411,US,CA,91411,9,,,, +US-CA-91412,US,CA,91412,9,,,, +US-CA-91413,US,CA,91413,9,,,, +US-CA-91416,US,CA,91416,9,,,, +US-CA-91423,US,CA,91423,9,,,, +US-CA-91426,US,CA,91426,9,,,, +US-CA-91436,US,CA,91436,9,,,, +US-CA-91470,US,CA,91470,9,,,, +US-CA-91482,US,CA,91482,9,,,, +US-CA-91495,US,CA,91495,9,,,, +US-CA-91496,US,CA,91496,9,,,, +US-CA-91499,US,CA,91499,9,,,, +US-CA-91501,US,CA,91501,9,,,, +US-CA-91502,US,CA,91502,9,,,, +US-CA-91503,US,CA,91503,9,,,, +US-CA-91504,US,CA,91504,9,,,, +US-CA-91505,US,CA,91505,9,,,, +US-CA-91506,US,CA,91506,9,,,, +US-CA-91507,US,CA,91507,9,,,, +US-CA-91508,US,CA,91508,9,,,, +US-CA-91510,US,CA,91510,9,,,, +US-CA-91521,US,CA,91521,9,,,, +US-CA-91522,US,CA,91522,9,,,, +US-CA-91523,US,CA,91523,9,,,, +US-CA-91526,US,CA,91526,9,,,, +US-CA-91601,US,CA,91601,9,,,, +US-CA-91602,US,CA,91602,9,,,, +US-CA-91603,US,CA,91603,9,,,, +US-CA-91604,US,CA,91604,9,,,, +US-CA-91605,US,CA,91605,9,,,, +US-CA-91606,US,CA,91606,9,,,, +US-CA-91607,US,CA,91607,9,,,, +US-CA-91608,US,CA,91608,9,,,, +US-CA-91609,US,CA,91609,9,,,, +US-CA-91610,US,CA,91610,9,,,, +US-CA-91611,US,CA,91611,9,,,, +US-CA-91612,US,CA,91612,9,,,, +US-CA-91614,US,CA,91614,9,,,, +US-CA-91615,US,CA,91615,9,,,, +US-CA-91616,US,CA,91616,9,,,, +US-CA-91617,US,CA,91617,9,,,, +US-CA-91618,US,CA,91618,9,,,, +US-CA-91701,US,CA,91701,8,,,, +US-CA-91702,US,CA,91702,9,,,, +US-CA-91706,US,CA,91706,9,,,, +US-CA-91708,US,CA,91708,8,,,, +US-CA-91709,US,CA,91709,8,,,, +US-CA-91710,US,CA,91710,8,,,, +US-CA-91711,US,CA,91711,9,,,, +US-CA-91714,US,CA,91714,9,,,, +US-CA-91715,US,CA,91715,9,,,, +US-CA-91716,US,CA,91716,9,,,, +US-CA-91722,US,CA,91722,9,,,, +US-CA-91723,US,CA,91723,9,,,, +US-CA-91724,US,CA,91724,9,,,, +US-CA-91729,US,CA,91729,8,,,, +US-CA-91730,US,CA,91730,8,,,, +US-CA-91731,US,CA,91731,9.5,,,, +US-CA-91732,US,CA,91732,9.5,,,, +US-CA-91733,US,CA,91733,9.5,,,, +US-CA-91734,US,CA,91734,9.5,,,, +US-CA-91735,US,CA,91735,9.5,,,, +US-CA-91737,US,CA,91737,8,,,, +US-CA-91739,US,CA,91739,8,,,, +US-CA-91740,US,CA,91740,9,,,, +US-CA-91741,US,CA,91741,9,,,, +US-CA-91743,US,CA,91743,8,,,, +US-CA-91744,US,CA,91744,9,,,, +US-CA-91745,US,CA,91745,9,,,, +US-CA-91746,US,CA,91746,9,,,, +US-CA-91747,US,CA,91747,9,,,, +US-CA-91748,US,CA,91748,9,,,, +US-CA-91749,US,CA,91749,9,,,, +US-CA-91750,US,CA,91750,9,,,, +US-CA-91752,US,CA,91752,8,,,, +US-CA-91754,US,CA,91754,9,,,, +US-CA-91755,US,CA,91755,9,,,, +US-CA-91756,US,CA,91756,9,,,, +US-CA-91758,US,CA,91758,8,,,, +US-CA-91759,US,CA,91759,8,,,, +US-CA-91761,US,CA,91761,8,,,, +US-CA-91762,US,CA,91762,8,,,, +US-CA-91763,US,CA,91763,8.25,,,, +US-CA-91764,US,CA,91764,8,,,, +US-CA-91765,US,CA,91765,9,,,, +US-CA-91766,US,CA,91766,9,,,, +US-CA-91767,US,CA,91767,9,,,, +US-CA-91768,US,CA,91768,9,,,, +US-CA-91769,US,CA,91769,9,,,, +US-CA-91770,US,CA,91770,9,,,, +US-CA-91771,US,CA,91771,9,,,, +US-CA-91772,US,CA,91772,9,,,, +US-CA-91773,US,CA,91773,9,,,, +US-CA-91775,US,CA,91775,9,,,, +US-CA-91776,US,CA,91776,9,,,, +US-CA-91778,US,CA,91778,9,,,, +US-CA-91780,US,CA,91780,9,,,, +US-CA-91784,US,CA,91784,8,,,, +US-CA-91785,US,CA,91785,8,,,, +US-CA-91786,US,CA,91786,8,,,, +US-CA-91788,US,CA,91788,9,,,, +US-CA-91789,US,CA,91789,9,,,, +US-CA-91790,US,CA,91790,9,,,, +US-CA-91791,US,CA,91791,9,,,, +US-CA-91792,US,CA,91792,9,,,, +US-CA-91793,US,CA,91793,9,,,, +US-CA-91801,US,CA,91801,9,,,, +US-CA-91802,US,CA,91802,9,,,, +US-CA-91803,US,CA,91803,9,,,, +US-CA-91804,US,CA,91804,9,,,, +US-CA-91896,US,CA,91896,9,,,, +US-CA-91899,US,CA,91899,9,,,, +US-CA-91901,US,CA,91901,8,,,, +US-CA-91902,US,CA,91902,8,,,, +US-CA-91903,US,CA,91903,8,,,, +US-CA-91905,US,CA,91905,8,,,, +US-CA-91906,US,CA,91906,8,,,, +US-CA-91908,US,CA,91908,8,,,, +US-CA-91909,US,CA,91909,8,,,, +US-CA-91910,US,CA,91910,8,,,, +US-CA-91911,US,CA,91911,8,,,, +US-CA-91912,US,CA,91912,8,,,, +US-CA-91913,US,CA,91913,8,,,, +US-CA-91914,US,CA,91914,8,,,, +US-CA-91915,US,CA,91915,8,,,, +US-CA-91916,US,CA,91916,8,,,, +US-CA-91917,US,CA,91917,8,,,, +US-CA-91921,US,CA,91921,8,,,, +US-CA-91931,US,CA,91931,8,,,, +US-CA-91932,US,CA,91932,8,,,, +US-CA-91933,US,CA,91933,8,,,, +US-CA-91934,US,CA,91934,8,,,, +US-CA-91935,US,CA,91935,8,,,, +US-CA-91941,US,CA,91941,8.75,,,, +US-CA-91942,US,CA,91942,8.75,,,, +US-CA-91943,US,CA,91943,8.75,,,, +US-CA-91944,US,CA,91944,8,,,, +US-CA-91945,US,CA,91945,8,,,, +US-CA-91946,US,CA,91946,8,,,, +US-CA-91947,US,CA,91947,8,,,, +US-CA-91948,US,CA,91948,8,,,, +US-CA-91950,US,CA,91950,9,,,, +US-CA-91951,US,CA,91951,9,,,, +US-CA-91962,US,CA,91962,8,,,, +US-CA-91963,US,CA,91963,8,,,, +US-CA-91976,US,CA,91976,8,,,, +US-CA-91977,US,CA,91977,8,,,, +US-CA-91978,US,CA,91978,8,,,, +US-CA-91979,US,CA,91979,8,,,, +US-CA-91980,US,CA,91980,8,,,, +US-CA-91987,US,CA,91987,8,,,, +US-CA-92003,US,CA,92003,8,,,, +US-CA-92004,US,CA,92004,8,,,, +US-CA-92007,US,CA,92007,8,,,, +US-CA-92008,US,CA,92008,8,,,, +US-CA-92009,US,CA,92009,8,,,, +US-CA-92010,US,CA,92010,8,,,, +US-CA-92011,US,CA,92011,8,,,, +US-CA-92013,US,CA,92013,8,,,, +US-CA-92014,US,CA,92014,8,,,, +US-CA-92018,US,CA,92018,8,,,, +US-CA-92019,US,CA,92019,8,,,, +US-CA-92020,US,CA,92020,9,,,, +US-CA-92021,US,CA,92021,8,,,, +US-CA-92022,US,CA,92022,9,,,, +US-CA-92023,US,CA,92023,8,,,, +US-CA-92024,US,CA,92024,8,,,, +US-CA-92025,US,CA,92025,8,,,, +US-CA-92026,US,CA,92026,8,,,, +US-CA-92027,US,CA,92027,8,,,, +US-CA-92028,US,CA,92028,8,,,, +US-CA-92029,US,CA,92029,8,,,, +US-CA-92030,US,CA,92030,8,,,, +US-CA-92033,US,CA,92033,8,,,, +US-CA-92036,US,CA,92036,8,,,, +US-CA-92037,US,CA,92037,8,,,, +US-CA-92038,US,CA,92038,8,,,, +US-CA-92039,US,CA,92039,8,,,, +US-CA-92040,US,CA,92040,8,,,, +US-CA-92046,US,CA,92046,8,,,, +US-CA-92049,US,CA,92049,8,,,, +US-CA-92051,US,CA,92051,8,,,, +US-CA-92052,US,CA,92052,8,,,, +US-CA-92054,US,CA,92054,8,,,, +US-CA-92056,US,CA,92056,8,,,, +US-CA-92057,US,CA,92057,8,,,, +US-CA-92058,US,CA,92058,8,,,, +US-CA-92059,US,CA,92059,8,,,, +US-CA-92060,US,CA,92060,8,,,, +US-CA-92061,US,CA,92061,8,,,, +US-CA-92064,US,CA,92064,8,,,, +US-CA-92065,US,CA,92065,8,,,, +US-CA-92066,US,CA,92066,8,,,, +US-CA-92067,US,CA,92067,8,,,, +US-CA-92068,US,CA,92068,8,,,, +US-CA-92069,US,CA,92069,8,,,, +US-CA-92070,US,CA,92070,8,,,, +US-CA-92071,US,CA,92071,8,,,, +US-CA-92072,US,CA,92072,8,,,, +US-CA-92074,US,CA,92074,8,,,, +US-CA-92075,US,CA,92075,8,,,, +US-CA-92078,US,CA,92078,8,,,, +US-CA-92079,US,CA,92079,8,,,, +US-CA-92081,US,CA,92081,8.5,,,, +US-CA-92082,US,CA,92082,8,,,, +US-CA-92083,US,CA,92083,8.5,,,, +US-CA-92084,US,CA,92084,8.5,,,, +US-CA-92085,US,CA,92085,8.5,,,, +US-CA-92086,US,CA,92086,8,,,, +US-CA-92088,US,CA,92088,8,,,, +US-CA-92091,US,CA,92091,8,,,, +US-CA-92092,US,CA,92092,8,,,, +US-CA-92093,US,CA,92093,8,,,, +US-CA-92096,US,CA,92096,8,,,, +US-CA-92101,US,CA,92101,8,,,, +US-CA-92102,US,CA,92102,8,,,, +US-CA-92103,US,CA,92103,8,,,, +US-CA-92104,US,CA,92104,8,,,, +US-CA-92105,US,CA,92105,8,,,, +US-CA-92106,US,CA,92106,8,,,, +US-CA-92107,US,CA,92107,8,,,, +US-CA-92108,US,CA,92108,8,,,, +US-CA-92109,US,CA,92109,8,,,, +US-CA-92110,US,CA,92110,8,,,, +US-CA-92111,US,CA,92111,8,,,, +US-CA-92112,US,CA,92112,8,,,, +US-CA-92113,US,CA,92113,8,,,, +US-CA-92114,US,CA,92114,8,,,, +US-CA-92115,US,CA,92115,8,,,, +US-CA-92116,US,CA,92116,8,,,, +US-CA-92117,US,CA,92117,8,,,, +US-CA-92118,US,CA,92118,8,,,, +US-CA-92119,US,CA,92119,8,,,, +US-CA-92120,US,CA,92120,8,,,, +US-CA-92121,US,CA,92121,8,,,, +US-CA-92122,US,CA,92122,8,,,, +US-CA-92123,US,CA,92123,8,,,, +US-CA-92124,US,CA,92124,8,,,, +US-CA-92126,US,CA,92126,8,,,, +US-CA-92127,US,CA,92127,8,,,, +US-CA-92128,US,CA,92128,8,,,, +US-CA-92129,US,CA,92129,8,,,, +US-CA-92130,US,CA,92130,8,,,, +US-CA-92131,US,CA,92131,8,,,, +US-CA-92132,US,CA,92132,8,,,, +US-CA-92134,US,CA,92134,8,,,, +US-CA-92135,US,CA,92135,8,,,, +US-CA-92136,US,CA,92136,8,,,, +US-CA-92137,US,CA,92137,8,,,, +US-CA-92138,US,CA,92138,8,,,, +US-CA-92139,US,CA,92139,8,,,, +US-CA-92140,US,CA,92140,8,,,, +US-CA-92142,US,CA,92142,8,,,, +US-CA-92143,US,CA,92143,8,,,, +US-CA-92145,US,CA,92145,8,,,, +US-CA-92147,US,CA,92147,8,,,, +US-CA-92149,US,CA,92149,8,,,, +US-CA-92150,US,CA,92150,8,,,, +US-CA-92152,US,CA,92152,8,,,, +US-CA-92153,US,CA,92153,8,,,, +US-CA-92154,US,CA,92154,8,,,, +US-CA-92155,US,CA,92155,8,,,, +US-CA-92158,US,CA,92158,8,,,, +US-CA-92159,US,CA,92159,8,,,, +US-CA-92160,US,CA,92160,8,,,, +US-CA-92161,US,CA,92161,8,,,, +US-CA-92163,US,CA,92163,8,,,, +US-CA-92164,US,CA,92164,8,,,, +US-CA-92165,US,CA,92165,8,,,, +US-CA-92166,US,CA,92166,8,,,, +US-CA-92167,US,CA,92167,8,,,, +US-CA-92168,US,CA,92168,8,,,, +US-CA-92169,US,CA,92169,8,,,, +US-CA-92170,US,CA,92170,8,,,, +US-CA-92171,US,CA,92171,8,,,, +US-CA-92172,US,CA,92172,8,,,, +US-CA-92173,US,CA,92173,8,,,, +US-CA-92174,US,CA,92174,8,,,, +US-CA-92175,US,CA,92175,8,,,, +US-CA-92176,US,CA,92176,8,,,, +US-CA-92177,US,CA,92177,8,,,, +US-CA-92178,US,CA,92178,8,,,, +US-CA-92179,US,CA,92179,8,,,, +US-CA-92182,US,CA,92182,8,,,, +US-CA-92186,US,CA,92186,8,,,, +US-CA-92187,US,CA,92187,8,,,, +US-CA-92190,US,CA,92190,8,,,, +US-CA-92191,US,CA,92191,8,,,, +US-CA-92192,US,CA,92192,8,,,, +US-CA-92193,US,CA,92193,8,,,, +US-CA-92195,US,CA,92195,8,,,, +US-CA-92196,US,CA,92196,8,,,, +US-CA-92197,US,CA,92197,8,,,, +US-CA-92198,US,CA,92198,8,,,, +US-CA-92199,US,CA,92199,8,,,, +US-CA-92201,US,CA,92201,8,,,, +US-CA-92202,US,CA,92202,8,,,, +US-CA-92203,US,CA,92203,8,,,, +US-CA-92210,US,CA,92210,8,,,, +US-CA-92211,US,CA,92211,8,,,, +US-CA-92220,US,CA,92220,8,,,, +US-CA-92222,US,CA,92222,8,,,, +US-CA-92223,US,CA,92223,8,,,, +US-CA-92225,US,CA,92225,8,,,, +US-CA-92226,US,CA,92226,8,,,, +US-CA-92227,US,CA,92227,8,,,, +US-CA-92230,US,CA,92230,8,,,, +US-CA-92231,US,CA,92231,8.5,,,, +US-CA-92232,US,CA,92232,8.5,,,, +US-CA-92233,US,CA,92233,8,,,, +US-CA-92234,US,CA,92234,9,,,, +US-CA-92235,US,CA,92235,9,,,, +US-CA-92236,US,CA,92236,8,,,, +US-CA-92239,US,CA,92239,8,,,, +US-CA-92240,US,CA,92240,8,,,, +US-CA-92241,US,CA,92241,8,,,, +US-CA-92242,US,CA,92242,8,,,, +US-CA-92243,US,CA,92243,8,,,, +US-CA-92244,US,CA,92244,8,,,, +US-CA-92247,US,CA,92247,8,,,, +US-CA-92248,US,CA,92248,8,,,, +US-CA-92249,US,CA,92249,8,,,, +US-CA-92250,US,CA,92250,8,,,, +US-CA-92251,US,CA,92251,8,,,, +US-CA-92252,US,CA,92252,8,,,, +US-CA-92253,US,CA,92253,8,,,, +US-CA-92254,US,CA,92254,8,,,, +US-CA-92255,US,CA,92255,8,,,, +US-CA-92256,US,CA,92256,8,,,, +US-CA-92257,US,CA,92257,8,,,, +US-CA-92258,US,CA,92258,8,,,, +US-CA-92259,US,CA,92259,8,,,, +US-CA-92260,US,CA,92260,8,,,, +US-CA-92261,US,CA,92261,8,,,, +US-CA-92262,US,CA,92262,9,,,, +US-CA-92263,US,CA,92263,9,,,, +US-CA-92264,US,CA,92264,9,,,, +US-CA-92266,US,CA,92266,8,,,, +US-CA-92267,US,CA,92267,8,,,, +US-CA-92268,US,CA,92268,8,,,, +US-CA-92270,US,CA,92270,8,,,, +US-CA-92273,US,CA,92273,8,,,, +US-CA-92274,US,CA,92274,8,,,, +US-CA-92275,US,CA,92275,8,,,, +US-CA-92276,US,CA,92276,8,,,, +US-CA-92277,US,CA,92277,8,,,, +US-CA-92278,US,CA,92278,8,,,, +US-CA-92280,US,CA,92280,8,,,, +US-CA-92281,US,CA,92281,8,,,, +US-CA-92282,US,CA,92282,8,,,, +US-CA-92283,US,CA,92283,8,,,, +US-CA-92284,US,CA,92284,8,,,, +US-CA-92285,US,CA,92285,8,,,, +US-CA-92286,US,CA,92286,8,,,, +US-CA-92301,US,CA,92301,8,,,, +US-CA-92304,US,CA,92304,8,,,, +US-CA-92305,US,CA,92305,8,,,, +US-CA-92307,US,CA,92307,8,,,, +US-CA-92308,US,CA,92308,8,,,, +US-CA-92309,US,CA,92309,8,,,, +US-CA-92310,US,CA,92310,8,,,, +US-CA-92311,US,CA,92311,8,,,, +US-CA-92312,US,CA,92312,8,,,, +US-CA-92313,US,CA,92313,8,,,, +US-CA-92314,US,CA,92314,8,,,, +US-CA-92315,US,CA,92315,8,,,, +US-CA-92316,US,CA,92316,8,,,, +US-CA-92317,US,CA,92317,8,,,, +US-CA-92318,US,CA,92318,8,,,, +US-CA-92320,US,CA,92320,8,,,, +US-CA-92321,US,CA,92321,8,,,, +US-CA-92322,US,CA,92322,8,,,, +US-CA-92324,US,CA,92324,8,,,, +US-CA-92325,US,CA,92325,8,,,, +US-CA-92326,US,CA,92326,8,,,, +US-CA-92327,US,CA,92327,8,,,, +US-CA-92328,US,CA,92328,8,,,, +US-CA-92329,US,CA,92329,8,,,, +US-CA-92331,US,CA,92331,8,,,, +US-CA-92332,US,CA,92332,8,,,, +US-CA-92333,US,CA,92333,8,,,, +US-CA-92334,US,CA,92334,8,,,, +US-CA-92335,US,CA,92335,8,,,, +US-CA-92336,US,CA,92336,8,,,, +US-CA-92337,US,CA,92337,8,,,, +US-CA-92339,US,CA,92339,8,,,, +US-CA-92340,US,CA,92340,8,,,, +US-CA-92341,US,CA,92341,8,,,, +US-CA-92342,US,CA,92342,8,,,, +US-CA-92344,US,CA,92344,8,,,, +US-CA-92345,US,CA,92345,8,,,, +US-CA-92346,US,CA,92346,8,,,, +US-CA-92347,US,CA,92347,8,,,, +US-CA-92350,US,CA,92350,8,,,, +US-CA-92352,US,CA,92352,8,,,, +US-CA-92354,US,CA,92354,8,,,, +US-CA-92356,US,CA,92356,8,,,, +US-CA-92357,US,CA,92357,8,,,, +US-CA-92358,US,CA,92358,8,,,, +US-CA-92359,US,CA,92359,8,,,, +US-CA-92363,US,CA,92363,8,,,, +US-CA-92364,US,CA,92364,8,,,, +US-CA-92365,US,CA,92365,8,,,, +US-CA-92366,US,CA,92366,8,,,, +US-CA-92368,US,CA,92368,8,,,, +US-CA-92369,US,CA,92369,8,,,, +US-CA-92371,US,CA,92371,8,,,, +US-CA-92372,US,CA,92372,8,,,, +US-CA-92373,US,CA,92373,8,,,, +US-CA-92374,US,CA,92374,8,,,, +US-CA-92375,US,CA,92375,8,,,, +US-CA-92376,US,CA,92376,8,,,, +US-CA-92377,US,CA,92377,8,,,, +US-CA-92378,US,CA,92378,8,,,, +US-CA-92382,US,CA,92382,8,,,, +US-CA-92384,US,CA,92384,8,,,, +US-CA-92385,US,CA,92385,8,,,, +US-CA-92386,US,CA,92386,8,,,, +US-CA-92389,US,CA,92389,8,,,, +US-CA-92391,US,CA,92391,8,,,, +US-CA-92392,US,CA,92392,8,,,, +US-CA-92393,US,CA,92393,8,,,, +US-CA-92394,US,CA,92394,8,,,, +US-CA-92395,US,CA,92395,8,,,, +US-CA-92397,US,CA,92397,8,,,, +US-CA-92398,US,CA,92398,8,,,, +US-CA-92399,US,CA,92399,8,,,, +US-CA-92401,US,CA,92401,8.25,,,, +US-CA-92402,US,CA,92402,8.25,,,, +US-CA-92403,US,CA,92403,8.25,,,, +US-CA-92404,US,CA,92404,8,,,, +US-CA-92405,US,CA,92405,8.25,,,, +US-CA-92406,US,CA,92406,8.25,,,, +US-CA-92407,US,CA,92407,8,,,, +US-CA-92408,US,CA,92408,8.25,,,, +US-CA-92410,US,CA,92410,8.25,,,, +US-CA-92411,US,CA,92411,8.25,,,, +US-CA-92412,US,CA,92412,8.25,,,, +US-CA-92413,US,CA,92413,8.25,,,, +US-CA-92415,US,CA,92415,8.25,,,, +US-CA-92418,US,CA,92418,8.25,,,, +US-CA-92423,US,CA,92423,8.25,,,, +US-CA-92427,US,CA,92427,8,,,, +US-CA-92501,US,CA,92501,8,,,, +US-CA-92502,US,CA,92502,8,,,, +US-CA-92503,US,CA,92503,8,,,, +US-CA-92504,US,CA,92504,8,,,, +US-CA-92505,US,CA,92505,8,,,, +US-CA-92506,US,CA,92506,8,,,, +US-CA-92507,US,CA,92507,8,,,, +US-CA-92508,US,CA,92508,8,,,, +US-CA-92509,US,CA,92509,8,,,, +US-CA-92513,US,CA,92513,8,,,, +US-CA-92514,US,CA,92514,8,,,, +US-CA-92515,US,CA,92515,8,,,, +US-CA-92516,US,CA,92516,8,,,, +US-CA-92517,US,CA,92517,8,,,, +US-CA-92518,US,CA,92518,8,,,, +US-CA-92519,US,CA,92519,8,,,, +US-CA-92521,US,CA,92521,8,,,, +US-CA-92522,US,CA,92522,8,,,, +US-CA-92530,US,CA,92530,8,,,, +US-CA-92531,US,CA,92531,8,,,, +US-CA-92532,US,CA,92532,8,,,, +US-CA-92536,US,CA,92536,8,,,, +US-CA-92539,US,CA,92539,8,,,, +US-CA-92543,US,CA,92543,8,,,, +US-CA-92544,US,CA,92544,8,,,, +US-CA-92545,US,CA,92545,8,,,, +US-CA-92546,US,CA,92546,8,,,, +US-CA-92548,US,CA,92548,8,,,, +US-CA-92549,US,CA,92549,8,,,, +US-CA-92551,US,CA,92551,8,,,, +US-CA-92552,US,CA,92552,8,,,, +US-CA-92553,US,CA,92553,8,,,, +US-CA-92554,US,CA,92554,8,,,, +US-CA-92555,US,CA,92555,8,,,, +US-CA-92556,US,CA,92556,8,,,, +US-CA-92557,US,CA,92557,8,,,, +US-CA-92561,US,CA,92561,8,,,, +US-CA-92562,US,CA,92562,8,,,, +US-CA-92563,US,CA,92563,8,,,, +US-CA-92564,US,CA,92564,8,,,, +US-CA-92567,US,CA,92567,8,,,, +US-CA-92570,US,CA,92570,8,,,, +US-CA-92571,US,CA,92571,8,,,, +US-CA-92572,US,CA,92572,8,,,, +US-CA-92581,US,CA,92581,8,,,, +US-CA-92582,US,CA,92582,8,,,, +US-CA-92583,US,CA,92583,8,,,, +US-CA-92584,US,CA,92584,8,,,, +US-CA-92585,US,CA,92585,8,,,, +US-CA-92586,US,CA,92586,8,,,, +US-CA-92587,US,CA,92587,8,,,, +US-CA-92589,US,CA,92589,8,,,, +US-CA-92590,US,CA,92590,8,,,, +US-CA-92591,US,CA,92591,8,,,, +US-CA-92592,US,CA,92592,8,,,, +US-CA-92593,US,CA,92593,8,,,, +US-CA-92595,US,CA,92595,8,,,, +US-CA-92596,US,CA,92596,8,,,, +US-CA-92599,US,CA,92599,8,,,, +US-CA-92602,US,CA,92602,8,,,, +US-CA-92603,US,CA,92603,8,,,, +US-CA-92604,US,CA,92604,8,,,, +US-CA-92605,US,CA,92605,8,,,, +US-CA-92606,US,CA,92606,8,,,, +US-CA-92607,US,CA,92607,8,,,, +US-CA-92609,US,CA,92609,8,,,, +US-CA-92610,US,CA,92610,8,,,, +US-CA-92612,US,CA,92612,8,,,, +US-CA-92614,US,CA,92614,8,,,, +US-CA-92615,US,CA,92615,8,,,, +US-CA-92616,US,CA,92616,8,,,, +US-CA-92617,US,CA,92617,8,,,, +US-CA-92618,US,CA,92618,8,,,, +US-CA-92619,US,CA,92619,8,,,, +US-CA-92620,US,CA,92620,8,,,, +US-CA-92623,US,CA,92623,8,,,, +US-CA-92624,US,CA,92624,8,,,, +US-CA-92625,US,CA,92625,8,,,, +US-CA-92626,US,CA,92626,8,,,, +US-CA-92627,US,CA,92627,8,,,, +US-CA-92628,US,CA,92628,8,,,, +US-CA-92629,US,CA,92629,8,,,, +US-CA-92630,US,CA,92630,8,,,, +US-CA-92637,US,CA,92637,8,,,, +US-CA-92646,US,CA,92646,8,,,, +US-CA-92647,US,CA,92647,8,,,, +US-CA-92648,US,CA,92648,8,,,, +US-CA-92649,US,CA,92649,8,,,, +US-CA-92650,US,CA,92650,8,,,, +US-CA-92651,US,CA,92651,8,,,, +US-CA-92652,US,CA,92652,8,,,, +US-CA-92653,US,CA,92653,8,,,, +US-CA-92654,US,CA,92654,8,,,, +US-CA-92655,US,CA,92655,8,,,, +US-CA-92656,US,CA,92656,8,,,, +US-CA-92657,US,CA,92657,8,,,, +US-CA-92658,US,CA,92658,8,,,, +US-CA-92659,US,CA,92659,8,,,, +US-CA-92660,US,CA,92660,8,,,, +US-CA-92661,US,CA,92661,8,,,, +US-CA-92662,US,CA,92662,8,,,, +US-CA-92663,US,CA,92663,8,,,, +US-CA-92672,US,CA,92672,8,,,, +US-CA-92673,US,CA,92673,8,,,, +US-CA-92674,US,CA,92674,8,,,, +US-CA-92675,US,CA,92675,8,,,, +US-CA-92676,US,CA,92676,8,,,, +US-CA-92677,US,CA,92677,8,,,, +US-CA-92678,US,CA,92678,8,,,, +US-CA-92679,US,CA,92679,8,,,, +US-CA-92683,US,CA,92683,8,,,, +US-CA-92684,US,CA,92684,8,,,, +US-CA-92685,US,CA,92685,8,,,, +US-CA-92688,US,CA,92688,8,,,, +US-CA-92690,US,CA,92690,8,,,, +US-CA-92691,US,CA,92691,8,,,, +US-CA-92692,US,CA,92692,8,,,, +US-CA-92693,US,CA,92693,8,,,, +US-CA-92694,US,CA,92694,8,,,, +US-CA-92697,US,CA,92697,8,,,, +US-CA-92698,US,CA,92698,8,,,, +US-CA-92701,US,CA,92701,8,,,, +US-CA-92702,US,CA,92702,8,,,, +US-CA-92703,US,CA,92703,8,,,, +US-CA-92704,US,CA,92704,8,,,, +US-CA-92705,US,CA,92705,8,,,, +US-CA-92706,US,CA,92706,8,,,, +US-CA-92707,US,CA,92707,8,,,, +US-CA-92708,US,CA,92708,8,,,, +US-CA-92711,US,CA,92711,8,,,, +US-CA-92712,US,CA,92712,8,,,, +US-CA-92728,US,CA,92728,8,,,, +US-CA-92735,US,CA,92735,8,,,, +US-CA-92780,US,CA,92780,8,,,, +US-CA-92781,US,CA,92781,8,,,, +US-CA-92782,US,CA,92782,8,,,, +US-CA-92799,US,CA,92799,8,,,, +US-CA-92801,US,CA,92801,8,,,, +US-CA-92802,US,CA,92802,8,,,, +US-CA-92803,US,CA,92803,8,,,, +US-CA-92804,US,CA,92804,8,,,, +US-CA-92805,US,CA,92805,8,,,, +US-CA-92806,US,CA,92806,8,,,, +US-CA-92807,US,CA,92807,8,,,, +US-CA-92808,US,CA,92808,8,,,, +US-CA-92809,US,CA,92809,8,,,, +US-CA-92811,US,CA,92811,8,,,, +US-CA-92812,US,CA,92812,8,,,, +US-CA-92814,US,CA,92814,8,,,, +US-CA-92815,US,CA,92815,8,,,, +US-CA-92816,US,CA,92816,8,,,, +US-CA-92817,US,CA,92817,8,,,, +US-CA-92821,US,CA,92821,8,,,, +US-CA-92822,US,CA,92822,8,,,, +US-CA-92823,US,CA,92823,8,,,, +US-CA-92825,US,CA,92825,8,,,, +US-CA-92831,US,CA,92831,8,,,, +US-CA-92832,US,CA,92832,8,,,, +US-CA-92833,US,CA,92833,8,,,, +US-CA-92834,US,CA,92834,8,,,, +US-CA-92835,US,CA,92835,8,,,, +US-CA-92836,US,CA,92836,8,,,, +US-CA-92837,US,CA,92837,8,,,, +US-CA-92838,US,CA,92838,8,,,, +US-CA-92840,US,CA,92840,8,,,, +US-CA-92841,US,CA,92841,8,,,, +US-CA-92842,US,CA,92842,8,,,, +US-CA-92843,US,CA,92843,8,,,, +US-CA-92844,US,CA,92844,8,,,, +US-CA-92845,US,CA,92845,8,,,, +US-CA-92846,US,CA,92846,8,,,, +US-CA-92850,US,CA,92850,8,,,, +US-CA-92856,US,CA,92856,8,,,, +US-CA-92857,US,CA,92857,8,,,, +US-CA-92859,US,CA,92859,8,,,, +US-CA-92860,US,CA,92860,8,,,, +US-CA-92861,US,CA,92861,8,,,, +US-CA-92862,US,CA,92862,8,,,, +US-CA-92863,US,CA,92863,8,,,, +US-CA-92864,US,CA,92864,8,,,, +US-CA-92865,US,CA,92865,8,,,, +US-CA-92866,US,CA,92866,8,,,, +US-CA-92867,US,CA,92867,8,,,, +US-CA-92868,US,CA,92868,8,,,, +US-CA-92869,US,CA,92869,8,,,, +US-CA-92870,US,CA,92870,8,,,, +US-CA-92871,US,CA,92871,8,,,, +US-CA-92877,US,CA,92877,8,,,, +US-CA-92878,US,CA,92878,8,,,, +US-CA-92879,US,CA,92879,8,,,, +US-CA-92880,US,CA,92880,8,,,, +US-CA-92881,US,CA,92881,8,,,, +US-CA-92882,US,CA,92882,8,,,, +US-CA-92883,US,CA,92883,8,,,, +US-CA-92885,US,CA,92885,8,,,, +US-CA-92886,US,CA,92886,8,,,, +US-CA-92887,US,CA,92887,8,,,, +US-CA-92899,US,CA,92899,8,,,, +US-CA-93001,US,CA,93001,7.5,,,, +US-CA-93002,US,CA,93002,7.5,,,, +US-CA-93003,US,CA,93003,7.5,,,, +US-CA-93004,US,CA,93004,7.5,,,, +US-CA-93005,US,CA,93005,7.5,,,, +US-CA-93006,US,CA,93006,7.5,,,, +US-CA-93007,US,CA,93007,7.5,,,, +US-CA-93009,US,CA,93009,7.5,,,, +US-CA-93010,US,CA,93010,7.5,,,, +US-CA-93011,US,CA,93011,7.5,,,, +US-CA-93012,US,CA,93012,7.5,,,, +US-CA-93013,US,CA,93013,8,,,, +US-CA-93014,US,CA,93014,8,,,, +US-CA-93015,US,CA,93015,7.5,,,, +US-CA-93016,US,CA,93016,7.5,,,, +US-CA-93020,US,CA,93020,7.5,,,, +US-CA-93021,US,CA,93021,7.5,,,, +US-CA-93022,US,CA,93022,7.5,,,, +US-CA-93023,US,CA,93023,7.5,,,, +US-CA-93024,US,CA,93024,7.5,,,, +US-CA-93030,US,CA,93030,8,,,, +US-CA-93031,US,CA,93031,8,,,, +US-CA-93032,US,CA,93032,8,,,, +US-CA-93033,US,CA,93033,8,,,, +US-CA-93034,US,CA,93034,8,,,, +US-CA-93035,US,CA,93035,8,,,, +US-CA-93036,US,CA,93036,8,,,, +US-CA-93040,US,CA,93040,7.5,,,, +US-CA-93041,US,CA,93041,8,,,, +US-CA-93042,US,CA,93042,7.5,,,, +US-CA-93043,US,CA,93043,8,,,, +US-CA-93044,US,CA,93044,8,,,, +US-CA-93060,US,CA,93060,7.5,,,, +US-CA-93061,US,CA,93061,7.5,,,, +US-CA-93062,US,CA,93062,7.5,,,, +US-CA-93063,US,CA,93063,7.5,,,, +US-CA-93064,US,CA,93064,7.5,,,, +US-CA-93065,US,CA,93065,7.5,,,, +US-CA-93066,US,CA,93066,7.5,,,, +US-CA-93067,US,CA,93067,8,,,, +US-CA-93094,US,CA,93094,7.5,,,, +US-CA-93099,US,CA,93099,7.5,,,, +US-CA-93101,US,CA,93101,8,,,, +US-CA-93102,US,CA,93102,8,,,, +US-CA-93103,US,CA,93103,8,,,, +US-CA-93105,US,CA,93105,8,,,, +US-CA-93106,US,CA,93106,8,,,, +US-CA-93107,US,CA,93107,8,,,, +US-CA-93108,US,CA,93108,8,,,, +US-CA-93109,US,CA,93109,8,,,, +US-CA-93110,US,CA,93110,8,,,, +US-CA-93111,US,CA,93111,8,,,, +US-CA-93116,US,CA,93116,8,,,, +US-CA-93117,US,CA,93117,8,,,, +US-CA-93118,US,CA,93118,8,,,, +US-CA-93120,US,CA,93120,8,,,, +US-CA-93121,US,CA,93121,8,,,, +US-CA-93130,US,CA,93130,8,,,, +US-CA-93140,US,CA,93140,8,,,, +US-CA-93150,US,CA,93150,8,,,, +US-CA-93160,US,CA,93160,8,,,, +US-CA-93190,US,CA,93190,8,,,, +US-CA-93199,US,CA,93199,8,,,, +US-CA-93201,US,CA,93201,8,,,, +US-CA-93202,US,CA,93202,7.5,,,, +US-CA-93203,US,CA,93203,8.5,,,, +US-CA-93204,US,CA,93204,7.5,,,, +US-CA-93205,US,CA,93205,7.5,,,, +US-CA-93206,US,CA,93206,7.5,,,, +US-CA-93207,US,CA,93207,8,,,, +US-CA-93208,US,CA,93208,8,,,, +US-CA-93210,US,CA,93210,8.225,,,, +US-CA-93212,US,CA,93212,7.5,,,, +US-CA-93215,US,CA,93215,8.5,,,, +US-CA-93216,US,CA,93216,8.5,,,, +US-CA-93218,US,CA,93218,8,,,, +US-CA-93219,US,CA,93219,8,,,, +US-CA-93220,US,CA,93220,7.5,,,, +US-CA-93221,US,CA,93221,8,,,, +US-CA-93222,US,CA,93222,7.5,,,, +US-CA-93223,US,CA,93223,8.5,,,, +US-CA-93224,US,CA,93224,7.5,,,, +US-CA-93225,US,CA,93225,7.5,,,, +US-CA-93226,US,CA,93226,7.5,,,, +US-CA-93227,US,CA,93227,8,,,, +US-CA-93230,US,CA,93230,7.5,,,, +US-CA-93232,US,CA,93232,7.5,,,, +US-CA-93234,US,CA,93234,8.225,,,, +US-CA-93235,US,CA,93235,8,,,, +US-CA-93237,US,CA,93237,8,,,, +US-CA-93238,US,CA,93238,7.5,,,, +US-CA-93239,US,CA,93239,7.5,,,, +US-CA-93240,US,CA,93240,7.5,,,, +US-CA-93241,US,CA,93241,7.5,,,, +US-CA-93242,US,CA,93242,8.225,,,, +US-CA-93243,US,CA,93243,7.5,,,, +US-CA-93244,US,CA,93244,8,,,, +US-CA-93245,US,CA,93245,7.5,,,, +US-CA-93246,US,CA,93246,7.5,,,, +US-CA-93247,US,CA,93247,8,,,, +US-CA-93249,US,CA,93249,7.5,,,, +US-CA-93250,US,CA,93250,7.5,,,, +US-CA-93251,US,CA,93251,7.5,,,, +US-CA-93252,US,CA,93252,7.5,,,, +US-CA-93254,US,CA,93254,8,,,, +US-CA-93255,US,CA,93255,7.5,,,, +US-CA-93256,US,CA,93256,8,,,, +US-CA-93257,US,CA,93257,8.5,,,, +US-CA-93258,US,CA,93258,8.5,,,, +US-CA-93260,US,CA,93260,8,,,, +US-CA-93261,US,CA,93261,8,,,, +US-CA-93262,US,CA,93262,8,,,, +US-CA-93263,US,CA,93263,7.5,,,, +US-CA-93265,US,CA,93265,8,,,, +US-CA-93266,US,CA,93266,7.5,,,, +US-CA-93267,US,CA,93267,8,,,, +US-CA-93268,US,CA,93268,7.5,,,, +US-CA-93270,US,CA,93270,8,,,, +US-CA-93271,US,CA,93271,8,,,, +US-CA-93272,US,CA,93272,8,,,, +US-CA-93274,US,CA,93274,8.5,,,, +US-CA-93275,US,CA,93275,8.5,,,, +US-CA-93276,US,CA,93276,7.5,,,, +US-CA-93277,US,CA,93277,8.25,,,, +US-CA-93278,US,CA,93278,8.25,,,, +US-CA-93279,US,CA,93279,8.25,,,, +US-CA-93280,US,CA,93280,7.5,,,, +US-CA-93282,US,CA,93282,8,,,, +US-CA-93283,US,CA,93283,7.5,,,, +US-CA-93285,US,CA,93285,7.5,,,, +US-CA-93286,US,CA,93286,8,,,, +US-CA-93287,US,CA,93287,7.5,,,, +US-CA-93290,US,CA,93290,8.25,,,, +US-CA-93291,US,CA,93291,8.25,,,, +US-CA-93292,US,CA,93292,8.25,,,, +US-CA-93301,US,CA,93301,7.5,,,, +US-CA-93302,US,CA,93302,7.5,,,, +US-CA-93303,US,CA,93303,7.5,,,, +US-CA-93304,US,CA,93304,7.5,,,, +US-CA-93305,US,CA,93305,7.5,,,, +US-CA-93306,US,CA,93306,7.5,,,, +US-CA-93307,US,CA,93307,7.5,,,, +US-CA-93308,US,CA,93308,7.5,,,, +US-CA-93309,US,CA,93309,7.5,,,, +US-CA-93311,US,CA,93311,7.5,,,, +US-CA-93312,US,CA,93312,7.5,,,, +US-CA-93313,US,CA,93313,7.5,,,, +US-CA-93314,US,CA,93314,7.5,,,, +US-CA-93380,US,CA,93380,7.5,,,, +US-CA-93383,US,CA,93383,7.5,,,, +US-CA-93384,US,CA,93384,7.5,,,, +US-CA-93385,US,CA,93385,7.5,,,, +US-CA-93386,US,CA,93386,7.5,,,, +US-CA-93387,US,CA,93387,7.5,,,, +US-CA-93388,US,CA,93388,7.5,,,, +US-CA-93389,US,CA,93389,7.5,,,, +US-CA-93390,US,CA,93390,7.5,,,, +US-CA-93401,US,CA,93401,8,,,, +US-CA-93402,US,CA,93402,7.5,,,, +US-CA-93403,US,CA,93403,8,,,, +US-CA-93405,US,CA,93405,8,,,, +US-CA-93406,US,CA,93406,8,,,, +US-CA-93407,US,CA,93407,7.5,,,, +US-CA-93408,US,CA,93408,8,,,, +US-CA-93409,US,CA,93409,8,,,, +US-CA-93410,US,CA,93410,8,,,, +US-CA-93412,US,CA,93412,7.5,,,, +US-CA-93420,US,CA,93420,8,,,, +US-CA-93421,US,CA,93421,7.5,,,, +US-CA-93422,US,CA,93422,7.5,,,, +US-CA-93423,US,CA,93423,7.5,,,, +US-CA-93424,US,CA,93424,7.5,,,, +US-CA-93426,US,CA,93426,7.5,,,, +US-CA-93427,US,CA,93427,8,,,, +US-CA-93428,US,CA,93428,7.5,,,, +US-CA-93429,US,CA,93429,8,,,, +US-CA-93430,US,CA,93430,7.5,,,, +US-CA-93432,US,CA,93432,7.5,,,, +US-CA-93433,US,CA,93433,8,,,, +US-CA-93434,US,CA,93434,8,,,, +US-CA-93435,US,CA,93435,7.5,,,, +US-CA-93436,US,CA,93436,8,,,, +US-CA-93437,US,CA,93437,8,,,, +US-CA-93438,US,CA,93438,8,,,, +US-CA-93440,US,CA,93440,8,,,, +US-CA-93441,US,CA,93441,8,,,, +US-CA-93442,US,CA,93442,8,,,, +US-CA-93443,US,CA,93443,8,,,, +US-CA-93444,US,CA,93444,7.5,,,, +US-CA-93445,US,CA,93445,7.5,,,, +US-CA-93446,US,CA,93446,8,,,, +US-CA-93447,US,CA,93447,8,,,, +US-CA-93448,US,CA,93448,8,,,, +US-CA-93449,US,CA,93449,8,,,, +US-CA-93450,US,CA,93450,7.5,,,, +US-CA-93451,US,CA,93451,7.5,,,, +US-CA-93452,US,CA,93452,7.5,,,, +US-CA-93453,US,CA,93453,7.5,,,, +US-CA-93454,US,CA,93454,8.25,,,, +US-CA-93455,US,CA,93455,8,,,, +US-CA-93456,US,CA,93456,8.25,,,, +US-CA-93457,US,CA,93457,8,,,, +US-CA-93458,US,CA,93458,8.25,,,, +US-CA-93460,US,CA,93460,8,,,, +US-CA-93461,US,CA,93461,7.5,,,, +US-CA-93463,US,CA,93463,8,,,, +US-CA-93464,US,CA,93464,8,,,, +US-CA-93465,US,CA,93465,7.5,,,, +US-CA-93475,US,CA,93475,7.5,,,, +US-CA-93483,US,CA,93483,8,,,, +US-CA-93501,US,CA,93501,7.5,,,, +US-CA-93502,US,CA,93502,7.5,,,, +US-CA-93504,US,CA,93504,7.5,,,, +US-CA-93505,US,CA,93505,7.5,,,, +US-CA-93510,US,CA,93510,9,,,, +US-CA-93512,US,CA,93512,7.5,,,, +US-CA-93513,US,CA,93513,8,,,, +US-CA-93514,US,CA,93514,8,,,, +US-CA-93515,US,CA,93515,8,,,, +US-CA-93516,US,CA,93516,7.5,,,, +US-CA-93517,US,CA,93517,7.5,,,, +US-CA-93518,US,CA,93518,7.5,,,, +US-CA-93519,US,CA,93519,7.5,,,, +US-CA-93522,US,CA,93522,8,,,, +US-CA-93523,US,CA,93523,7.5,,,, +US-CA-93524,US,CA,93524,7.5,,,, +US-CA-93526,US,CA,93526,8,,,, +US-CA-93527,US,CA,93527,7.5,,,, +US-CA-93528,US,CA,93528,7.5,,,, +US-CA-93529,US,CA,93529,7.5,,,, +US-CA-93530,US,CA,93530,8,,,, +US-CA-93531,US,CA,93531,7.5,,,, +US-CA-93532,US,CA,93532,9,,,, +US-CA-93534,US,CA,93534,9,,,, +US-CA-93535,US,CA,93535,9,,,, +US-CA-93536,US,CA,93536,9,,,, +US-CA-93539,US,CA,93539,9,,,, +US-CA-93541,US,CA,93541,7.5,,,, +US-CA-93542,US,CA,93542,7.5,,,, +US-CA-93543,US,CA,93543,9,,,, +US-CA-93544,US,CA,93544,9,,,, +US-CA-93545,US,CA,93545,8,,,, +US-CA-93546,US,CA,93546,8,,,, +US-CA-93549,US,CA,93549,8,,,, +US-CA-93550,US,CA,93550,9,,,, +US-CA-93551,US,CA,93551,9,,,, +US-CA-93552,US,CA,93552,9,,,, +US-CA-93553,US,CA,93553,9,,,, +US-CA-93554,US,CA,93554,7.5,,,, +US-CA-93555,US,CA,93555,8.25,,,, +US-CA-93556,US,CA,93556,8.25,,,, +US-CA-93558,US,CA,93558,7.5,,,, +US-CA-93560,US,CA,93560,7.5,,,, +US-CA-93561,US,CA,93561,7.5,,,, +US-CA-93562,US,CA,93562,8,,,, +US-CA-93563,US,CA,93563,9,,,, +US-CA-93581,US,CA,93581,7.5,,,, +US-CA-93584,US,CA,93584,9,,,, +US-CA-93586,US,CA,93586,9,,,, +US-CA-93590,US,CA,93590,9,,,, +US-CA-93591,US,CA,93591,9,,,, +US-CA-93592,US,CA,93592,8,,,, +US-CA-93596,US,CA,93596,7.5,,,, +US-CA-93599,US,CA,93599,9,,,, +US-CA-93601,US,CA,93601,8,,,, +US-CA-93602,US,CA,93602,8.225,,,, +US-CA-93603,US,CA,93603,8,,,, +US-CA-93604,US,CA,93604,8,,,, +US-CA-93605,US,CA,93605,8.225,,,, +US-CA-93606,US,CA,93606,8.225,,,, +US-CA-93607,US,CA,93607,8.225,,,, +US-CA-93608,US,CA,93608,8.225,,,, +US-CA-93609,US,CA,93609,8.225,,,, +US-CA-93610,US,CA,93610,8,,,, +US-CA-93611,US,CA,93611,8.225,,,, +US-CA-93612,US,CA,93612,8.225,,,, +US-CA-93613,US,CA,93613,8.225,,,, +US-CA-93614,US,CA,93614,8,,,, +US-CA-93615,US,CA,93615,8,,,, +US-CA-93616,US,CA,93616,8.225,,,, +US-CA-93618,US,CA,93618,8.75,,,, +US-CA-93619,US,CA,93619,8.225,,,, +US-CA-93620,US,CA,93620,7.5,,,, +US-CA-93621,US,CA,93621,8.225,,,, +US-CA-93622,US,CA,93622,8.225,,,, +US-CA-93623,US,CA,93623,8,,,, +US-CA-93624,US,CA,93624,8.225,,,, +US-CA-93625,US,CA,93625,8.225,,,, +US-CA-93626,US,CA,93626,8,,,, +US-CA-93627,US,CA,93627,8.225,,,, +US-CA-93628,US,CA,93628,8.225,,,, +US-CA-93630,US,CA,93630,8.225,,,, +US-CA-93631,US,CA,93631,8.225,,,, +US-CA-93633,US,CA,93633,8,,,, +US-CA-93634,US,CA,93634,8.225,,,, +US-CA-93635,US,CA,93635,8,,,, +US-CA-93636,US,CA,93636,8,,,, +US-CA-93637,US,CA,93637,8,,,, +US-CA-93638,US,CA,93638,8,,,, +US-CA-93639,US,CA,93639,8,,,, +US-CA-93640,US,CA,93640,8.225,,,, +US-CA-93641,US,CA,93641,8.225,,,, +US-CA-93642,US,CA,93642,8.225,,,, +US-CA-93643,US,CA,93643,8,,,, +US-CA-93644,US,CA,93644,8,,,, +US-CA-93645,US,CA,93645,8,,,, +US-CA-93646,US,CA,93646,8.225,,,, +US-CA-93647,US,CA,93647,8,,,, +US-CA-93648,US,CA,93648,8.225,,,, +US-CA-93649,US,CA,93649,8.225,,,, +US-CA-93650,US,CA,93650,8.225,,,, +US-CA-93651,US,CA,93651,8.225,,,, +US-CA-93652,US,CA,93652,8.225,,,, +US-CA-93653,US,CA,93653,8,,,, +US-CA-93654,US,CA,93654,8.725,,,, +US-CA-93656,US,CA,93656,8.225,,,, +US-CA-93657,US,CA,93657,8.975,,,, +US-CA-93660,US,CA,93660,8.225,,,, +US-CA-93661,US,CA,93661,7.5,,,, +US-CA-93662,US,CA,93662,8.725,,,, +US-CA-93664,US,CA,93664,8.225,,,, +US-CA-93665,US,CA,93665,7.5,,,, +US-CA-93666,US,CA,93666,8,,,, +US-CA-93667,US,CA,93667,8.225,,,, +US-CA-93668,US,CA,93668,8.225,,,, +US-CA-93669,US,CA,93669,8,,,, +US-CA-93670,US,CA,93670,8,,,, +US-CA-93673,US,CA,93673,8,,,, +US-CA-93675,US,CA,93675,8.225,,,, +US-CA-93701,US,CA,93701,8.225,,,, +US-CA-93702,US,CA,93702,8.225,,,, +US-CA-93703,US,CA,93703,8.225,,,, +US-CA-93704,US,CA,93704,8.225,,,, +US-CA-93705,US,CA,93705,8.225,,,, +US-CA-93706,US,CA,93706,8.225,,,, +US-CA-93707,US,CA,93707,8.225,,,, +US-CA-93708,US,CA,93708,8.225,,,, +US-CA-93709,US,CA,93709,8.225,,,, +US-CA-93710,US,CA,93710,8.225,,,, +US-CA-93711,US,CA,93711,8.225,,,, +US-CA-93712,US,CA,93712,8.225,,,, +US-CA-93714,US,CA,93714,8.225,,,, +US-CA-93715,US,CA,93715,8.225,,,, +US-CA-93716,US,CA,93716,8.225,,,, +US-CA-93717,US,CA,93717,8.225,,,, +US-CA-93718,US,CA,93718,8.225,,,, +US-CA-93720,US,CA,93720,8.225,,,, +US-CA-93721,US,CA,93721,8.225,,,, +US-CA-93722,US,CA,93722,8.225,,,, +US-CA-93723,US,CA,93723,8.225,,,, +US-CA-93724,US,CA,93724,8.225,,,, +US-CA-93725,US,CA,93725,8.225,,,, +US-CA-93726,US,CA,93726,8.225,,,, +US-CA-93727,US,CA,93727,8.225,,,, +US-CA-93728,US,CA,93728,8.225,,,, +US-CA-93729,US,CA,93729,8.225,,,, +US-CA-93730,US,CA,93730,8.225,,,, +US-CA-93737,US,CA,93737,8.225,,,, +US-CA-93740,US,CA,93740,8.225,,,, +US-CA-93741,US,CA,93741,8.225,,,, +US-CA-93744,US,CA,93744,8.225,,,, +US-CA-93745,US,CA,93745,8.225,,,, +US-CA-93747,US,CA,93747,8.225,,,, +US-CA-93750,US,CA,93750,8.225,,,, +US-CA-93755,US,CA,93755,8.225,,,, +US-CA-93760,US,CA,93760,8.225,,,, +US-CA-93761,US,CA,93761,8.225,,,, +US-CA-93764,US,CA,93764,8.225,,,, +US-CA-93765,US,CA,93765,8.225,,,, +US-CA-93771,US,CA,93771,8.225,,,, +US-CA-93772,US,CA,93772,8.225,,,, +US-CA-93773,US,CA,93773,8.225,,,, +US-CA-93774,US,CA,93774,8.225,,,, +US-CA-93775,US,CA,93775,8.225,,,, +US-CA-93776,US,CA,93776,8.225,,,, +US-CA-93777,US,CA,93777,8.225,,,, +US-CA-93778,US,CA,93778,8.225,,,, +US-CA-93779,US,CA,93779,8.225,,,, +US-CA-93786,US,CA,93786,8.225,,,, +US-CA-93790,US,CA,93790,8.225,,,, +US-CA-93791,US,CA,93791,8.225,,,, +US-CA-93792,US,CA,93792,8.225,,,, +US-CA-93793,US,CA,93793,8.225,,,, +US-CA-93794,US,CA,93794,8.225,,,, +US-CA-93844,US,CA,93844,8.225,,,, +US-CA-93888,US,CA,93888,8.225,,,, +US-CA-93901,US,CA,93901,8,,,, +US-CA-93902,US,CA,93902,8,,,, +US-CA-93905,US,CA,93905,8,,,, +US-CA-93906,US,CA,93906,8,,,, +US-CA-93907,US,CA,93907,7.5,,,, +US-CA-93908,US,CA,93908,7.5,,,, +US-CA-93912,US,CA,93912,8,,,, +US-CA-93915,US,CA,93915,8,,,, +US-CA-93920,US,CA,93920,7.5,,,, +US-CA-93921,US,CA,93921,7.5,,,, +US-CA-93922,US,CA,93922,7.5,,,, +US-CA-93923,US,CA,93923,7.5,,,, +US-CA-93924,US,CA,93924,7.5,,,, +US-CA-93925,US,CA,93925,7.5,,,, +US-CA-93926,US,CA,93926,7.5,,,, +US-CA-93927,US,CA,93927,8.5,,,, +US-CA-93928,US,CA,93928,7.5,,,, +US-CA-93930,US,CA,93930,7.5,,,, +US-CA-93932,US,CA,93932,7.5,,,, +US-CA-93933,US,CA,93933,8.5,,,, +US-CA-93940,US,CA,93940,7.5,,,, +US-CA-93942,US,CA,93942,7.5,,,, +US-CA-93943,US,CA,93943,7.5,,,, +US-CA-93944,US,CA,93944,7.5,,,, +US-CA-93950,US,CA,93950,8.5,,,, +US-CA-93953,US,CA,93953,7.5,,,, +US-CA-93954,US,CA,93954,7.5,,,, +US-CA-93955,US,CA,93955,8.5,,,, +US-CA-93960,US,CA,93960,8.5,,,, +US-CA-93962,US,CA,93962,7.5,,,, +US-CA-94002,US,CA,94002,9,,,, +US-CA-94005,US,CA,94005,9,,,, +US-CA-94010,US,CA,94010,9,,,, +US-CA-94011,US,CA,94011,9,,,, +US-CA-94014,US,CA,94014,9,,,, +US-CA-94015,US,CA,94015,9,,,, +US-CA-94016,US,CA,94016,9,,,, +US-CA-94017,US,CA,94017,9,,,, +US-CA-94018,US,CA,94018,9,,,, +US-CA-94019,US,CA,94019,9.5,,,, +US-CA-94020,US,CA,94020,9,,,, +US-CA-94021,US,CA,94021,9,,,, +US-CA-94022,US,CA,94022,8.75,,,, +US-CA-94023,US,CA,94023,8.75,,,, +US-CA-94024,US,CA,94024,8.75,,,, +US-CA-94025,US,CA,94025,9,,,, +US-CA-94026,US,CA,94026,9,,,, +US-CA-94027,US,CA,94027,9,,,, +US-CA-94028,US,CA,94028,9,,,, +US-CA-94030,US,CA,94030,9,,,, +US-CA-94035,US,CA,94035,8.75,,,, +US-CA-94037,US,CA,94037,9,,,, +US-CA-94038,US,CA,94038,9,,,, +US-CA-94039,US,CA,94039,8.75,,,, +US-CA-94040,US,CA,94040,8.75,,,, +US-CA-94041,US,CA,94041,8.75,,,, +US-CA-94042,US,CA,94042,8.75,,,, +US-CA-94043,US,CA,94043,8.75,,,, +US-CA-94044,US,CA,94044,9,,,, +US-CA-94060,US,CA,94060,9,,,, +US-CA-94061,US,CA,94061,9,,,, +US-CA-94062,US,CA,94062,9,,,, +US-CA-94063,US,CA,94063,9,,,, +US-CA-94064,US,CA,94064,9,,,, +US-CA-94065,US,CA,94065,9,,,, +US-CA-94066,US,CA,94066,9,,,, +US-CA-94070,US,CA,94070,9,,,, +US-CA-94074,US,CA,94074,9,,,, +US-CA-94080,US,CA,94080,9,,,, +US-CA-94083,US,CA,94083,9,,,, +US-CA-94085,US,CA,94085,8.75,,,, +US-CA-94086,US,CA,94086,8.75,,,, +US-CA-94087,US,CA,94087,8.75,,,, +US-CA-94088,US,CA,94088,8.75,,,, +US-CA-94089,US,CA,94089,8.75,,,, +US-CA-94102,US,CA,94102,8.75,,,, +US-CA-94103,US,CA,94103,8.75,,,, +US-CA-94104,US,CA,94104,8.75,,,, +US-CA-94105,US,CA,94105,8.75,,,, +US-CA-94107,US,CA,94107,8.75,,,, +US-CA-94108,US,CA,94108,8.75,,,, +US-CA-94109,US,CA,94109,8.75,,,, +US-CA-94110,US,CA,94110,8.75,,,, +US-CA-94111,US,CA,94111,8.75,,,, +US-CA-94112,US,CA,94112,8.75,,,, +US-CA-94114,US,CA,94114,8.75,,,, +US-CA-94115,US,CA,94115,8.75,,,, +US-CA-94116,US,CA,94116,8.75,,,, +US-CA-94117,US,CA,94117,8.75,,,, +US-CA-94118,US,CA,94118,8.75,,,, +US-CA-94119,US,CA,94119,8.75,,,, +US-CA-94120,US,CA,94120,8.75,,,, +US-CA-94121,US,CA,94121,8.75,,,, +US-CA-94122,US,CA,94122,8.75,,,, +US-CA-94123,US,CA,94123,8.75,,,, +US-CA-94124,US,CA,94124,8.75,,,, +US-CA-94125,US,CA,94125,8.75,,,, +US-CA-94126,US,CA,94126,8.75,,,, +US-CA-94127,US,CA,94127,8.75,,,, +US-CA-94128,US,CA,94128,9,,,, +US-CA-94129,US,CA,94129,8.75,,,, +US-CA-94130,US,CA,94130,8.75,,,, +US-CA-94131,US,CA,94131,8.75,,,, +US-CA-94132,US,CA,94132,8.75,,,, +US-CA-94133,US,CA,94133,8.75,,,, +US-CA-94134,US,CA,94134,8.75,,,, +US-CA-94137,US,CA,94137,8.75,,,, +US-CA-94139,US,CA,94139,8.75,,,, +US-CA-94140,US,CA,94140,8.75,,,, +US-CA-94141,US,CA,94141,8.75,,,, +US-CA-94142,US,CA,94142,8.75,,,, +US-CA-94143,US,CA,94143,8.75,,,, +US-CA-94144,US,CA,94144,8.75,,,, +US-CA-94145,US,CA,94145,8.75,,,, +US-CA-94146,US,CA,94146,8.75,,,, +US-CA-94147,US,CA,94147,8.75,,,, +US-CA-94151,US,CA,94151,8.75,,,, +US-CA-94153,US,CA,94153,8.75,,,, +US-CA-94154,US,CA,94154,8.75,,,, +US-CA-94158,US,CA,94158,8.75,,,, +US-CA-94159,US,CA,94159,8.75,,,, +US-CA-94160,US,CA,94160,8.75,,,, +US-CA-94161,US,CA,94161,8.75,,,, +US-CA-94163,US,CA,94163,8.75,,,, +US-CA-94164,US,CA,94164,8.75,,,, +US-CA-94171,US,CA,94171,8.75,,,, +US-CA-94172,US,CA,94172,8.75,,,, +US-CA-94177,US,CA,94177,8.75,,,, +US-CA-94188,US,CA,94188,8.75,,,, +US-CA-94203,US,CA,94203,8,,,, +US-CA-94204,US,CA,94204,8.5,,,, +US-CA-94205,US,CA,94205,8,,,, +US-CA-94206,US,CA,94206,8,,,, +US-CA-94207,US,CA,94207,8.5,,,, +US-CA-94208,US,CA,94208,8.5,,,, +US-CA-94209,US,CA,94209,8.5,,,, +US-CA-94211,US,CA,94211,8.5,,,, +US-CA-94229,US,CA,94229,8.5,,,, +US-CA-94230,US,CA,94230,8,,,, +US-CA-94232,US,CA,94232,8,,,, +US-CA-94234,US,CA,94234,8.5,,,, +US-CA-94235,US,CA,94235,8.5,,,, +US-CA-94236,US,CA,94236,8.5,,,, +US-CA-94237,US,CA,94237,8.5,,,, +US-CA-94239,US,CA,94239,8,,,, +US-CA-94240,US,CA,94240,8,,,, +US-CA-94244,US,CA,94244,8,,,, +US-CA-94245,US,CA,94245,8.5,,,, +US-CA-94246,US,CA,94246,8,,,, +US-CA-94247,US,CA,94247,8,,,, +US-CA-94248,US,CA,94248,8.5,,,, +US-CA-94249,US,CA,94249,8.5,,,, +US-CA-94250,US,CA,94250,8,,,, +US-CA-94252,US,CA,94252,8.5,,,, +US-CA-94254,US,CA,94254,8,,,, +US-CA-94256,US,CA,94256,8,,,, +US-CA-94257,US,CA,94257,8,,,, +US-CA-94258,US,CA,94258,8,,,, +US-CA-94259,US,CA,94259,8,,,, +US-CA-94261,US,CA,94261,8,,,, +US-CA-94262,US,CA,94262,8,,,, +US-CA-94263,US,CA,94263,8,,,, +US-CA-94267,US,CA,94267,8,,,, +US-CA-94268,US,CA,94268,8.5,,,, +US-CA-94269,US,CA,94269,8,,,, +US-CA-94271,US,CA,94271,8.5,,,, +US-CA-94273,US,CA,94273,8.5,,,, +US-CA-94274,US,CA,94274,8.5,,,, +US-CA-94277,US,CA,94277,8.5,,,, +US-CA-94278,US,CA,94278,8.5,,,, +US-CA-94279,US,CA,94279,8.5,,,, +US-CA-94280,US,CA,94280,8,,,, +US-CA-94282,US,CA,94282,8,,,, +US-CA-94283,US,CA,94283,8.5,,,, +US-CA-94284,US,CA,94284,8,,,, +US-CA-94285,US,CA,94285,8,,,, +US-CA-94286,US,CA,94286,8.5,,,, +US-CA-94287,US,CA,94287,8,,,, +US-CA-94288,US,CA,94288,8.5,,,, +US-CA-94289,US,CA,94289,8,,,, +US-CA-94290,US,CA,94290,8,,,, +US-CA-94291,US,CA,94291,8.5,,,, +US-CA-94293,US,CA,94293,8,,,, +US-CA-94294,US,CA,94294,8,,,, +US-CA-94295,US,CA,94295,8.5,,,, +US-CA-94296,US,CA,94296,8.5,,,, +US-CA-94297,US,CA,94297,8,,,, +US-CA-94298,US,CA,94298,8,,,, +US-CA-94299,US,CA,94299,8.5,,,, +US-CA-94301,US,CA,94301,8.75,,,, +US-CA-94302,US,CA,94302,8.75,,,, +US-CA-94303,US,CA,94303,8.75,,,, +US-CA-94304,US,CA,94304,8.75,,,, +US-CA-94305,US,CA,94305,8.75,,,, +US-CA-94306,US,CA,94306,8.75,,,, +US-CA-94309,US,CA,94309,8.75,,,, +US-CA-94401,US,CA,94401,9.25,,,, +US-CA-94402,US,CA,94402,9.25,,,, +US-CA-94403,US,CA,94403,9.25,,,, +US-CA-94404,US,CA,94404,9,,,, +US-CA-94497,US,CA,94497,9.25,,,, +US-CA-94501,US,CA,94501,9,,,, +US-CA-94502,US,CA,94502,9,,,, +US-CA-94503,US,CA,94503,8,,,, +US-CA-94505,US,CA,94505,8.5,,,, +US-CA-94506,US,CA,94506,8.5,,,, +US-CA-94507,US,CA,94507,8.5,,,, +US-CA-94508,US,CA,94508,8,,,, +US-CA-94509,US,CA,94509,8.5,,,, +US-CA-94510,US,CA,94510,7.625,,,, +US-CA-94511,US,CA,94511,8.5,,,, +US-CA-94512,US,CA,94512,7.625,,,, +US-CA-94513,US,CA,94513,8.5,,,, +US-CA-94514,US,CA,94514,8.5,,,, +US-CA-94515,US,CA,94515,8,,,, +US-CA-94516,US,CA,94516,8.5,,,, +US-CA-94517,US,CA,94517,8.5,,,, +US-CA-94518,US,CA,94518,9,,,, +US-CA-94519,US,CA,94519,9,,,, +US-CA-94520,US,CA,94520,9,,,, +US-CA-94521,US,CA,94521,9,,,, +US-CA-94522,US,CA,94522,9,,,, +US-CA-94523,US,CA,94523,8.5,,,, +US-CA-94524,US,CA,94524,9,,,, +US-CA-94525,US,CA,94525,8.5,,,, +US-CA-94526,US,CA,94526,8.5,,,, +US-CA-94527,US,CA,94527,9,,,, +US-CA-94528,US,CA,94528,8.5,,,, +US-CA-94529,US,CA,94529,9,,,, +US-CA-94530,US,CA,94530,9.5,,,, +US-CA-94531,US,CA,94531,8.5,,,, +US-CA-94533,US,CA,94533,8.625,,,, +US-CA-94534,US,CA,94534,8.625,,,, +US-CA-94535,US,CA,94535,8.625,,,, +US-CA-94536,US,CA,94536,9,,,, +US-CA-94537,US,CA,94537,9,,,, +US-CA-94538,US,CA,94538,9,,,, +US-CA-94539,US,CA,94539,9,,,, +US-CA-94540,US,CA,94540,9,,,, +US-CA-94541,US,CA,94541,9,,,, +US-CA-94542,US,CA,94542,9,,,, +US-CA-94543,US,CA,94543,9,,,, +US-CA-94544,US,CA,94544,9,,,, +US-CA-94545,US,CA,94545,9,,,, +US-CA-94546,US,CA,94546,9,,,, +US-CA-94547,US,CA,94547,9,,,, +US-CA-94548,US,CA,94548,8.5,,,, +US-CA-94549,US,CA,94549,8.5,,,, +US-CA-94550,US,CA,94550,9,,,, +US-CA-94551,US,CA,94551,9,,,, +US-CA-94552,US,CA,94552,9,,,, +US-CA-94553,US,CA,94553,8.5,,,, +US-CA-94555,US,CA,94555,9,,,, +US-CA-94556,US,CA,94556,9.5,,,, +US-CA-94557,US,CA,94557,9,,,, +US-CA-94558,US,CA,94558,8,,,, +US-CA-94559,US,CA,94559,8,,,, +US-CA-94560,US,CA,94560,9,,,, +US-CA-94561,US,CA,94561,8.5,,,, +US-CA-94562,US,CA,94562,8,,,, +US-CA-94563,US,CA,94563,9,,,, +US-CA-94564,US,CA,94564,9,,,, +US-CA-94565,US,CA,94565,9,,,, +US-CA-94566,US,CA,94566,9,,,, +US-CA-94567,US,CA,94567,8,,,, +US-CA-94568,US,CA,94568,9,,,, +US-CA-94569,US,CA,94569,8.5,,,, +US-CA-94570,US,CA,94570,9.5,,,, +US-CA-94571,US,CA,94571,8.375,,,, +US-CA-94572,US,CA,94572,8.5,,,, +US-CA-94573,US,CA,94573,8,,,, +US-CA-94574,US,CA,94574,8,,,, +US-CA-94575,US,CA,94575,9.5,,,, +US-CA-94576,US,CA,94576,8,,,, +US-CA-94577,US,CA,94577,9.25,,,, +US-CA-94578,US,CA,94578,9.25,,,, +US-CA-94579,US,CA,94579,9.25,,,, +US-CA-94580,US,CA,94580,9,,,, +US-CA-94581,US,CA,94581,8,,,, +US-CA-94582,US,CA,94582,8.5,,,, +US-CA-94583,US,CA,94583,8.5,,,, +US-CA-94585,US,CA,94585,7.625,,,, +US-CA-94586,US,CA,94586,9,,,, +US-CA-94587,US,CA,94587,9.5,,,, +US-CA-94588,US,CA,94588,9,,,, +US-CA-94589,US,CA,94589,8.625,,,, +US-CA-94590,US,CA,94590,8.625,,,, +US-CA-94591,US,CA,94591,8.625,,,, +US-CA-94592,US,CA,94592,8.625,,,, +US-CA-94595,US,CA,94595,8.5,,,, +US-CA-94596,US,CA,94596,8.5,,,, +US-CA-94597,US,CA,94597,8.5,,,, +US-CA-94598,US,CA,94598,8.5,,,, +US-CA-94599,US,CA,94599,8,,,, +US-CA-94601,US,CA,94601,9,,,, +US-CA-94602,US,CA,94602,9,,,, +US-CA-94603,US,CA,94603,9,,,, +US-CA-94604,US,CA,94604,9,,,, +US-CA-94605,US,CA,94605,9,,,, +US-CA-94606,US,CA,94606,9,,,, +US-CA-94607,US,CA,94607,9,,,, +US-CA-94608,US,CA,94608,9,,,, +US-CA-94609,US,CA,94609,9,,,, +US-CA-94610,US,CA,94610,9,,,, +US-CA-94611,US,CA,94611,9,,,, +US-CA-94612,US,CA,94612,9,,,, +US-CA-94613,US,CA,94613,9,,,, +US-CA-94614,US,CA,94614,9,,,, +US-CA-94615,US,CA,94615,9,,,, +US-CA-94617,US,CA,94617,9,,,, +US-CA-94618,US,CA,94618,9,,,, +US-CA-94619,US,CA,94619,9,,,, +US-CA-94620,US,CA,94620,9,,,, +US-CA-94621,US,CA,94621,9,,,, +US-CA-94622,US,CA,94622,9,,,, +US-CA-94623,US,CA,94623,9,,,, +US-CA-94624,US,CA,94624,9,,,, +US-CA-94649,US,CA,94649,9,,,, +US-CA-94659,US,CA,94659,9,,,, +US-CA-94660,US,CA,94660,9,,,, +US-CA-94661,US,CA,94661,9,,,, +US-CA-94662,US,CA,94662,9,,,, +US-CA-94666,US,CA,94666,9,,,, +US-CA-94701,US,CA,94701,9,,,, +US-CA-94702,US,CA,94702,9,,,, +US-CA-94703,US,CA,94703,9,,,, +US-CA-94704,US,CA,94704,9,,,, +US-CA-94705,US,CA,94705,9,,,, +US-CA-94706,US,CA,94706,9.5,,,, +US-CA-94707,US,CA,94707,9,,,, +US-CA-94708,US,CA,94708,9,,,, +US-CA-94709,US,CA,94709,9,,,, +US-CA-94710,US,CA,94710,9,,,, +US-CA-94712,US,CA,94712,9,,,, +US-CA-94720,US,CA,94720,9,,,, +US-CA-94801,US,CA,94801,9,,,, +US-CA-94802,US,CA,94802,9,,,, +US-CA-94803,US,CA,94803,8.5,,,, +US-CA-94804,US,CA,94804,9,,,, +US-CA-94805,US,CA,94805,9,,,, +US-CA-94806,US,CA,94806,9,,,, +US-CA-94807,US,CA,94807,9,,,, +US-CA-94808,US,CA,94808,9,,,, +US-CA-94820,US,CA,94820,8.5,,,, +US-CA-94850,US,CA,94850,9,,,, +US-CA-94901,US,CA,94901,9,,,, +US-CA-94903,US,CA,94903,9,,,, +US-CA-94904,US,CA,94904,8.5,,,, +US-CA-94912,US,CA,94912,9,,,, +US-CA-94913,US,CA,94913,9,,,, +US-CA-94914,US,CA,94914,8.5,,,, +US-CA-94915,US,CA,94915,9,,,, +US-CA-94920,US,CA,94920,8.5,,,, +US-CA-94922,US,CA,94922,8.25,,,, +US-CA-94923,US,CA,94923,8.25,,,, +US-CA-94924,US,CA,94924,8.5,,,, +US-CA-94925,US,CA,94925,8.5,,,, +US-CA-94926,US,CA,94926,8.75,,,, +US-CA-94927,US,CA,94927,8.75,,,, +US-CA-94928,US,CA,94928,8.75,,,, +US-CA-94929,US,CA,94929,8.5,,,, +US-CA-94930,US,CA,94930,9,,,, +US-CA-94931,US,CA,94931,8.75,,,, +US-CA-94933,US,CA,94933,8.5,,,, +US-CA-94937,US,CA,94937,8.5,,,, +US-CA-94938,US,CA,94938,8.5,,,, +US-CA-94939,US,CA,94939,8.5,,,, +US-CA-94940,US,CA,94940,8.5,,,, +US-CA-94941,US,CA,94941,8.5,,,, +US-CA-94942,US,CA,94942,8.5,,,, +US-CA-94945,US,CA,94945,9,,,, +US-CA-94946,US,CA,94946,8.5,,,, +US-CA-94947,US,CA,94947,9,,,, +US-CA-94948,US,CA,94948,9,,,, +US-CA-94949,US,CA,94949,9,,,, +US-CA-94950,US,CA,94950,8.5,,,, +US-CA-94951,US,CA,94951,8.25,,,, +US-CA-94952,US,CA,94952,8.25,,,, +US-CA-94953,US,CA,94953,8.25,,,, +US-CA-94954,US,CA,94954,8.25,,,, +US-CA-94955,US,CA,94955,8.25,,,, +US-CA-94956,US,CA,94956,8.5,,,, +US-CA-94957,US,CA,94957,8.5,,,, +US-CA-94960,US,CA,94960,8.5,,,, +US-CA-94963,US,CA,94963,8.5,,,, +US-CA-94964,US,CA,94964,8.5,,,, +US-CA-94965,US,CA,94965,8.5,,,, +US-CA-94966,US,CA,94966,8.5,,,, +US-CA-94970,US,CA,94970,8.5,,,, +US-CA-94971,US,CA,94971,8.5,,,, +US-CA-94972,US,CA,94972,8.25,,,, +US-CA-94973,US,CA,94973,8.5,,,, +US-CA-94974,US,CA,94974,8.5,,,, +US-CA-94975,US,CA,94975,8.25,,,, +US-CA-94976,US,CA,94976,8.5,,,, +US-CA-94977,US,CA,94977,8.5,,,, +US-CA-94978,US,CA,94978,9,,,, +US-CA-94979,US,CA,94979,8.5,,,, +US-CA-94998,US,CA,94998,9,,,, +US-CA-94999,US,CA,94999,8.25,,,, +US-CA-95001,US,CA,95001,8.25,,,, +US-CA-95002,US,CA,95002,8.75,,,, +US-CA-95003,US,CA,95003,8.25,,,, +US-CA-95004,US,CA,95004,7.5,,,, +US-CA-95005,US,CA,95005,8.25,,,, +US-CA-95006,US,CA,95006,8.25,,,, +US-CA-95007,US,CA,95007,8.25,,,, +US-CA-95008,US,CA,95008,9,,,, +US-CA-95009,US,CA,95009,9,,,, +US-CA-95010,US,CA,95010,8.75,,,, +US-CA-95011,US,CA,95011,9,,,, +US-CA-95012,US,CA,95012,7.5,,,, +US-CA-95013,US,CA,95013,8.75,,,, +US-CA-95014,US,CA,95014,8.75,,,, +US-CA-95015,US,CA,95015,8.75,,,, +US-CA-95017,US,CA,95017,8.25,,,, +US-CA-95018,US,CA,95018,8.25,,,, +US-CA-95019,US,CA,95019,8.5,,,, +US-CA-95020,US,CA,95020,8.75,,,, +US-CA-95021,US,CA,95021,8.75,,,, +US-CA-95023,US,CA,95023,8.5,,,, +US-CA-95024,US,CA,95024,8.5,,,, +US-CA-95026,US,CA,95026,8.75,,,, +US-CA-95030,US,CA,95030,8.75,,,, +US-CA-95031,US,CA,95031,8.75,,,, +US-CA-95032,US,CA,95032,8.75,,,, +US-CA-95033,US,CA,95033,8.25,,,, +US-CA-95035,US,CA,95035,8.75,,,, +US-CA-95036,US,CA,95036,8.75,,,, +US-CA-95037,US,CA,95037,8.75,,,, +US-CA-95038,US,CA,95038,8.75,,,, +US-CA-95039,US,CA,95039,7.5,,,, +US-CA-95041,US,CA,95041,8.25,,,, +US-CA-95042,US,CA,95042,8.75,,,, +US-CA-95043,US,CA,95043,7.5,,,, +US-CA-95044,US,CA,95044,8.75,,,, +US-CA-95045,US,CA,95045,7.5,,,, +US-CA-95046,US,CA,95046,8.75,,,, +US-CA-95050,US,CA,95050,8.75,,,, +US-CA-95051,US,CA,95051,8.75,,,, +US-CA-95052,US,CA,95052,8.75,,,, +US-CA-95053,US,CA,95053,8.75,,,, +US-CA-95054,US,CA,95054,8.75,,,, +US-CA-95055,US,CA,95055,8.75,,,, +US-CA-95056,US,CA,95056,8.75,,,, +US-CA-95060,US,CA,95060,8.75,,,, +US-CA-95061,US,CA,95061,8.75,,,, +US-CA-95062,US,CA,95062,8.25,,,, +US-CA-95063,US,CA,95063,8.75,,,, +US-CA-95064,US,CA,95064,8.75,,,, +US-CA-95065,US,CA,95065,8.25,,,, +US-CA-95066,US,CA,95066,8.25,,,, +US-CA-95067,US,CA,95067,8.25,,,, +US-CA-95070,US,CA,95070,8.75,,,, +US-CA-95071,US,CA,95071,8.75,,,, +US-CA-95073,US,CA,95073,8.25,,,, +US-CA-95075,US,CA,95075,7.5,,,, +US-CA-95076,US,CA,95076,8.5,,,, +US-CA-95077,US,CA,95077,8.5,,,, +US-CA-95101,US,CA,95101,8.75,,,, +US-CA-95103,US,CA,95103,8.75,,,, +US-CA-95106,US,CA,95106,8.75,,,, +US-CA-95108,US,CA,95108,8.75,,,, +US-CA-95109,US,CA,95109,8.75,,,, +US-CA-95110,US,CA,95110,8.75,,,, +US-CA-95111,US,CA,95111,8.75,,,, +US-CA-95112,US,CA,95112,8.75,,,, +US-CA-95113,US,CA,95113,8.75,,,, +US-CA-95115,US,CA,95115,8.75,,,, +US-CA-95116,US,CA,95116,8.75,,,, +US-CA-95117,US,CA,95117,8.75,,,, +US-CA-95118,US,CA,95118,8.75,,,, +US-CA-95119,US,CA,95119,8.75,,,, +US-CA-95120,US,CA,95120,8.75,,,, +US-CA-95121,US,CA,95121,8.75,,,, +US-CA-95122,US,CA,95122,8.75,,,, +US-CA-95123,US,CA,95123,8.75,,,, +US-CA-95124,US,CA,95124,8.75,,,, +US-CA-95125,US,CA,95125,8.75,,,, +US-CA-95126,US,CA,95126,8.75,,,, +US-CA-95127,US,CA,95127,8.75,,,, +US-CA-95128,US,CA,95128,8.75,,,, +US-CA-95129,US,CA,95129,8.75,,,, +US-CA-95130,US,CA,95130,8.75,,,, +US-CA-95131,US,CA,95131,8.75,,,, +US-CA-95132,US,CA,95132,8.75,,,, +US-CA-95133,US,CA,95133,8.75,,,, +US-CA-95134,US,CA,95134,8.75,,,, +US-CA-95135,US,CA,95135,8.75,,,, +US-CA-95136,US,CA,95136,8.75,,,, +US-CA-95138,US,CA,95138,8.75,,,, +US-CA-95139,US,CA,95139,8.75,,,, +US-CA-95140,US,CA,95140,8.75,,,, +US-CA-95141,US,CA,95141,8.75,,,, +US-CA-95148,US,CA,95148,8.75,,,, +US-CA-95150,US,CA,95150,8.75,,,, +US-CA-95151,US,CA,95151,8.75,,,, +US-CA-95152,US,CA,95152,8.75,,,, +US-CA-95153,US,CA,95153,8.75,,,, +US-CA-95154,US,CA,95154,8.75,,,, +US-CA-95155,US,CA,95155,8.75,,,, +US-CA-95156,US,CA,95156,8.75,,,, +US-CA-95157,US,CA,95157,8.75,,,, +US-CA-95158,US,CA,95158,8.75,,,, +US-CA-95159,US,CA,95159,8.75,,,, +US-CA-95160,US,CA,95160,8.75,,,, +US-CA-95161,US,CA,95161,8.75,,,, +US-CA-95164,US,CA,95164,8.75,,,, +US-CA-95170,US,CA,95170,8.75,,,, +US-CA-95172,US,CA,95172,8.75,,,, +US-CA-95173,US,CA,95173,8.75,,,, +US-CA-95190,US,CA,95190,8.75,,,, +US-CA-95191,US,CA,95191,8.75,,,, +US-CA-95192,US,CA,95192,8.75,,,, +US-CA-95193,US,CA,95193,8.75,,,, +US-CA-95194,US,CA,95194,8.75,,,, +US-CA-95196,US,CA,95196,8.75,,,, +US-CA-95201,US,CA,95201,8,,,, +US-CA-95202,US,CA,95202,8.25,,,, +US-CA-95203,US,CA,95203,8.25,,,, +US-CA-95204,US,CA,95204,8.25,,,, +US-CA-95205,US,CA,95205,8.25,,,, +US-CA-95206,US,CA,95206,8.25,,,, +US-CA-95207,US,CA,95207,8.25,,,, +US-CA-95208,US,CA,95208,8,,,, +US-CA-95209,US,CA,95209,8.25,,,, +US-CA-95210,US,CA,95210,8.25,,,, +US-CA-95211,US,CA,95211,8.25,,,, +US-CA-95212,US,CA,95212,8,,,, +US-CA-95213,US,CA,95213,8,,,, +US-CA-95215,US,CA,95215,8,,,, +US-CA-95219,US,CA,95219,8.25,,,, +US-CA-95220,US,CA,95220,8,,,, +US-CA-95221,US,CA,95221,7.5,,,, +US-CA-95222,US,CA,95222,7.5,,,, +US-CA-95223,US,CA,95223,7.5,,,, +US-CA-95224,US,CA,95224,7.5,,,, +US-CA-95225,US,CA,95225,7.5,,,, +US-CA-95226,US,CA,95226,7.5,,,, +US-CA-95227,US,CA,95227,8,,,, +US-CA-95228,US,CA,95228,7.5,,,, +US-CA-95229,US,CA,95229,7.5,,,, +US-CA-95230,US,CA,95230,8,,,, +US-CA-95231,US,CA,95231,8,,,, +US-CA-95232,US,CA,95232,7.5,,,, +US-CA-95233,US,CA,95233,7.5,,,, +US-CA-95234,US,CA,95234,8,,,, +US-CA-95236,US,CA,95236,8,,,, +US-CA-95237,US,CA,95237,8,,,, +US-CA-95240,US,CA,95240,8,,,, +US-CA-95241,US,CA,95241,8,,,, +US-CA-95242,US,CA,95242,8,,,, +US-CA-95245,US,CA,95245,7.5,,,, +US-CA-95246,US,CA,95246,7.5,,,, +US-CA-95247,US,CA,95247,7.5,,,, +US-CA-95248,US,CA,95248,7.5,,,, +US-CA-95249,US,CA,95249,7.5,,,, +US-CA-95251,US,CA,95251,7.5,,,, +US-CA-95252,US,CA,95252,7.5,,,, +US-CA-95253,US,CA,95253,8,,,, +US-CA-95254,US,CA,95254,7.5,,,, +US-CA-95255,US,CA,95255,7.5,,,, +US-CA-95257,US,CA,95257,7.5,,,, +US-CA-95258,US,CA,95258,8,,,, +US-CA-95267,US,CA,95267,8.25,,,, +US-CA-95269,US,CA,95269,8.25,,,, +US-CA-95296,US,CA,95296,8,,,, +US-CA-95297,US,CA,95297,8.25,,,, +US-CA-95301,US,CA,95301,8,,,, +US-CA-95303,US,CA,95303,7.5,,,, +US-CA-95304,US,CA,95304,8,,,, +US-CA-95305,US,CA,95305,7.5,,,, +US-CA-95306,US,CA,95306,8,,,, +US-CA-95307,US,CA,95307,8.125,,,, +US-CA-95309,US,CA,95309,7.5,,,, +US-CA-95310,US,CA,95310,7.5,,,, +US-CA-95311,US,CA,95311,8,,,, +US-CA-95312,US,CA,95312,7.5,,,, +US-CA-95313,US,CA,95313,7.625,,,, +US-CA-95315,US,CA,95315,7.5,,,, +US-CA-95316,US,CA,95316,7.625,,,, +US-CA-95317,US,CA,95317,7.5,,,, +US-CA-95318,US,CA,95318,8,,,, +US-CA-95319,US,CA,95319,7.625,,,, +US-CA-95320,US,CA,95320,8,,,, +US-CA-95321,US,CA,95321,7.5,,,, +US-CA-95322,US,CA,95322,8,,,, +US-CA-95323,US,CA,95323,7.625,,,, +US-CA-95324,US,CA,95324,7.5,,,, +US-CA-95325,US,CA,95325,8,,,, +US-CA-95326,US,CA,95326,7.625,,,, +US-CA-95327,US,CA,95327,7.5,,,, +US-CA-95328,US,CA,95328,7.625,,,, +US-CA-95329,US,CA,95329,7.5,,,, +US-CA-95330,US,CA,95330,9,,,, +US-CA-95333,US,CA,95333,7.5,,,, +US-CA-95334,US,CA,95334,7.5,,,, +US-CA-95335,US,CA,95335,7.5,,,, +US-CA-95336,US,CA,95336,8.5,,,, +US-CA-95337,US,CA,95337,8.5,,,, +US-CA-95338,US,CA,95338,8,,,, +US-CA-95340,US,CA,95340,8,,,, +US-CA-95341,US,CA,95341,8,,,, +US-CA-95343,US,CA,95343,7.5,,,, +US-CA-95344,US,CA,95344,8,,,, +US-CA-95345,US,CA,95345,8,,,, +US-CA-95346,US,CA,95346,7.5,,,, +US-CA-95347,US,CA,95347,7.5,,,, +US-CA-95348,US,CA,95348,8,,,, +US-CA-95350,US,CA,95350,7.625,,,, +US-CA-95351,US,CA,95351,7.625,,,, +US-CA-95352,US,CA,95352,7.625,,,, +US-CA-95353,US,CA,95353,7.625,,,, +US-CA-95354,US,CA,95354,7.625,,,, +US-CA-95355,US,CA,95355,7.625,,,, +US-CA-95356,US,CA,95356,7.625,,,, +US-CA-95357,US,CA,95357,7.625,,,, +US-CA-95358,US,CA,95358,7.625,,,, +US-CA-95360,US,CA,95360,7.625,,,, +US-CA-95361,US,CA,95361,8.125,,,, +US-CA-95363,US,CA,95363,7.625,,,, +US-CA-95364,US,CA,95364,7.5,,,, +US-CA-95365,US,CA,95365,7.5,,,, +US-CA-95366,US,CA,95366,8,,,, +US-CA-95367,US,CA,95367,7.625,,,, +US-CA-95368,US,CA,95368,7.625,,,, +US-CA-95369,US,CA,95369,7.5,,,, +US-CA-95370,US,CA,95370,7.5,,,, +US-CA-95372,US,CA,95372,7.5,,,, +US-CA-95373,US,CA,95373,7.5,,,, +US-CA-95374,US,CA,95374,7.5,,,, +US-CA-95375,US,CA,95375,7.5,,,, +US-CA-95376,US,CA,95376,8.5,,,, +US-CA-95377,US,CA,95377,8.5,,,, +US-CA-95378,US,CA,95378,8.5,,,, +US-CA-95379,US,CA,95379,7.5,,,, +US-CA-95380,US,CA,95380,7.625,,,, +US-CA-95381,US,CA,95381,7.625,,,, +US-CA-95382,US,CA,95382,7.625,,,, +US-CA-95383,US,CA,95383,7.5,,,, +US-CA-95385,US,CA,95385,7.625,,,, +US-CA-95386,US,CA,95386,7.625,,,, +US-CA-95387,US,CA,95387,7.625,,,, +US-CA-95388,US,CA,95388,7.5,,,, +US-CA-95389,US,CA,95389,8,,,, +US-CA-95391,US,CA,95391,8,,,, +US-CA-95397,US,CA,95397,7.625,,,, +US-CA-95401,US,CA,95401,8.75,,,, +US-CA-95402,US,CA,95402,8.75,,,, +US-CA-95403,US,CA,95403,8.75,,,, +US-CA-95404,US,CA,95404,8.75,,,, +US-CA-95405,US,CA,95405,8.75,,,, +US-CA-95406,US,CA,95406,8.75,,,, +US-CA-95407,US,CA,95407,8.75,,,, +US-CA-95409,US,CA,95409,8.75,,,, +US-CA-95410,US,CA,95410,7.625,,,, +US-CA-95412,US,CA,95412,8.25,,,, +US-CA-95415,US,CA,95415,7.625,,,, +US-CA-95416,US,CA,95416,8.25,,,, +US-CA-95417,US,CA,95417,7.625,,,, +US-CA-95418,US,CA,95418,7.625,,,, +US-CA-95419,US,CA,95419,8.25,,,, +US-CA-95420,US,CA,95420,7.625,,,, +US-CA-95421,US,CA,95421,8.25,,,, +US-CA-95422,US,CA,95422,8,,,, +US-CA-95423,US,CA,95423,7.5,,,, +US-CA-95424,US,CA,95424,8,,,, +US-CA-95425,US,CA,95425,8.25,,,, +US-CA-95426,US,CA,95426,7.5,,,, +US-CA-95427,US,CA,95427,7.625,,,, +US-CA-95428,US,CA,95428,7.625,,,, +US-CA-95429,US,CA,95429,7.625,,,, +US-CA-95430,US,CA,95430,8.25,,,, +US-CA-95431,US,CA,95431,8.25,,,, +US-CA-95432,US,CA,95432,7.625,,,, +US-CA-95433,US,CA,95433,8.25,,,, +US-CA-95435,US,CA,95435,7.5,,,, +US-CA-95436,US,CA,95436,8.25,,,, +US-CA-95437,US,CA,95437,8.625,,,, +US-CA-95439,US,CA,95439,8.25,,,, +US-CA-95441,US,CA,95441,8.25,,,, +US-CA-95442,US,CA,95442,8.25,,,, +US-CA-95443,US,CA,95443,7.5,,,, +US-CA-95444,US,CA,95444,8.25,,,, +US-CA-95445,US,CA,95445,7.625,,,, +US-CA-95446,US,CA,95446,8.25,,,, +US-CA-95448,US,CA,95448,8.75,,,, +US-CA-95449,US,CA,95449,7.625,,,, +US-CA-95450,US,CA,95450,8.25,,,, +US-CA-95451,US,CA,95451,7.5,,,, +US-CA-95452,US,CA,95452,8.25,,,, +US-CA-95453,US,CA,95453,8,,,, +US-CA-95454,US,CA,95454,7.625,,,, +US-CA-95456,US,CA,95456,7.625,,,, +US-CA-95457,US,CA,95457,7.5,,,, +US-CA-95458,US,CA,95458,7.5,,,, +US-CA-95459,US,CA,95459,7.625,,,, +US-CA-95460,US,CA,95460,7.625,,,, +US-CA-95461,US,CA,95461,7.5,,,, +US-CA-95462,US,CA,95462,8.25,,,, +US-CA-95463,US,CA,95463,7.625,,,, +US-CA-95464,US,CA,95464,7.5,,,, +US-CA-95465,US,CA,95465,8.25,,,, +US-CA-95466,US,CA,95466,7.625,,,, +US-CA-95467,US,CA,95467,7.5,,,, +US-CA-95468,US,CA,95468,7.625,,,, +US-CA-95469,US,CA,95469,7.625,,,, +US-CA-95470,US,CA,95470,7.625,,,, +US-CA-95471,US,CA,95471,8.25,,,, +US-CA-95472,US,CA,95472,8.25,,,, +US-CA-95473,US,CA,95473,9,,,, +US-CA-95476,US,CA,95476,8.25,,,, +US-CA-95480,US,CA,95480,8.25,,,, +US-CA-95481,US,CA,95481,7.625,,,, +US-CA-95482,US,CA,95482,8.125,,,, +US-CA-95485,US,CA,95485,7.5,,,, +US-CA-95486,US,CA,95486,8.25,,,, +US-CA-95487,US,CA,95487,8.25,,,, +US-CA-95488,US,CA,95488,7.625,,,, +US-CA-95490,US,CA,95490,7.625,,,, +US-CA-95492,US,CA,95492,8.25,,,, +US-CA-95493,US,CA,95493,7.5,,,, +US-CA-95494,US,CA,95494,7.625,,,, +US-CA-95497,US,CA,95497,7.625,,,, +US-CA-95501,US,CA,95501,8.25,,,, +US-CA-95502,US,CA,95502,8.25,,,, +US-CA-95503,US,CA,95503,7.5,,,, +US-CA-95511,US,CA,95511,7.5,,,, +US-CA-95514,US,CA,95514,7.5,,,, +US-CA-95518,US,CA,95518,8.25,,,, +US-CA-95519,US,CA,95519,7.5,,,, +US-CA-95521,US,CA,95521,8.25,,,, +US-CA-95524,US,CA,95524,7.5,,,, +US-CA-95525,US,CA,95525,7.5,,,, +US-CA-95526,US,CA,95526,7.5,,,, +US-CA-95527,US,CA,95527,7.5,,,, +US-CA-95528,US,CA,95528,7.5,,,, +US-CA-95531,US,CA,95531,7.5,,,, +US-CA-95532,US,CA,95532,7.5,,,, +US-CA-95534,US,CA,95534,8.25,,,, +US-CA-95536,US,CA,95536,7.5,,,, +US-CA-95537,US,CA,95537,7.5,,,, +US-CA-95538,US,CA,95538,7.5,,,, +US-CA-95540,US,CA,95540,7.5,,,, +US-CA-95542,US,CA,95542,7.5,,,, +US-CA-95543,US,CA,95543,7.5,,,, +US-CA-95545,US,CA,95545,7.5,,,, +US-CA-95546,US,CA,95546,7.5,,,, +US-CA-95547,US,CA,95547,7.5,,,, +US-CA-95548,US,CA,95548,7.5,,,, +US-CA-95549,US,CA,95549,7.5,,,, +US-CA-95550,US,CA,95550,7.5,,,, +US-CA-95551,US,CA,95551,7.5,,,, +US-CA-95552,US,CA,95552,7.5,,,, +US-CA-95553,US,CA,95553,7.5,,,, +US-CA-95554,US,CA,95554,7.5,,,, +US-CA-95555,US,CA,95555,7.5,,,, +US-CA-95556,US,CA,95556,7.5,,,, +US-CA-95558,US,CA,95558,7.5,,,, +US-CA-95559,US,CA,95559,7.5,,,, +US-CA-95560,US,CA,95560,7.5,,,, +US-CA-95562,US,CA,95562,7.5,,,, +US-CA-95563,US,CA,95563,7.5,,,, +US-CA-95564,US,CA,95564,7.5,,,, +US-CA-95565,US,CA,95565,7.5,,,, +US-CA-95567,US,CA,95567,7.5,,,, +US-CA-95568,US,CA,95568,7.5,,,, +US-CA-95569,US,CA,95569,7.5,,,, +US-CA-95570,US,CA,95570,7.5,,,, +US-CA-95571,US,CA,95571,7.5,,,, +US-CA-95573,US,CA,95573,7.5,,,, +US-CA-95585,US,CA,95585,7.625,,,, +US-CA-95587,US,CA,95587,7.5,,,, +US-CA-95589,US,CA,95589,7.5,,,, +US-CA-95595,US,CA,95595,7.5,,,, +US-CA-95601,US,CA,95601,8,,,, +US-CA-95602,US,CA,95602,7.5,,,, +US-CA-95603,US,CA,95603,7.5,,,, +US-CA-95604,US,CA,95604,7.5,,,, +US-CA-95605,US,CA,95605,8,,,, +US-CA-95606,US,CA,95606,7.5,,,, +US-CA-95607,US,CA,95607,7.5,,,, +US-CA-95608,US,CA,95608,8,,,, +US-CA-95609,US,CA,95609,8,,,, +US-CA-95610,US,CA,95610,8,,,, +US-CA-95611,US,CA,95611,8,,,, +US-CA-95612,US,CA,95612,7.5,,,, +US-CA-95613,US,CA,95613,7.5,,,, +US-CA-95614,US,CA,95614,7.5,,,, +US-CA-95615,US,CA,95615,8,,,, +US-CA-95616,US,CA,95616,8,,,, +US-CA-95617,US,CA,95617,8,,,, +US-CA-95618,US,CA,95618,8,,,, +US-CA-95619,US,CA,95619,7.5,,,, +US-CA-95620,US,CA,95620,7.625,,,, +US-CA-95621,US,CA,95621,8,,,, +US-CA-95623,US,CA,95623,7.5,,,, +US-CA-95624,US,CA,95624,8,,,, +US-CA-95625,US,CA,95625,7.625,,,, +US-CA-95626,US,CA,95626,8,,,, +US-CA-95627,US,CA,95627,7.5,,,, +US-CA-95628,US,CA,95628,8,,,, +US-CA-95629,US,CA,95629,8,,,, +US-CA-95630,US,CA,95630,8,,,, +US-CA-95631,US,CA,95631,7.5,,,, +US-CA-95632,US,CA,95632,8.5,,,, +US-CA-95633,US,CA,95633,7.5,,,, +US-CA-95634,US,CA,95634,7.5,,,, +US-CA-95635,US,CA,95635,7.5,,,, +US-CA-95636,US,CA,95636,7.5,,,, +US-CA-95637,US,CA,95637,7.5,,,, +US-CA-95638,US,CA,95638,8,,,, +US-CA-95639,US,CA,95639,8,,,, +US-CA-95640,US,CA,95640,8,,,, +US-CA-95641,US,CA,95641,8,,,, +US-CA-95642,US,CA,95642,8,,,, +US-CA-95644,US,CA,95644,8,,,, +US-CA-95645,US,CA,95645,7.5,,,, +US-CA-95646,US,CA,95646,8,,,, +US-CA-95648,US,CA,95648,7.5,,,, +US-CA-95650,US,CA,95650,7.5,,,, +US-CA-95651,US,CA,95651,7.5,,,, +US-CA-95652,US,CA,95652,8,,,, +US-CA-95653,US,CA,95653,7.5,,,, +US-CA-95654,US,CA,95654,8,,,, +US-CA-95655,US,CA,95655,8,,,, +US-CA-95656,US,CA,95656,7.5,,,, +US-CA-95658,US,CA,95658,7.5,,,, +US-CA-95659,US,CA,95659,7.5,,,, +US-CA-95660,US,CA,95660,8,,,, +US-CA-95661,US,CA,95661,7.5,,,, +US-CA-95662,US,CA,95662,8,,,, +US-CA-95663,US,CA,95663,7.5,,,, +US-CA-95664,US,CA,95664,7.5,,,, +US-CA-95665,US,CA,95665,8,,,, +US-CA-95666,US,CA,95666,8,,,, +US-CA-95667,US,CA,95667,7.5,,,, +US-CA-95668,US,CA,95668,7.5,,,, +US-CA-95669,US,CA,95669,8,,,, +US-CA-95670,US,CA,95670,8,,,, +US-CA-95671,US,CA,95671,8,,,, +US-CA-95672,US,CA,95672,7.5,,,, +US-CA-95673,US,CA,95673,8,,,, +US-CA-95674,US,CA,95674,7.5,,,, +US-CA-95675,US,CA,95675,7.5,,,, +US-CA-95676,US,CA,95676,7.5,,,, +US-CA-95677,US,CA,95677,7.5,,,, +US-CA-95678,US,CA,95678,7.5,,,, +US-CA-95679,US,CA,95679,7.5,,,, +US-CA-95680,US,CA,95680,8,,,, +US-CA-95681,US,CA,95681,7.5,,,, +US-CA-95682,US,CA,95682,7.5,,,, +US-CA-95683,US,CA,95683,8,,,, +US-CA-95684,US,CA,95684,7.5,,,, +US-CA-95685,US,CA,95685,8,,,, +US-CA-95686,US,CA,95686,8,,,, +US-CA-95687,US,CA,95687,7.875,,,, +US-CA-95688,US,CA,95688,7.875,,,, +US-CA-95689,US,CA,95689,8,,,, +US-CA-95690,US,CA,95690,8,,,, +US-CA-95691,US,CA,95691,8,,,, +US-CA-95692,US,CA,95692,8,,,, +US-CA-95693,US,CA,95693,8,,,, +US-CA-95694,US,CA,95694,7.5,,,, +US-CA-95695,US,CA,95695,8.25,,,, +US-CA-95696,US,CA,95696,7.875,,,, +US-CA-95697,US,CA,95697,7.5,,,, +US-CA-95698,US,CA,95698,7.5,,,, +US-CA-95699,US,CA,95699,8,,,, +US-CA-95701,US,CA,95701,7.5,,,, +US-CA-95703,US,CA,95703,7.5,,,, +US-CA-95709,US,CA,95709,7.5,,,, +US-CA-95712,US,CA,95712,7.625,,,, +US-CA-95713,US,CA,95713,7.5,,,, +US-CA-95714,US,CA,95714,7.5,,,, +US-CA-95715,US,CA,95715,7.5,,,, +US-CA-95717,US,CA,95717,7.5,,,, +US-CA-95720,US,CA,95720,7.5,,,, +US-CA-95721,US,CA,95721,7.5,,,, +US-CA-95722,US,CA,95722,7.5,,,, +US-CA-95724,US,CA,95724,7.625,,,, +US-CA-95726,US,CA,95726,7.5,,,, +US-CA-95728,US,CA,95728,7.625,,,, +US-CA-95735,US,CA,95735,7.5,,,, +US-CA-95736,US,CA,95736,7.5,,,, +US-CA-95741,US,CA,95741,8,,,, +US-CA-95742,US,CA,95742,8,,,, +US-CA-95746,US,CA,95746,7.5,,,, +US-CA-95747,US,CA,95747,7.5,,,, +US-CA-95757,US,CA,95757,8,,,, +US-CA-95758,US,CA,95758,8,,,, +US-CA-95759,US,CA,95759,8,,,, +US-CA-95762,US,CA,95762,7.5,,,, +US-CA-95763,US,CA,95763,8,,,, +US-CA-95765,US,CA,95765,7.5,,,, +US-CA-95776,US,CA,95776,8.25,,,, +US-CA-95798,US,CA,95798,8,,,, +US-CA-95799,US,CA,95799,8,,,, +US-CA-95811,US,CA,95811,8.5,,,, +US-CA-95812,US,CA,95812,8.5,,,, +US-CA-95813,US,CA,95813,8.5,,,, +US-CA-95814,US,CA,95814,8.5,,,, +US-CA-95815,US,CA,95815,8.5,,,, +US-CA-95816,US,CA,95816,8.5,,,, +US-CA-95817,US,CA,95817,8.5,,,, +US-CA-95818,US,CA,95818,8.5,,,, +US-CA-95819,US,CA,95819,8.5,,,, +US-CA-95820,US,CA,95820,8.5,,,, +US-CA-95821,US,CA,95821,8,,,, +US-CA-95822,US,CA,95822,8.5,,,, +US-CA-95823,US,CA,95823,8.5,,,, +US-CA-95824,US,CA,95824,8,,,, +US-CA-95825,US,CA,95825,8,,,, +US-CA-95826,US,CA,95826,8,,,, +US-CA-95827,US,CA,95827,8,,,, +US-CA-95828,US,CA,95828,8,,,, +US-CA-95829,US,CA,95829,8,,,, +US-CA-95830,US,CA,95830,8,,,, +US-CA-95831,US,CA,95831,8.5,,,, +US-CA-95832,US,CA,95832,8.5,,,, +US-CA-95833,US,CA,95833,8.5,,,, +US-CA-95834,US,CA,95834,8.5,,,, +US-CA-95835,US,CA,95835,8.5,,,, +US-CA-95836,US,CA,95836,8,,,, +US-CA-95837,US,CA,95837,8,,,, +US-CA-95838,US,CA,95838,8.5,,,, +US-CA-95840,US,CA,95840,8.5,,,, +US-CA-95841,US,CA,95841,8,,,, +US-CA-95842,US,CA,95842,8,,,, +US-CA-95843,US,CA,95843,8,,,, +US-CA-95851,US,CA,95851,8.5,,,, +US-CA-95852,US,CA,95852,8.5,,,, +US-CA-95853,US,CA,95853,8.5,,,, +US-CA-95860,US,CA,95860,8,,,, +US-CA-95864,US,CA,95864,8,,,, +US-CA-95865,US,CA,95865,8,,,, +US-CA-95866,US,CA,95866,8,,,, +US-CA-95867,US,CA,95867,8.5,,,, +US-CA-95887,US,CA,95887,8.5,,,, +US-CA-95894,US,CA,95894,8.5,,,, +US-CA-95899,US,CA,95899,8.5,,,, +US-CA-95901,US,CA,95901,7.5,,,, +US-CA-95903,US,CA,95903,7.5,,,, +US-CA-95910,US,CA,95910,7.5,,,, +US-CA-95912,US,CA,95912,7.5,,,, +US-CA-95913,US,CA,95913,7.5,,,, +US-CA-95914,US,CA,95914,7.5,,,, +US-CA-95915,US,CA,95915,7.5,,,, +US-CA-95916,US,CA,95916,7.5,,,, +US-CA-95917,US,CA,95917,7.5,,,, +US-CA-95918,US,CA,95918,7.5,,,, +US-CA-95919,US,CA,95919,7.5,,,, +US-CA-95920,US,CA,95920,7.5,,,, +US-CA-95922,US,CA,95922,7.5,,,, +US-CA-95923,US,CA,95923,7.5,,,, +US-CA-95924,US,CA,95924,7.625,,,, +US-CA-95925,US,CA,95925,7.5,,,, +US-CA-95926,US,CA,95926,7.5,,,, +US-CA-95927,US,CA,95927,7.5,,,, +US-CA-95928,US,CA,95928,7.5,,,, +US-CA-95929,US,CA,95929,7.5,,,, +US-CA-95930,US,CA,95930,7.5,,,, +US-CA-95932,US,CA,95932,7.5,,,, +US-CA-95934,US,CA,95934,7.5,,,, +US-CA-95935,US,CA,95935,7.5,,,, +US-CA-95936,US,CA,95936,7.5,,,, +US-CA-95937,US,CA,95937,7.5,,,, +US-CA-95938,US,CA,95938,7.5,,,, +US-CA-95939,US,CA,95939,7.5,,,, +US-CA-95940,US,CA,95940,7.5,,,, +US-CA-95941,US,CA,95941,7.5,,,, +US-CA-95942,US,CA,95942,7.5,,,, +US-CA-95943,US,CA,95943,7.5,,,, +US-CA-95944,US,CA,95944,7.5,,,, +US-CA-95945,US,CA,95945,8.125,,,, +US-CA-95946,US,CA,95946,7.625,,,, +US-CA-95947,US,CA,95947,7.5,,,, +US-CA-95948,US,CA,95948,7.5,,,, +US-CA-95949,US,CA,95949,7.625,,,, +US-CA-95950,US,CA,95950,7.5,,,, +US-CA-95951,US,CA,95951,7.5,,,, +US-CA-95953,US,CA,95953,7.5,,,, +US-CA-95954,US,CA,95954,7.5,,,, +US-CA-95955,US,CA,95955,7.5,,,, +US-CA-95956,US,CA,95956,7.5,,,, +US-CA-95957,US,CA,95957,7.5,,,, +US-CA-95958,US,CA,95958,7.5,,,, +US-CA-95959,US,CA,95959,7.625,,,, +US-CA-95960,US,CA,95960,7.625,,,, +US-CA-95961,US,CA,95961,7.5,,,, +US-CA-95962,US,CA,95962,7.5,,,, +US-CA-95963,US,CA,95963,7.5,,,, +US-CA-95965,US,CA,95965,7.5,,,, +US-CA-95966,US,CA,95966,7.5,,,, +US-CA-95967,US,CA,95967,7.5,,,, +US-CA-95968,US,CA,95968,7.5,,,, +US-CA-95969,US,CA,95969,7.5,,,, +US-CA-95970,US,CA,95970,7.5,,,, +US-CA-95971,US,CA,95971,7.5,,,, +US-CA-95972,US,CA,95972,7.5,,,, +US-CA-95973,US,CA,95973,7.5,,,, +US-CA-95974,US,CA,95974,7.5,,,, +US-CA-95975,US,CA,95975,7.625,,,, +US-CA-95976,US,CA,95976,7.5,,,, +US-CA-95977,US,CA,95977,7.625,,,, +US-CA-95978,US,CA,95978,7.5,,,, +US-CA-95979,US,CA,95979,7.5,,,, +US-CA-95980,US,CA,95980,7.5,,,, +US-CA-95981,US,CA,95981,7.5,,,, +US-CA-95982,US,CA,95982,7.5,,,, +US-CA-95983,US,CA,95983,7.5,,,, +US-CA-95984,US,CA,95984,7.5,,,, +US-CA-95986,US,CA,95986,7.625,,,, +US-CA-95987,US,CA,95987,8,,,, +US-CA-95988,US,CA,95988,7.5,,,, +US-CA-95991,US,CA,95991,7.5,,,, +US-CA-95992,US,CA,95992,7.5,,,, +US-CA-95993,US,CA,95993,7.5,,,, +US-CA-96001,US,CA,96001,7.5,,,, +US-CA-96002,US,CA,96002,7.5,,,, +US-CA-96003,US,CA,96003,7.5,,,, +US-CA-96006,US,CA,96006,7.5,,,, +US-CA-96007,US,CA,96007,7.5,,,, +US-CA-96008,US,CA,96008,7.5,,,, +US-CA-96009,US,CA,96009,7.5,,,, +US-CA-96010,US,CA,96010,7.5,,,, +US-CA-96011,US,CA,96011,7.5,,,, +US-CA-96013,US,CA,96013,7.5,,,, +US-CA-96014,US,CA,96014,7.5,,,, +US-CA-96015,US,CA,96015,7.5,,,, +US-CA-96016,US,CA,96016,7.5,,,, +US-CA-96017,US,CA,96017,7.5,,,, +US-CA-96019,US,CA,96019,7.5,,,, +US-CA-96020,US,CA,96020,7.5,,,, +US-CA-96021,US,CA,96021,7.5,,,, +US-CA-96022,US,CA,96022,7.5,,,, +US-CA-96023,US,CA,96023,7.5,,,, +US-CA-96024,US,CA,96024,7.5,,,, +US-CA-96025,US,CA,96025,7.5,,,, +US-CA-96027,US,CA,96027,7.5,,,, +US-CA-96028,US,CA,96028,7.5,,,, +US-CA-96029,US,CA,96029,7.5,,,, +US-CA-96031,US,CA,96031,7.5,,,, +US-CA-96032,US,CA,96032,7.5,,,, +US-CA-96033,US,CA,96033,7.5,,,, +US-CA-96034,US,CA,96034,7.5,,,, +US-CA-96035,US,CA,96035,7.5,,,, +US-CA-96037,US,CA,96037,7.5,,,, +US-CA-96038,US,CA,96038,7.5,,,, +US-CA-96039,US,CA,96039,7.5,,,, +US-CA-96040,US,CA,96040,7.5,,,, +US-CA-96041,US,CA,96041,7.5,,,, +US-CA-96044,US,CA,96044,7.5,,,, +US-CA-96046,US,CA,96046,7.5,,,, +US-CA-96047,US,CA,96047,7.5,,,, +US-CA-96048,US,CA,96048,7.5,,,, +US-CA-96049,US,CA,96049,7.5,,,, +US-CA-96050,US,CA,96050,7.5,,,, +US-CA-96051,US,CA,96051,7.5,,,, +US-CA-96052,US,CA,96052,7.5,,,, +US-CA-96054,US,CA,96054,7.5,,,, +US-CA-96055,US,CA,96055,7.5,,,, +US-CA-96056,US,CA,96056,7.5,,,, +US-CA-96057,US,CA,96057,7.5,,,, +US-CA-96058,US,CA,96058,7.5,,,, +US-CA-96059,US,CA,96059,7.5,,,, +US-CA-96061,US,CA,96061,7.5,,,, +US-CA-96062,US,CA,96062,7.5,,,, +US-CA-96063,US,CA,96063,7.5,,,, +US-CA-96064,US,CA,96064,7.5,,,, +US-CA-96065,US,CA,96065,7.5,,,, +US-CA-96067,US,CA,96067,7.75,,,, +US-CA-96068,US,CA,96068,7.5,,,, +US-CA-96069,US,CA,96069,7.5,,,, +US-CA-96070,US,CA,96070,7.5,,,, +US-CA-96071,US,CA,96071,7.5,,,, +US-CA-96073,US,CA,96073,7.5,,,, +US-CA-96074,US,CA,96074,7.5,,,, +US-CA-96075,US,CA,96075,7.5,,,, +US-CA-96076,US,CA,96076,7.5,,,, +US-CA-96078,US,CA,96078,7.5,,,, +US-CA-96079,US,CA,96079,7.5,,,, +US-CA-96080,US,CA,96080,7.5,,,, +US-CA-96084,US,CA,96084,7.5,,,, +US-CA-96085,US,CA,96085,7.5,,,, +US-CA-96086,US,CA,96086,7.5,,,, +US-CA-96087,US,CA,96087,7.5,,,, +US-CA-96088,US,CA,96088,7.5,,,, +US-CA-96089,US,CA,96089,7.5,,,, +US-CA-96090,US,CA,96090,7.5,,,, +US-CA-96091,US,CA,96091,7.5,,,, +US-CA-96092,US,CA,96092,7.5,,,, +US-CA-96093,US,CA,96093,7.5,,,, +US-CA-96094,US,CA,96094,7.5,,,, +US-CA-96095,US,CA,96095,7.5,,,, +US-CA-96096,US,CA,96096,7.5,,,, +US-CA-96097,US,CA,96097,7.5,,,, +US-CA-96099,US,CA,96099,7.5,,,, +US-CA-96101,US,CA,96101,7.5,,,, +US-CA-96103,US,CA,96103,7.5,,,, +US-CA-96104,US,CA,96104,7.5,,,, +US-CA-96105,US,CA,96105,7.5,,,, +US-CA-96106,US,CA,96106,7.5,,,, +US-CA-96107,US,CA,96107,7.5,,,, +US-CA-96108,US,CA,96108,7.5,,,, +US-CA-96109,US,CA,96109,7.5,,,, +US-CA-96110,US,CA,96110,7.5,,,, +US-CA-96111,US,CA,96111,7.625,,,, +US-CA-96112,US,CA,96112,7.5,,,, +US-CA-96113,US,CA,96113,7.5,,,, +US-CA-96114,US,CA,96114,7.5,,,, +US-CA-96115,US,CA,96115,7.5,,,, +US-CA-96116,US,CA,96116,7.5,,,, +US-CA-96117,US,CA,96117,7.5,,,, +US-CA-96118,US,CA,96118,7.5,,,, +US-CA-96119,US,CA,96119,7.5,,,, +US-CA-96120,US,CA,96120,7.5,,,, +US-CA-96121,US,CA,96121,7.5,,,, +US-CA-96122,US,CA,96122,7.5,,,, +US-CA-96123,US,CA,96123,7.5,,,, +US-CA-96124,US,CA,96124,7.5,,,, +US-CA-96125,US,CA,96125,7.5,,,, +US-CA-96126,US,CA,96126,7.5,,,, +US-CA-96127,US,CA,96127,7.5,,,, +US-CA-96128,US,CA,96128,7.5,,,, +US-CA-96129,US,CA,96129,7.5,,,, +US-CA-96130,US,CA,96130,7.5,,,, +US-CA-96132,US,CA,96132,7.5,,,, +US-CA-96133,US,CA,96133,7.5,,,, +US-CA-96134,US,CA,96134,7.5,,,, +US-CA-96135,US,CA,96135,7.5,,,, +US-CA-96136,US,CA,96136,7.5,,,, +US-CA-96137,US,CA,96137,7.5,,,, +US-CA-96140,US,CA,96140,7.5,,,, +US-CA-96141,US,CA,96141,7.5,,,, +US-CA-96142,US,CA,96142,7.5,,,, +US-CA-96143,US,CA,96143,7.5,,,, +US-CA-96145,US,CA,96145,7.5,,,, +US-CA-96146,US,CA,96146,7.5,,,, +US-CA-96148,US,CA,96148,7.5,,,, +US-CA-96150,US,CA,96150,8,,,, +US-CA-96151,US,CA,96151,8,,,, +US-CA-96152,US,CA,96152,8,,,, +US-CA-96154,US,CA,96154,8,,,, +US-CA-96155,US,CA,96155,7.5,,,, +US-CA-96156,US,CA,96156,8,,,, +US-CA-96157,US,CA,96157,7.5,,,, +US-CA-96158,US,CA,96158,8,,,, +US-CA-96160,US,CA,96160,8.125,,,, +US-CA-96161,US,CA,96161,8.125,,,, +US-CA-96162,US,CA,96162,8.125,,,, +US-CO-80001,US,CO,80001,7.96,,,, +US-CO-80002,US,CO,80002,7.96,,,, +US-CO-80003,US,CO,80003,7.96,,,, +US-CO-80004,US,CO,80004,7.96,,,, +US-CO-80005,US,CO,80005,7.96,,,, +US-CO-80006,US,CO,80006,7.96,,,, +US-CO-80007,US,CO,80007,7.96,,,, +US-CO-80010,US,CO,80010,8.5,,,, +US-CO-80011,US,CO,80011,8,,,, +US-CO-80012,US,CO,80012,8,,,, +US-CO-80013,US,CO,80013,8,,,, +US-CO-80014,US,CO,80014,8,,,, +US-CO-80015,US,CO,80015,8,,,, +US-CO-80016,US,CO,80016,8,,,, +US-CO-80017,US,CO,80017,8,,,, +US-CO-80018,US,CO,80018,7,,,, +US-CO-80019,US,CO,80019,8.5,,,, +US-CO-80020,US,CO,80020,8.15,,,, +US-CO-80021,US,CO,80021,8.35,,,, +US-CO-80022,US,CO,80022,8.25,,,, +US-CO-80023,US,CO,80023,8.15,,,, +US-CO-80024,US,CO,80024,4.75,,,, +US-CO-80025,US,CO,80025,4.8,,,, +US-CO-80026,US,CO,80026,8.3,,,, +US-CO-80027,US,CO,80027,8.3,,,, +US-CO-80030,US,CO,80030,8.6,,,, +US-CO-80031,US,CO,80031,8.6,,,, +US-CO-80033,US,CO,80033,7.5,,,, +US-CO-80034,US,CO,80034,7.5,,,, +US-CO-80035,US,CO,80035,8.6,,,, +US-CO-80036,US,CO,80036,8.6,,,, +US-CO-80037,US,CO,80037,8.25,,,, +US-CO-80038,US,CO,80038,8.15,,,, +US-CO-80040,US,CO,80040,8.5,,,, +US-CO-80041,US,CO,80041,8,,,, +US-CO-80042,US,CO,80042,8.5,,,, +US-CO-80044,US,CO,80044,8.5,,,, +US-CO-80045,US,CO,80045,8.5,,,, +US-CO-80046,US,CO,80046,6.75,,,, +US-CO-80047,US,CO,80047,8,,,, +US-CO-80101,US,CO,80101,3.9,,,, +US-CO-80102,US,CO,80102,3.75,,,, +US-CO-80103,US,CO,80103,3.25,,,, +US-CO-80104,US,CO,80104,7.9,,,, +US-CO-80105,US,CO,80105,3.25,,,, +US-CO-80106,US,CO,80106,5.13,,,, +US-CO-80107,US,CO,80107,3.9,,,, +US-CO-80108,US,CO,80108,7.9,,,, +US-CO-80109,US,CO,80109,7.9,,,, +US-CO-80110,US,CO,80110,7.75,,,, +US-CO-80111,US,CO,80111,7.25,,,, +US-CO-80112,US,CO,80112,6.75,,,, +US-CO-80113,US,CO,80113,7.75,,,, +US-CO-80116,US,CO,80116,4,,,, +US-CO-80117,US,CO,80117,3.9,,,, +US-CO-80118,US,CO,80118,4,,,, +US-CO-80120,US,CO,80120,7.25,,,, +US-CO-80121,US,CO,80121,6.75,,,, +US-CO-80122,US,CO,80122,6.75,,,, +US-CO-80123,US,CO,80123,5,,,, +US-CO-80124,US,CO,80124,6.8125,,,, +US-CO-80125,US,CO,80125,4,,,, +US-CO-80126,US,CO,80126,5,,,, +US-CO-80127,US,CO,80127,5,,,, +US-CO-80128,US,CO,80128,5,,,, +US-CO-80129,US,CO,80129,5,,,, +US-CO-80130,US,CO,80130,5,,,, +US-CO-80131,US,CO,80131,4,,,, +US-CO-80132,US,CO,80132,5.13,,,, +US-CO-80133,US,CO,80133,7.13,,,, +US-CO-80134,US,CO,80134,5,,,, +US-CO-80135,US,CO,80135,4,,,, +US-CO-80136,US,CO,80136,3.75,,,, +US-CO-80137,US,CO,80137,3.75,,,, +US-CO-80138,US,CO,80138,8,,,, +US-CO-80150,US,CO,80150,7.75,,,, +US-CO-80151,US,CO,80151,7.75,,,, +US-CO-80155,US,CO,80155,6.75,,,, +US-CO-80160,US,CO,80160,7.25,,,, +US-CO-80161,US,CO,80161,7.25,,,, +US-CO-80162,US,CO,80162,5,,,, +US-CO-80163,US,CO,80163,5,,,, +US-CO-80165,US,CO,80165,7.25,,,, +US-CO-80166,US,CO,80166,7.25,,,, +US-CO-80201,US,CO,80201,7.62,,,, +US-CO-80202,US,CO,80202,7.62,,,, +US-CO-80203,US,CO,80203,7.62,,,, +US-CO-80204,US,CO,80204,7.62,,,, +US-CO-80205,US,CO,80205,7.62,,,, +US-CO-80206,US,CO,80206,7.62,,,, +US-CO-80207,US,CO,80207,7.62,,,, +US-CO-80208,US,CO,80208,7.62,,,, +US-CO-80209,US,CO,80209,7.62,,,, +US-CO-80210,US,CO,80210,7.62,,,, +US-CO-80211,US,CO,80211,7.62,,,, +US-CO-80212,US,CO,80212,7.62,,,, +US-CO-80214,US,CO,80214,7.5,,,, +US-CO-80215,US,CO,80215,7.5,,,, +US-CO-80216,US,CO,80216,7.62,,,, +US-CO-80217,US,CO,80217,7.62,,,, +US-CO-80218,US,CO,80218,7.62,,,, +US-CO-80219,US,CO,80219,7.62,,,, +US-CO-80220,US,CO,80220,7.62,,,, +US-CO-80221,US,CO,80221,4.75,,,, +US-CO-80222,US,CO,80222,7.62,,,, +US-CO-80223,US,CO,80223,7.62,,,, +US-CO-80224,US,CO,80224,7.62,,,, +US-CO-80225,US,CO,80225,7.5,,,, +US-CO-80226,US,CO,80226,7.5,,,, +US-CO-80227,US,CO,80227,7.5,,,, +US-CO-80228,US,CO,80228,7.5,,,, +US-CO-80229,US,CO,80229,8.5,,,, +US-CO-80230,US,CO,80230,7.62,,,, +US-CO-80231,US,CO,80231,7.62,,,, +US-CO-80232,US,CO,80232,7.5,,,, +US-CO-80233,US,CO,80233,8.75,,,, +US-CO-80234,US,CO,80234,8.6,,,, +US-CO-80235,US,CO,80235,7.5,,,, +US-CO-80236,US,CO,80236,7.62,,,, +US-CO-80237,US,CO,80237,7.62,,,, +US-CO-80238,US,CO,80238,7.62,,,, +US-CO-80239,US,CO,80239,7.62,,,, +US-CO-80241,US,CO,80241,8.5,,,, +US-CO-80243,US,CO,80243,7.62,,,, +US-CO-80246,US,CO,80246,8,,,, +US-CO-80247,US,CO,80247,7.62,,,, +US-CO-80248,US,CO,80248,7.62,,,, +US-CO-80249,US,CO,80249,7.62,,,, +US-CO-80250,US,CO,80250,7.62,,,, +US-CO-80251,US,CO,80251,7.62,,,, +US-CO-80252,US,CO,80252,7.62,,,, +US-CO-80256,US,CO,80256,7.62,,,, +US-CO-80257,US,CO,80257,7.62,,,, +US-CO-80259,US,CO,80259,7.62,,,, +US-CO-80260,US,CO,80260,8.5,,,, +US-CO-80261,US,CO,80261,7.62,,,, +US-CO-80262,US,CO,80262,7.62,,,, +US-CO-80263,US,CO,80263,7.62,,,, +US-CO-80264,US,CO,80264,7.62,,,, +US-CO-80265,US,CO,80265,7.62,,,, +US-CO-80266,US,CO,80266,7.62,,,, +US-CO-80271,US,CO,80271,7.62,,,, +US-CO-80273,US,CO,80273,7.62,,,, +US-CO-80274,US,CO,80274,7.62,,,, +US-CO-80281,US,CO,80281,7.62,,,, +US-CO-80290,US,CO,80290,7.62,,,, +US-CO-80291,US,CO,80291,7.62,,,, +US-CO-80293,US,CO,80293,7.62,,,, +US-CO-80294,US,CO,80294,7.62,,,, +US-CO-80295,US,CO,80295,7.62,,,, +US-CO-80299,US,CO,80299,7.62,,,, +US-CO-80301,US,CO,80301,8.21,,,, +US-CO-80302,US,CO,80302,8.21,,,, +US-CO-80303,US,CO,80303,8.21,,,, +US-CO-80304,US,CO,80304,8.21,,,, +US-CO-80305,US,CO,80305,8.21,,,, +US-CO-80306,US,CO,80306,8.21,,,, +US-CO-80307,US,CO,80307,8.21,,,, +US-CO-80308,US,CO,80308,8.21,,,, +US-CO-80309,US,CO,80309,8.21,,,, +US-CO-80310,US,CO,80310,4.8,,,, +US-CO-80314,US,CO,80314,4.8,,,, +US-CO-80401,US,CO,80401,4.5,,,, +US-CO-80402,US,CO,80402,7.5,,,, +US-CO-80403,US,CO,80403,4.5,,,, +US-CO-80419,US,CO,80419,7.5,,,, +US-CO-80420,US,CO,80420,6.9,,,, +US-CO-80421,US,CO,80421,3.9,,,, +US-CO-80422,US,CO,80422,2.9,,,, +US-CO-80423,US,CO,80423,4.4,,,, +US-CO-80424,US,CO,80424,8.275,,,, +US-CO-80425,US,CO,80425,4.5,,,, +US-CO-80426,US,CO,80426,4.4,,,, +US-CO-80427,US,CO,80427,6.9,,,, +US-CO-80428,US,CO,80428,3.9,,,, +US-CO-80429,US,CO,80429,6.9,,,, +US-CO-80430,US,CO,80430,6.9,,,, +US-CO-80432,US,CO,80432,7.9,,,, +US-CO-80433,US,CO,80433,4.5,,,, +US-CO-80434,US,CO,80434,6.9,,,, +US-CO-80435,US,CO,80435,5.775,,,, +US-CO-80436,US,CO,80436,3.9,,,, +US-CO-80437,US,CO,80437,4.5,,,, +US-CO-80438,US,CO,80438,6.9,,,, +US-CO-80439,US,CO,80439,4.5,,,, +US-CO-80440,US,CO,80440,7.9,,,, +US-CO-80442,US,CO,80442,7.9,,,, +US-CO-80443,US,CO,80443,7.775,,,, +US-CO-80444,US,CO,80444,6.9,,,, +US-CO-80446,US,CO,80446,3.9,,,, +US-CO-80447,US,CO,80447,3.9,,,, +US-CO-80448,US,CO,80448,3.9,,,, +US-CO-80449,US,CO,80449,3.9,,,, +US-CO-80451,US,CO,80451,7.9,,,, +US-CO-80452,US,CO,80452,3.9,,,, +US-CO-80453,US,CO,80453,4.5,,,, +US-CO-80454,US,CO,80454,4.5,,,, +US-CO-80455,US,CO,80455,4.8,,,, +US-CO-80456,US,CO,80456,3.9,,,, +US-CO-80457,US,CO,80457,4.5,,,, +US-CO-80459,US,CO,80459,3.9,,,, +US-CO-80461,US,CO,80461,6.9,,,, +US-CO-80463,US,CO,80463,4.4,,,, +US-CO-80465,US,CO,80465,4.5,,,, +US-CO-80466,US,CO,80466,4.8,,,, +US-CO-80467,US,CO,80467,3.9,,,, +US-CO-80468,US,CO,80468,3.9,,,, +US-CO-80469,US,CO,80469,3.9,,,, +US-CO-80470,US,CO,80470,4.5,,,, +US-CO-80471,US,CO,80471,4.8,,,, +US-CO-80473,US,CO,80473,6.9,,,, +US-CO-80474,US,CO,80474,2.9,,,, +US-CO-80475,US,CO,80475,3.9,,,, +US-CO-80476,US,CO,80476,6.9,,,, +US-CO-80477,US,CO,80477,8.65,,,, +US-CO-80478,US,CO,80478,3.9,,,, +US-CO-80479,US,CO,80479,3.9,,,, +US-CO-80480,US,CO,80480,6.9,,,, +US-CO-80481,US,CO,80481,4.8,,,, +US-CO-80482,US,CO,80482,8.9,,,, +US-CO-80483,US,CO,80483,5.9,,,, +US-CO-80487,US,CO,80487,8.65,,,, +US-CO-80488,US,CO,80488,8.65,,,, +US-CO-80497,US,CO,80497,7.775,,,, +US-CO-80498,US,CO,80498,5.775,,,, +US-CO-80501,US,CO,80501,8.075,,,, +US-CO-80502,US,CO,80502,8.075,,,, +US-CO-80503,US,CO,80503,8.075,,,, +US-CO-80504,US,CO,80504,8.075,,,, +US-CO-80510,US,CO,80510,4.8,,,, +US-CO-80511,US,CO,80511,7.5,,,, +US-CO-80512,US,CO,80512,3.5,,,, +US-CO-80513,US,CO,80513,3.5,,,, +US-CO-80514,US,CO,80514,5.9,,,, +US-CO-80515,US,CO,80515,3.5,,,, +US-CO-80516,US,CO,80516,7.4,,,, +US-CO-80517,US,CO,80517,7.5,,,, +US-CO-80520,US,CO,80520,4.9,,,, +US-CO-80521,US,CO,80521,7.35,,,, +US-CO-80522,US,CO,80522,7.35,,,, +US-CO-80523,US,CO,80523,7.35,,,, +US-CO-80524,US,CO,80524,7.35,,,, +US-CO-80525,US,CO,80525,7.35,,,, +US-CO-80526,US,CO,80526,7.35,,,, +US-CO-80527,US,CO,80527,7.35,,,, +US-CO-80528,US,CO,80528,7.35,,,, +US-CO-80530,US,CO,80530,5.4,,,, +US-CO-80532,US,CO,80532,3.5,,,, +US-CO-80533,US,CO,80533,4.8,,,, +US-CO-80534,US,CO,80534,5.9,,,, +US-CO-80535,US,CO,80535,3.5,,,, +US-CO-80536,US,CO,80536,3.5,,,, +US-CO-80537,US,CO,80537,6.5,,,, +US-CO-80538,US,CO,80538,6.5,,,, +US-CO-80539,US,CO,80539,6.5,,,, +US-CO-80540,US,CO,80540,3.5,,,, +US-CO-80541,US,CO,80541,3.5,,,, +US-CO-80542,US,CO,80542,4.9,,,, +US-CO-80543,US,CO,80543,5.4,,,, +US-CO-80544,US,CO,80544,5.8,,,, +US-CO-80545,US,CO,80545,3.5,,,, +US-CO-80546,US,CO,80546,5.9,,,, +US-CO-80547,US,CO,80547,6.5,,,, +US-CO-80549,US,CO,80549,6.5,,,, +US-CO-80550,US,CO,80550,6.1,,,, +US-CO-80551,US,CO,80551,6.1,,,, +US-CO-80553,US,CO,80553,7.35,,,, +US-CO-80601,US,CO,80601,8.5,,,, +US-CO-80602,US,CO,80602,8.5,,,, +US-CO-80603,US,CO,80603,4.75,,,, +US-CO-80610,US,CO,80610,2.9,,,, +US-CO-80611,US,CO,80611,2.9,,,, +US-CO-80612,US,CO,80612,2.9,,,, +US-CO-80614,US,CO,80614,8.5,,,, +US-CO-80615,US,CO,80615,5.9,,,, +US-CO-80620,US,CO,80620,6.4,,,, +US-CO-80621,US,CO,80621,6.9,,,, +US-CO-80622,US,CO,80622,2.9,,,, +US-CO-80623,US,CO,80623,6.9,,,, +US-CO-80624,US,CO,80624,2.9,,,, +US-CO-80631,US,CO,80631,6.36,,,, +US-CO-80632,US,CO,80632,6.36,,,, +US-CO-80633,US,CO,80633,6.36,,,, +US-CO-80634,US,CO,80634,6.36,,,, +US-CO-80638,US,CO,80638,6.36,,,, +US-CO-80639,US,CO,80639,6.36,,,, +US-CO-80640,US,CO,80640,8.25,,,, +US-CO-80642,US,CO,80642,2.9,,,, +US-CO-80643,US,CO,80643,2.9,,,, +US-CO-80644,US,CO,80644,2.9,,,, +US-CO-80645,US,CO,80645,2.9,,,, +US-CO-80646,US,CO,80646,2.9,,,, +US-CO-80648,US,CO,80648,2.9,,,, +US-CO-80649,US,CO,80649,2.9,,,, +US-CO-80650,US,CO,80650,2.9,,,, +US-CO-80651,US,CO,80651,2.9,,,, +US-CO-80652,US,CO,80652,2.9,,,, +US-CO-80653,US,CO,80653,2.9,,,, +US-CO-80654,US,CO,80654,2.9,,,, +US-CO-80701,US,CO,80701,5.9,,,, +US-CO-80705,US,CO,80705,5.9,,,, +US-CO-80720,US,CO,80720,4.4,,,, +US-CO-80721,US,CO,80721,3.9,,,, +US-CO-80722,US,CO,80722,3.9,,,, +US-CO-80723,US,CO,80723,6.5,,,, +US-CO-80726,US,CO,80726,3.9,,,, +US-CO-80727,US,CO,80727,2.9,,,, +US-CO-80728,US,CO,80728,3.9,,,, +US-CO-80729,US,CO,80729,2.9,,,, +US-CO-80731,US,CO,80731,6.4,,,, +US-CO-80732,US,CO,80732,2.9,,,, +US-CO-80733,US,CO,80733,2.9,,,, +US-CO-80734,US,CO,80734,5.4,,,, +US-CO-80735,US,CO,80735,2.9,,,, +US-CO-80736,US,CO,80736,3.9,,,, +US-CO-80737,US,CO,80737,5.9,,,, +US-CO-80740,US,CO,80740,4.4,,,, +US-CO-80741,US,CO,80741,3.9,,,, +US-CO-80742,US,CO,80742,2.9,,,, +US-CO-80743,US,CO,80743,4.4,,,, +US-CO-80744,US,CO,80744,4.9,,,, +US-CO-80745,US,CO,80745,3.9,,,, +US-CO-80746,US,CO,80746,3.9,,,, +US-CO-80747,US,CO,80747,3.9,,,, +US-CO-80749,US,CO,80749,4.9,,,, +US-CO-80750,US,CO,80750,2.9,,,, +US-CO-80751,US,CO,80751,7,,,, +US-CO-80754,US,CO,80754,2.9,,,, +US-CO-80755,US,CO,80755,2.9,,,, +US-CO-80757,US,CO,80757,4.4,,,, +US-CO-80758,US,CO,80758,5.4,,,, +US-CO-80759,US,CO,80759,5.9,,,, +US-CO-80801,US,CO,80801,4.4,,,, +US-CO-80802,US,CO,80802,2.9,,,, +US-CO-80804,US,CO,80804,4.9,,,, +US-CO-80805,US,CO,80805,2.9,,,, +US-CO-80807,US,CO,80807,4.9,,,, +US-CO-80808,US,CO,80808,5.13,,,, +US-CO-80809,US,CO,80809,5.13,,,, +US-CO-80810,US,CO,80810,2.9,,,, +US-CO-80812,US,CO,80812,4.4,,,, +US-CO-80813,US,CO,80813,3.9,,,, +US-CO-80814,US,CO,80814,3.9,,,, +US-CO-80815,US,CO,80815,2.9,,,, +US-CO-80816,US,CO,80816,3.9,,,, +US-CO-80817,US,CO,80817,7.88,,,, +US-CO-80818,US,CO,80818,4.9,,,, +US-CO-80819,US,CO,80819,8.13,,,, +US-CO-80820,US,CO,80820,3.9,,,, +US-CO-80821,US,CO,80821,4.9,,,, +US-CO-80822,US,CO,80822,2.9,,,, +US-CO-80823,US,CO,80823,4.9,,,, +US-CO-80824,US,CO,80824,2.9,,,, +US-CO-80825,US,CO,80825,2.9,,,, +US-CO-80826,US,CO,80826,4.9,,,, +US-CO-80827,US,CO,80827,3.9,,,, +US-CO-80828,US,CO,80828,6.9,,,, +US-CO-80829,US,CO,80829,9.03,,,, +US-CO-80830,US,CO,80830,3.9,,,, +US-CO-80831,US,CO,80831,5.13,,,, +US-CO-80832,US,CO,80832,3.9,,,, +US-CO-80833,US,CO,80833,5.13,,,, +US-CO-80834,US,CO,80834,2.9,,,, +US-CO-80835,US,CO,80835,3.9,,,, +US-CO-80836,US,CO,80836,2.9,,,, +US-CO-80840,US,CO,80840,2.9,,,, +US-CO-80841,US,CO,80841,2.9,,,, +US-CO-80860,US,CO,80860,6.9,,,, +US-CO-80861,US,CO,80861,2.9,,,, +US-CO-80862,US,CO,80862,2.9,,,, +US-CO-80863,US,CO,80863,6.9,,,, +US-CO-80864,US,CO,80864,5.13,,,, +US-CO-80866,US,CO,80866,6.9,,,, +US-CO-80901,US,CO,80901,7.63,,,, +US-CO-80902,US,CO,80902,5.13,,,, +US-CO-80903,US,CO,80903,7.63,,,, +US-CO-80904,US,CO,80904,7.63,,,, +US-CO-80905,US,CO,80905,7.63,,,, +US-CO-80906,US,CO,80906,7.63,,,, +US-CO-80907,US,CO,80907,7.63,,,, +US-CO-80908,US,CO,80908,5.13,,,, +US-CO-80909,US,CO,80909,7.63,,,, +US-CO-80910,US,CO,80910,7.63,,,, +US-CO-80911,US,CO,80911,5.13,,,, +US-CO-80912,US,CO,80912,2.9,,,, +US-CO-80913,US,CO,80913,5.13,,,, +US-CO-80914,US,CO,80914,7.63,,,, +US-CO-80915,US,CO,80915,5.13,,,, +US-CO-80916,US,CO,80916,7.63,,,, +US-CO-80917,US,CO,80917,7.63,,,, +US-CO-80918,US,CO,80918,7.63,,,, +US-CO-80919,US,CO,80919,7.63,,,, +US-CO-80920,US,CO,80920,7.63,,,, +US-CO-80921,US,CO,80921,5.13,,,, +US-CO-80922,US,CO,80922,7.63,,,, +US-CO-80923,US,CO,80923,7.63,,,, +US-CO-80924,US,CO,80924,7.63,,,, +US-CO-80925,US,CO,80925,5.13,,,, +US-CO-80926,US,CO,80926,5.13,,,, +US-CO-80927,US,CO,80927,7.63,,,, +US-CO-80928,US,CO,80928,5.13,,,, +US-CO-80929,US,CO,80929,5.13,,,, +US-CO-80930,US,CO,80930,5.13,,,, +US-CO-80931,US,CO,80931,5.13,,,, +US-CO-80932,US,CO,80932,7.63,,,, +US-CO-80933,US,CO,80933,7.63,,,, +US-CO-80934,US,CO,80934,7.63,,,, +US-CO-80935,US,CO,80935,7.63,,,, +US-CO-80936,US,CO,80936,7.63,,,, +US-CO-80937,US,CO,80937,7.63,,,, +US-CO-80938,US,CO,80938,7.63,,,, +US-CO-80939,US,CO,80939,5.13,,,, +US-CO-80941,US,CO,80941,7.63,,,, +US-CO-80942,US,CO,80942,7.63,,,, +US-CO-80944,US,CO,80944,7.63,,,, +US-CO-80946,US,CO,80946,7.63,,,, +US-CO-80947,US,CO,80947,7.63,,,, +US-CO-80949,US,CO,80949,7.63,,,, +US-CO-80950,US,CO,80950,7.63,,,, +US-CO-80951,US,CO,80951,5.13,,,, +US-CO-80960,US,CO,80960,7.63,,,, +US-CO-80962,US,CO,80962,7.63,,,, +US-CO-80970,US,CO,80970,5.13,,,, +US-CO-80977,US,CO,80977,5.13,,,, +US-CO-80995,US,CO,80995,7.63,,,, +US-CO-80997,US,CO,80997,7.63,,,, +US-CO-81001,US,CO,81001,7.4,,,, +US-CO-81002,US,CO,81002,7.4,,,, +US-CO-81003,US,CO,81003,7.4,,,, +US-CO-81004,US,CO,81004,7.4,,,, +US-CO-81005,US,CO,81005,7.4,,,, +US-CO-81006,US,CO,81006,3.9,,,, +US-CO-81007,US,CO,81007,3.9,,,, +US-CO-81008,US,CO,81008,7.4,,,, +US-CO-81009,US,CO,81009,7.4,,,, +US-CO-81010,US,CO,81010,7.4,,,, +US-CO-81011,US,CO,81011,7.4,,,, +US-CO-81012,US,CO,81012,7.4,,,, +US-CO-81019,US,CO,81019,7.4,,,, +US-CO-81020,US,CO,81020,2.9,,,, +US-CO-81021,US,CO,81021,2.9,,,, +US-CO-81022,US,CO,81022,3.9,,,, +US-CO-81023,US,CO,81023,3.9,,,, +US-CO-81024,US,CO,81024,2.9,,,, +US-CO-81025,US,CO,81025,3.9,,,, +US-CO-81027,US,CO,81027,2.9,,,, +US-CO-81029,US,CO,81029,2.9,,,, +US-CO-81030,US,CO,81030,3.9,,,, +US-CO-81033,US,CO,81033,4.9,,,, +US-CO-81034,US,CO,81034,4.9,,,, +US-CO-81036,US,CO,81036,2.9,,,, +US-CO-81038,US,CO,81038,6.9,,,, +US-CO-81039,US,CO,81039,6.9,,,, +US-CO-81040,US,CO,81040,4.9,,,, +US-CO-81041,US,CO,81041,3.9,,,, +US-CO-81043,US,CO,81043,3.9,,,, +US-CO-81044,US,CO,81044,3.9,,,, +US-CO-81045,US,CO,81045,2.9,,,, +US-CO-81046,US,CO,81046,2.9,,,, +US-CO-81047,US,CO,81047,3.9,,,, +US-CO-81049,US,CO,81049,2.9,,,, +US-CO-81050,US,CO,81050,6.9,,,, +US-CO-81052,US,CO,81052,7.15,,,, +US-CO-81054,US,CO,81054,6.9,,,, +US-CO-81055,US,CO,81055,4.9,,,, +US-CO-81057,US,CO,81057,3.9,,,, +US-CO-81058,US,CO,81058,3.9,,,, +US-CO-81059,US,CO,81059,2.9,,,, +US-CO-81062,US,CO,81062,4.9,,,, +US-CO-81063,US,CO,81063,6.9,,,, +US-CO-81064,US,CO,81064,2.9,,,, +US-CO-81067,US,CO,81067,6.9,,,, +US-CO-81069,US,CO,81069,3.9,,,, +US-CO-81071,US,CO,81071,2.9,,,, +US-CO-81073,US,CO,81073,4.9,,,, +US-CO-81076,US,CO,81076,4.9,,,, +US-CO-81077,US,CO,81077,3.9,,,, +US-CO-81081,US,CO,81081,2.9,,,, +US-CO-81082,US,CO,81082,6.9,,,, +US-CO-81084,US,CO,81084,2.9,,,, +US-CO-81087,US,CO,81087,2.9,,,, +US-CO-81089,US,CO,81089,7.9,,,, +US-CO-81090,US,CO,81090,2.9,,,, +US-CO-81091,US,CO,81091,2.9,,,, +US-CO-81092,US,CO,81092,3.9,,,, +US-CO-81101,US,CO,81101,6.9,,,, +US-CO-81102,US,CO,81102,6.9,,,, +US-CO-81120,US,CO,81120,2.9,,,, +US-CO-81121,US,CO,81121,6.9,,,, +US-CO-81122,US,CO,81122,4.9,,,, +US-CO-81123,US,CO,81123,3.9,,,, +US-CO-81124,US,CO,81124,2.9,,,, +US-CO-81125,US,CO,81125,3.9,,,, +US-CO-81126,US,CO,81126,3.9,,,, +US-CO-81128,US,CO,81128,6.9,,,, +US-CO-81129,US,CO,81129,2.9,,,, +US-CO-81130,US,CO,81130,5.5,,,, +US-CO-81131,US,CO,81131,6.9,,,, +US-CO-81132,US,CO,81132,7.5,,,, +US-CO-81133,US,CO,81133,3.9,,,, +US-CO-81135,US,CO,81135,7.5,,,, +US-CO-81136,US,CO,81136,4.9,,,, +US-CO-81137,US,CO,81137,4.9,,,, +US-CO-81138,US,CO,81138,3.9,,,, +US-CO-81140,US,CO,81140,2.9,,,, +US-CO-81141,US,CO,81141,3.9,,,, +US-CO-81143,US,CO,81143,3.9,,,, +US-CO-81144,US,CO,81144,7.5,,,, +US-CO-81146,US,CO,81146,4.9,,,, +US-CO-81147,US,CO,81147,6.9,,,, +US-CO-81148,US,CO,81148,3.9,,,, +US-CO-81149,US,CO,81149,3.9,,,, +US-CO-81151,US,CO,81151,2.9,,,, +US-CO-81152,US,CO,81152,3.9,,,, +US-CO-81154,US,CO,81154,5.5,,,, +US-CO-81155,US,CO,81155,3.9,,,, +US-CO-81157,US,CO,81157,6.9,,,, +US-CO-81201,US,CO,81201,7.9,,,, +US-CO-81210,US,CO,81210,4.5,,,, +US-CO-81211,US,CO,81211,4.9,,,, +US-CO-81212,US,CO,81212,6.4,,,, +US-CO-81215,US,CO,81215,6.4,,,, +US-CO-81220,US,CO,81220,4.5,,,, +US-CO-81221,US,CO,81221,4.4,,,, +US-CO-81222,US,CO,81222,4.4,,,, +US-CO-81223,US,CO,81223,4.4,,,, +US-CO-81224,US,CO,81224,4.5,,,, +US-CO-81225,US,CO,81225,8.5,,,, +US-CO-81226,US,CO,81226,6.9,,,, +US-CO-81227,US,CO,81227,7.9,,,, +US-CO-81228,US,CO,81228,4.9,,,, +US-CO-81230,US,CO,81230,8.25,,,, +US-CO-81231,US,CO,81231,8.25,,,, +US-CO-81232,US,CO,81232,7.9,,,, +US-CO-81233,US,CO,81233,4.4,,,, +US-CO-81235,US,CO,81235,7.9,,,, +US-CO-81236,US,CO,81236,4.9,,,, +US-CO-81237,US,CO,81237,4.5,,,, +US-CO-81239,US,CO,81239,4.5,,,, +US-CO-81240,US,CO,81240,4.4,,,, +US-CO-81241,US,CO,81241,6.9,,,, +US-CO-81242,US,CO,81242,6.9,,,, +US-CO-81243,US,CO,81243,4.5,,,, +US-CO-81244,US,CO,81244,4.4,,,, +US-CO-81247,US,CO,81247,8.25,,,, +US-CO-81248,US,CO,81248,3.9,,,, +US-CO-81251,US,CO,81251,6.9,,,, +US-CO-81252,US,CO,81252,4.9,,,, +US-CO-81253,US,CO,81253,4.9,,,, +US-CO-81290,US,CO,81290,6.9,,,, +US-CO-81301,US,CO,81301,7.9,,,, +US-CO-81302,US,CO,81302,7.9,,,, +US-CO-81303,US,CO,81303,4.9,,,, +US-CO-81320,US,CO,81320,2.9,,,, +US-CO-81321,US,CO,81321,6.95,,,, +US-CO-81323,US,CO,81323,2.9,,,, +US-CO-81324,US,CO,81324,2.9,,,, +US-CO-81325,US,CO,81325,3.9,,,, +US-CO-81326,US,CO,81326,4.9,,,, +US-CO-81327,US,CO,81327,2.9,,,, +US-CO-81328,US,CO,81328,2.9,,,, +US-CO-81329,US,CO,81329,4.9,,,, +US-CO-81330,US,CO,81330,2.9,,,, +US-CO-81331,US,CO,81331,2.9,,,, +US-CO-81332,US,CO,81332,7.9,,,, +US-CO-81334,US,CO,81334,2.9,,,, +US-CO-81335,US,CO,81335,2.9,,,, +US-CO-81401,US,CO,81401,7.65,,,, +US-CO-81402,US,CO,81402,7.65,,,, +US-CO-81403,US,CO,81403,4.65,,,, +US-CO-81410,US,CO,81410,4.9,,,, +US-CO-81411,US,CO,81411,4.65,,,, +US-CO-81413,US,CO,81413,4.9,,,, +US-CO-81414,US,CO,81414,4.9,,,, +US-CO-81415,US,CO,81415,4.9,,,, +US-CO-81416,US,CO,81416,7.9,,,, +US-CO-81418,US,CO,81418,4.9,,,, +US-CO-81419,US,CO,81419,4.9,,,, +US-CO-81420,US,CO,81420,4.9,,,, +US-CO-81422,US,CO,81422,8.65,,,, +US-CO-81423,US,CO,81423,6.9,,,, +US-CO-81424,US,CO,81424,8.65,,,, +US-CO-81425,US,CO,81425,4.65,,,, +US-CO-81426,US,CO,81426,3.9,,,, +US-CO-81427,US,CO,81427,7.9,,,, +US-CO-81428,US,CO,81428,4.9,,,, +US-CO-81429,US,CO,81429,4.65,,,, +US-CO-81430,US,CO,81430,3.9,,,, +US-CO-81431,US,CO,81431,4.65,,,, +US-CO-81432,US,CO,81432,4.9,,,, +US-CO-81433,US,CO,81433,8.9,,,, +US-CO-81434,US,CO,81434,4.5,,,, +US-CO-81435,US,CO,81435,8.4,,,, +US-CO-81501,US,CO,81501,7.65,,,, +US-CO-81502,US,CO,81502,7.65,,,, +US-CO-81503,US,CO,81503,4.9,,,, +US-CO-81504,US,CO,81504,4.9,,,, +US-CO-81505,US,CO,81505,7.65,,,, +US-CO-81506,US,CO,81506,7.65,,,, +US-CO-81507,US,CO,81507,4.9,,,, +US-CO-81520,US,CO,81520,4.9,,,, +US-CO-81521,US,CO,81521,7.9,,,, +US-CO-81522,US,CO,81522,4.9,,,, +US-CO-81523,US,CO,81523,4.9,,,, +US-CO-81524,US,CO,81524,4.9,,,, +US-CO-81525,US,CO,81525,4.9,,,, +US-CO-81526,US,CO,81526,6.9,,,, +US-CO-81527,US,CO,81527,4.9,,,, +US-CO-81601,US,CO,81601,8.6,,,, +US-CO-81602,US,CO,81602,8.6,,,, +US-CO-81610,US,CO,81610,4.9,,,, +US-CO-81611,US,CO,81611,9.3,,,, +US-CO-81612,US,CO,81612,9.3,,,, +US-CO-81615,US,CO,81615,10.4,,,, +US-CO-81620,US,CO,81620,8.4,,,, +US-CO-81621,US,CO,81621,8.2,,,, +US-CO-81623,US,CO,81623,8.4,,,, +US-CO-81624,US,CO,81624,4.9,,,, +US-CO-81625,US,CO,81625,7.15,,,, +US-CO-81626,US,CO,81626,7.15,,,, +US-CO-81630,US,CO,81630,4.9,,,, +US-CO-81631,US,CO,81631,8.4,,,, +US-CO-81632,US,CO,81632,4.4,,,, +US-CO-81633,US,CO,81633,4.9,,,, +US-CO-81635,US,CO,81635,3.9,,,, +US-CO-81636,US,CO,81636,7.65,,,, +US-CO-81637,US,CO,81637,4.4,,,, +US-CO-81638,US,CO,81638,4.9,,,, +US-CO-81639,US,CO,81639,3.9,,,, +US-CO-81640,US,CO,81640,4.9,,,, +US-CO-81641,US,CO,81641,6.5,,,, +US-CO-81642,US,CO,81642,6.9,,,, +US-CO-81643,US,CO,81643,4.9,,,, +US-CO-81645,US,CO,81645,8.4,,,, +US-CO-81646,US,CO,81646,4.9,,,, +US-CO-81647,US,CO,81647,3.9,,,, +US-CO-81648,US,CO,81648,6.5,,,, +US-CO-81649,US,CO,81649,7.4,,,, +US-CO-81650,US,CO,81650,8.15,,,, +US-CO-81652,US,CO,81652,6.9,,,, +US-CO-81653,US,CO,81653,4.9,,,, +US-CO-81654,US,CO,81654,6.9,,,, +US-CO-81655,US,CO,81655,4.4,,,, +US-CO-81656,US,CO,81656,6.9,,,, +US-CO-81657,US,CO,81657,8.4,,,, +US-CO-81658,US,CO,81658,8.4,,,, +US-CT-06001,US,CT,06001,6.35,,,, +US-CT-06002,US,CT,06002,6.35,,,, +US-CT-06006,US,CT,06006,6.35,,,, +US-CT-06010,US,CT,06010,6.35,,,, +US-CT-06011,US,CT,06011,6.35,,,, +US-CT-06013,US,CT,06013,6.35,,,, +US-CT-06016,US,CT,06016,6.35,,,, +US-CT-06018,US,CT,06018,6.35,,,, +US-CT-06019,US,CT,06019,6.35,,,, +US-CT-06020,US,CT,06020,6.35,,,, +US-CT-06021,US,CT,06021,6.35,,,, +US-CT-06022,US,CT,06022,6.35,,,, +US-CT-06023,US,CT,06023,6.35,,,, +US-CT-06024,US,CT,06024,6.35,,,, +US-CT-06025,US,CT,06025,6.35,,,, +US-CT-06026,US,CT,06026,6.35,,,, +US-CT-06027,US,CT,06027,6.35,,,, +US-CT-06028,US,CT,06028,6.35,,,, +US-CT-06029,US,CT,06029,6.35,,,, +US-CT-06030,US,CT,06030,6.35,,,, +US-CT-06031,US,CT,06031,6.35,,,, +US-CT-06032,US,CT,06032,6.35,,,, +US-CT-06033,US,CT,06033,6.35,,,, +US-CT-06034,US,CT,06034,6.35,,,, +US-CT-06035,US,CT,06035,6.35,,,, +US-CT-06037,US,CT,06037,6.35,,,, +US-CT-06039,US,CT,06039,6.35,,,, +US-CT-06040,US,CT,06040,6.35,,,, +US-CT-06041,US,CT,06041,6.35,,,, +US-CT-06042,US,CT,06042,6.35,,,, +US-CT-06043,US,CT,06043,6.35,,,, +US-CT-06045,US,CT,06045,6.35,,,, +US-CT-06050,US,CT,06050,6.35,,,, +US-CT-06051,US,CT,06051,6.35,,,, +US-CT-06052,US,CT,06052,6.35,,,, +US-CT-06053,US,CT,06053,6.35,,,, +US-CT-06057,US,CT,06057,6.35,,,, +US-CT-06058,US,CT,06058,6.35,,,, +US-CT-06059,US,CT,06059,6.35,,,, +US-CT-06060,US,CT,06060,6.35,,,, +US-CT-06061,US,CT,06061,6.35,,,, +US-CT-06062,US,CT,06062,6.35,,,, +US-CT-06063,US,CT,06063,6.35,,,, +US-CT-06064,US,CT,06064,6.35,,,, +US-CT-06065,US,CT,06065,6.35,,,, +US-CT-06066,US,CT,06066,6.35,,,, +US-CT-06067,US,CT,06067,6.35,,,, +US-CT-06068,US,CT,06068,6.35,,,, +US-CT-06069,US,CT,06069,6.35,,,, +US-CT-06070,US,CT,06070,6.35,,,, +US-CT-06071,US,CT,06071,6.35,,,, +US-CT-06072,US,CT,06072,6.35,,,, +US-CT-06073,US,CT,06073,6.35,,,, +US-CT-06074,US,CT,06074,6.35,,,, +US-CT-06075,US,CT,06075,6.35,,,, +US-CT-06076,US,CT,06076,6.35,,,, +US-CT-06077,US,CT,06077,6.35,,,, +US-CT-06078,US,CT,06078,6.35,,,, +US-CT-06079,US,CT,06079,6.35,,,, +US-CT-06080,US,CT,06080,6.35,,,, +US-CT-06081,US,CT,06081,6.35,,,, +US-CT-06082,US,CT,06082,6.35,,,, +US-CT-06083,US,CT,06083,6.35,,,, +US-CT-06084,US,CT,06084,6.35,,,, +US-CT-06085,US,CT,06085,6.35,,,, +US-CT-06087,US,CT,06087,6.35,,,, +US-CT-06088,US,CT,06088,6.35,,,, +US-CT-06089,US,CT,06089,6.35,,,, +US-CT-06090,US,CT,06090,6.35,,,, +US-CT-06091,US,CT,06091,6.35,,,, +US-CT-06092,US,CT,06092,6.35,,,, +US-CT-06093,US,CT,06093,6.35,,,, +US-CT-06094,US,CT,06094,6.35,,,, +US-CT-06095,US,CT,06095,6.35,,,, +US-CT-06096,US,CT,06096,6.35,,,, +US-CT-06098,US,CT,06098,6.35,,,, +US-CT-06101,US,CT,06101,6.35,,,, +US-CT-06102,US,CT,06102,6.35,,,, +US-CT-06103,US,CT,06103,6.35,,,, +US-CT-06104,US,CT,06104,6.35,,,, +US-CT-06105,US,CT,06105,6.35,,,, +US-CT-06106,US,CT,06106,6.35,,,, +US-CT-06107,US,CT,06107,6.35,,,, +US-CT-06108,US,CT,06108,6.35,,,, +US-CT-06109,US,CT,06109,6.35,,,, +US-CT-06110,US,CT,06110,6.35,,,, +US-CT-06111,US,CT,06111,6.35,,,, +US-CT-06112,US,CT,06112,6.35,,,, +US-CT-06114,US,CT,06114,6.35,,,, +US-CT-06115,US,CT,06115,6.35,,,, +US-CT-06117,US,CT,06117,6.35,,,, +US-CT-06118,US,CT,06118,6.35,,,, +US-CT-06119,US,CT,06119,6.35,,,, +US-CT-06120,US,CT,06120,6.35,,,, +US-CT-06123,US,CT,06123,6.35,,,, +US-CT-06126,US,CT,06126,6.35,,,, +US-CT-06127,US,CT,06127,6.35,,,, +US-CT-06128,US,CT,06128,6.35,,,, +US-CT-06129,US,CT,06129,6.35,,,, +US-CT-06131,US,CT,06131,6.35,,,, +US-CT-06132,US,CT,06132,6.35,,,, +US-CT-06133,US,CT,06133,6.35,,,, +US-CT-06134,US,CT,06134,6.35,,,, +US-CT-06137,US,CT,06137,6.35,,,, +US-CT-06138,US,CT,06138,6.35,,,, +US-CT-06140,US,CT,06140,6.35,,,, +US-CT-06141,US,CT,06141,6.35,,,, +US-CT-06142,US,CT,06142,6.35,,,, +US-CT-06143,US,CT,06143,6.35,,,, +US-CT-06144,US,CT,06144,6.35,,,, +US-CT-06145,US,CT,06145,6.35,,,, +US-CT-06146,US,CT,06146,6.35,,,, +US-CT-06147,US,CT,06147,6.35,,,, +US-CT-06150,US,CT,06150,6.35,,,, +US-CT-06151,US,CT,06151,6.35,,,, +US-CT-06152,US,CT,06152,6.35,,,, +US-CT-06153,US,CT,06153,6.35,,,, +US-CT-06154,US,CT,06154,6.35,,,, +US-CT-06155,US,CT,06155,6.35,,,, +US-CT-06156,US,CT,06156,6.35,,,, +US-CT-06160,US,CT,06160,6.35,,,, +US-CT-06161,US,CT,06161,6.35,,,, +US-CT-06167,US,CT,06167,6.35,,,, +US-CT-06176,US,CT,06176,6.35,,,, +US-CT-06180,US,CT,06180,6.35,,,, +US-CT-06183,US,CT,06183,6.35,,,, +US-CT-06199,US,CT,06199,6.35,,,, +US-CT-06226,US,CT,06226,6.35,,,, +US-CT-06230,US,CT,06230,6.35,,,, +US-CT-06231,US,CT,06231,6.35,,,, +US-CT-06232,US,CT,06232,6.35,,,, +US-CT-06233,US,CT,06233,6.35,,,, +US-CT-06234,US,CT,06234,6.35,,,, +US-CT-06235,US,CT,06235,6.35,,,, +US-CT-06237,US,CT,06237,6.35,,,, +US-CT-06238,US,CT,06238,6.35,,,, +US-CT-06239,US,CT,06239,6.35,,,, +US-CT-06241,US,CT,06241,6.35,,,, +US-CT-06242,US,CT,06242,6.35,,,, +US-CT-06243,US,CT,06243,6.35,,,, +US-CT-06244,US,CT,06244,6.35,,,, +US-CT-06245,US,CT,06245,6.35,,,, +US-CT-06246,US,CT,06246,6.35,,,, +US-CT-06247,US,CT,06247,6.35,,,, +US-CT-06248,US,CT,06248,6.35,,,, +US-CT-06249,US,CT,06249,6.35,,,, +US-CT-06250,US,CT,06250,6.35,,,, +US-CT-06251,US,CT,06251,6.35,,,, +US-CT-06254,US,CT,06254,6.35,,,, +US-CT-06255,US,CT,06255,6.35,,,, +US-CT-06256,US,CT,06256,6.35,,,, +US-CT-06258,US,CT,06258,6.35,,,, +US-CT-06259,US,CT,06259,6.35,,,, +US-CT-06260,US,CT,06260,6.35,,,, +US-CT-06262,US,CT,06262,6.35,,,, +US-CT-06263,US,CT,06263,6.35,,,, +US-CT-06264,US,CT,06264,6.35,,,, +US-CT-06265,US,CT,06265,6.35,,,, +US-CT-06266,US,CT,06266,6.35,,,, +US-CT-06267,US,CT,06267,6.35,,,, +US-CT-06268,US,CT,06268,6.35,,,, +US-CT-06269,US,CT,06269,6.35,,,, +US-CT-06277,US,CT,06277,6.35,,,, +US-CT-06278,US,CT,06278,6.35,,,, +US-CT-06279,US,CT,06279,6.35,,,, +US-CT-06280,US,CT,06280,6.35,,,, +US-CT-06281,US,CT,06281,6.35,,,, +US-CT-06282,US,CT,06282,6.35,,,, +US-CT-06320,US,CT,06320,6.35,,,, +US-CT-06330,US,CT,06330,6.35,,,, +US-CT-06331,US,CT,06331,6.35,,,, +US-CT-06332,US,CT,06332,6.35,,,, +US-CT-06333,US,CT,06333,6.35,,,, +US-CT-06334,US,CT,06334,6.35,,,, +US-CT-06335,US,CT,06335,6.35,,,, +US-CT-06336,US,CT,06336,6.35,,,, +US-CT-06338,US,CT,06338,6.35,,,, +US-CT-06339,US,CT,06339,6.35,,,, +US-CT-06340,US,CT,06340,6.35,,,, +US-CT-06349,US,CT,06349,6.35,,,, +US-CT-06350,US,CT,06350,6.35,,,, +US-CT-06351,US,CT,06351,6.35,,,, +US-CT-06353,US,CT,06353,6.35,,,, +US-CT-06354,US,CT,06354,6.35,,,, +US-CT-06355,US,CT,06355,6.35,,,, +US-CT-06357,US,CT,06357,6.35,,,, +US-CT-06359,US,CT,06359,6.35,,,, +US-CT-06360,US,CT,06360,6.35,,,, +US-CT-06365,US,CT,06365,6.35,,,, +US-CT-06370,US,CT,06370,6.35,,,, +US-CT-06371,US,CT,06371,6.35,,,, +US-CT-06372,US,CT,06372,6.35,,,, +US-CT-06373,US,CT,06373,6.35,,,, +US-CT-06374,US,CT,06374,6.35,,,, +US-CT-06375,US,CT,06375,6.35,,,, +US-CT-06376,US,CT,06376,6.35,,,, +US-CT-06377,US,CT,06377,6.35,,,, +US-CT-06378,US,CT,06378,6.35,,,, +US-CT-06379,US,CT,06379,6.35,,,, +US-CT-06380,US,CT,06380,6.35,,,, +US-CT-06382,US,CT,06382,6.35,,,, +US-CT-06383,US,CT,06383,6.35,,,, +US-CT-06384,US,CT,06384,6.35,,,, +US-CT-06385,US,CT,06385,6.35,,,, +US-CT-06387,US,CT,06387,6.35,,,, +US-CT-06388,US,CT,06388,6.35,,,, +US-CT-06389,US,CT,06389,6.35,,,, +US-CT-06401,US,CT,06401,6.35,,,, +US-CT-06403,US,CT,06403,6.35,,,, +US-CT-06404,US,CT,06404,6.35,,,, +US-CT-06405,US,CT,06405,6.35,,,, +US-CT-06408,US,CT,06408,6.35,,,, +US-CT-06409,US,CT,06409,6.35,,,, +US-CT-06410,US,CT,06410,6.35,,,, +US-CT-06411,US,CT,06411,6.35,,,, +US-CT-06412,US,CT,06412,6.35,,,, +US-CT-06413,US,CT,06413,6.35,,,, +US-CT-06414,US,CT,06414,6.35,,,, +US-CT-06415,US,CT,06415,6.35,,,, +US-CT-06416,US,CT,06416,6.35,,,, +US-CT-06417,US,CT,06417,6.35,,,, +US-CT-06418,US,CT,06418,6.35,,,, +US-CT-06419,US,CT,06419,6.35,,,, +US-CT-06420,US,CT,06420,6.35,,,, +US-CT-06422,US,CT,06422,6.35,,,, +US-CT-06423,US,CT,06423,6.35,,,, +US-CT-06424,US,CT,06424,6.35,,,, +US-CT-06426,US,CT,06426,6.35,,,, +US-CT-06437,US,CT,06437,6.35,,,, +US-CT-06438,US,CT,06438,6.35,,,, +US-CT-06439,US,CT,06439,6.35,,,, +US-CT-06440,US,CT,06440,6.35,,,, +US-CT-06441,US,CT,06441,6.35,,,, +US-CT-06442,US,CT,06442,6.35,,,, +US-CT-06443,US,CT,06443,6.35,,,, +US-CT-06444,US,CT,06444,6.35,,,, +US-CT-06447,US,CT,06447,6.35,,,, +US-CT-06450,US,CT,06450,6.35,,,, +US-CT-06451,US,CT,06451,6.35,,,, +US-CT-06455,US,CT,06455,6.35,,,, +US-CT-06456,US,CT,06456,6.35,,,, +US-CT-06457,US,CT,06457,6.35,,,, +US-CT-06459,US,CT,06459,6.35,,,, +US-CT-06460,US,CT,06460,6.35,,,, +US-CT-06461,US,CT,06461,6.35,,,, +US-CT-06467,US,CT,06467,6.35,,,, +US-CT-06468,US,CT,06468,6.35,,,, +US-CT-06469,US,CT,06469,6.35,,,, +US-CT-06470,US,CT,06470,6.35,,,, +US-CT-06471,US,CT,06471,6.35,,,, +US-CT-06472,US,CT,06472,6.35,,,, +US-CT-06473,US,CT,06473,6.35,,,, +US-CT-06474,US,CT,06474,6.35,,,, +US-CT-06475,US,CT,06475,6.35,,,, +US-CT-06477,US,CT,06477,6.35,,,, +US-CT-06478,US,CT,06478,6.35,,,, +US-CT-06479,US,CT,06479,6.35,,,, +US-CT-06480,US,CT,06480,6.35,,,, +US-CT-06481,US,CT,06481,6.35,,,, +US-CT-06482,US,CT,06482,6.35,,,, +US-CT-06483,US,CT,06483,6.35,,,, +US-CT-06484,US,CT,06484,6.35,,,, +US-CT-06487,US,CT,06487,6.35,,,, +US-CT-06488,US,CT,06488,6.35,,,, +US-CT-06489,US,CT,06489,6.35,,,, +US-CT-06491,US,CT,06491,6.35,,,, +US-CT-06492,US,CT,06492,6.35,,,, +US-CT-06493,US,CT,06493,6.35,,,, +US-CT-06494,US,CT,06494,6.35,,,, +US-CT-06495,US,CT,06495,6.35,,,, +US-CT-06498,US,CT,06498,6.35,,,, +US-CT-06501,US,CT,06501,6.35,,,, +US-CT-06502,US,CT,06502,6.35,,,, +US-CT-06503,US,CT,06503,6.35,,,, +US-CT-06504,US,CT,06504,6.35,,,, +US-CT-06505,US,CT,06505,6.35,,,, +US-CT-06506,US,CT,06506,6.35,,,, +US-CT-06507,US,CT,06507,6.35,,,, +US-CT-06508,US,CT,06508,6.35,,,, +US-CT-06509,US,CT,06509,6.35,,,, +US-CT-06510,US,CT,06510,6.35,,,, +US-CT-06511,US,CT,06511,6.35,,,, +US-CT-06512,US,CT,06512,6.35,,,, +US-CT-06513,US,CT,06513,6.35,,,, +US-CT-06514,US,CT,06514,6.35,,,, +US-CT-06515,US,CT,06515,6.35,,,, +US-CT-06516,US,CT,06516,6.35,,,, +US-CT-06517,US,CT,06517,6.35,,,, +US-CT-06518,US,CT,06518,6.35,,,, +US-CT-06519,US,CT,06519,6.35,,,, +US-CT-06520,US,CT,06520,6.35,,,, +US-CT-06521,US,CT,06521,6.35,,,, +US-CT-06524,US,CT,06524,6.35,,,, +US-CT-06525,US,CT,06525,6.35,,,, +US-CT-06530,US,CT,06530,6.35,,,, +US-CT-06531,US,CT,06531,6.35,,,, +US-CT-06532,US,CT,06532,6.35,,,, +US-CT-06533,US,CT,06533,6.35,,,, +US-CT-06534,US,CT,06534,6.35,,,, +US-CT-06535,US,CT,06535,6.35,,,, +US-CT-06536,US,CT,06536,6.35,,,, +US-CT-06537,US,CT,06537,6.35,,,, +US-CT-06538,US,CT,06538,6.35,,,, +US-CT-06540,US,CT,06540,6.35,,,, +US-CT-06601,US,CT,06601,6.35,,,, +US-CT-06602,US,CT,06602,6.35,,,, +US-CT-06604,US,CT,06604,6.35,,,, +US-CT-06605,US,CT,06605,6.35,,,, +US-CT-06606,US,CT,06606,6.35,,,, +US-CT-06607,US,CT,06607,6.35,,,, +US-CT-06608,US,CT,06608,6.35,,,, +US-CT-06610,US,CT,06610,6.35,,,, +US-CT-06611,US,CT,06611,6.35,,,, +US-CT-06612,US,CT,06612,6.35,,,, +US-CT-06614,US,CT,06614,6.35,,,, +US-CT-06615,US,CT,06615,6.35,,,, +US-CT-06650,US,CT,06650,6.35,,,, +US-CT-06673,US,CT,06673,6.35,,,, +US-CT-06699,US,CT,06699,6.35,,,, +US-CT-06701,US,CT,06701,6.35,,,, +US-CT-06702,US,CT,06702,6.35,,,, +US-CT-06703,US,CT,06703,6.35,,,, +US-CT-06704,US,CT,06704,6.35,,,, +US-CT-06705,US,CT,06705,6.35,,,, +US-CT-06706,US,CT,06706,6.35,,,, +US-CT-06708,US,CT,06708,6.35,,,, +US-CT-06710,US,CT,06710,6.35,,,, +US-CT-06712,US,CT,06712,6.35,,,, +US-CT-06716,US,CT,06716,6.35,,,, +US-CT-06720,US,CT,06720,6.35,,,, +US-CT-06721,US,CT,06721,6.35,,,, +US-CT-06722,US,CT,06722,6.35,,,, +US-CT-06723,US,CT,06723,6.35,,,, +US-CT-06724,US,CT,06724,6.35,,,, +US-CT-06725,US,CT,06725,6.35,,,, +US-CT-06726,US,CT,06726,6.35,,,, +US-CT-06749,US,CT,06749,6.35,,,, +US-CT-06750,US,CT,06750,6.35,,,, +US-CT-06751,US,CT,06751,6.35,,,, +US-CT-06752,US,CT,06752,6.35,,,, +US-CT-06753,US,CT,06753,6.35,,,, +US-CT-06754,US,CT,06754,6.35,,,, +US-CT-06755,US,CT,06755,6.35,,,, +US-CT-06756,US,CT,06756,6.35,,,, +US-CT-06757,US,CT,06757,6.35,,,, +US-CT-06758,US,CT,06758,6.35,,,, +US-CT-06759,US,CT,06759,6.35,,,, +US-CT-06762,US,CT,06762,6.35,,,, +US-CT-06763,US,CT,06763,6.35,,,, +US-CT-06770,US,CT,06770,6.35,,,, +US-CT-06776,US,CT,06776,6.35,,,, +US-CT-06777,US,CT,06777,6.35,,,, +US-CT-06778,US,CT,06778,6.35,,,, +US-CT-06779,US,CT,06779,6.35,,,, +US-CT-06781,US,CT,06781,6.35,,,, +US-CT-06782,US,CT,06782,6.35,,,, +US-CT-06783,US,CT,06783,6.35,,,, +US-CT-06784,US,CT,06784,6.35,,,, +US-CT-06785,US,CT,06785,6.35,,,, +US-CT-06786,US,CT,06786,6.35,,,, +US-CT-06787,US,CT,06787,6.35,,,, +US-CT-06790,US,CT,06790,6.35,,,, +US-CT-06791,US,CT,06791,6.35,,,, +US-CT-06792,US,CT,06792,6.35,,,, +US-CT-06793,US,CT,06793,6.35,,,, +US-CT-06794,US,CT,06794,6.35,,,, +US-CT-06795,US,CT,06795,6.35,,,, +US-CT-06796,US,CT,06796,6.35,,,, +US-CT-06798,US,CT,06798,6.35,,,, +US-CT-06801,US,CT,06801,6.35,,,, +US-CT-06804,US,CT,06804,6.35,,,, +US-CT-06807,US,CT,06807,6.35,,,, +US-CT-06810,US,CT,06810,6.35,,,, +US-CT-06811,US,CT,06811,6.35,,,, +US-CT-06812,US,CT,06812,6.35,,,, +US-CT-06813,US,CT,06813,6.35,,,, +US-CT-06814,US,CT,06814,6.35,,,, +US-CT-06816,US,CT,06816,6.35,,,, +US-CT-06817,US,CT,06817,6.35,,,, +US-CT-06820,US,CT,06820,6.35,,,, +US-CT-06824,US,CT,06824,6.35,,,, +US-CT-06825,US,CT,06825,6.35,,,, +US-CT-06828,US,CT,06828,6.35,,,, +US-CT-06829,US,CT,06829,6.35,,,, +US-CT-06830,US,CT,06830,6.35,,,, +US-CT-06831,US,CT,06831,6.35,,,, +US-CT-06836,US,CT,06836,6.35,,,, +US-CT-06838,US,CT,06838,6.35,,,, +US-CT-06840,US,CT,06840,6.35,,,, +US-CT-06850,US,CT,06850,6.35,,,, +US-CT-06851,US,CT,06851,6.35,,,, +US-CT-06852,US,CT,06852,6.35,,,, +US-CT-06853,US,CT,06853,6.35,,,, +US-CT-06854,US,CT,06854,6.35,,,, +US-CT-06855,US,CT,06855,6.35,,,, +US-CT-06856,US,CT,06856,6.35,,,, +US-CT-06857,US,CT,06857,6.35,,,, +US-CT-06858,US,CT,06858,6.35,,,, +US-CT-06859,US,CT,06859,6.35,,,, +US-CT-06860,US,CT,06860,6.35,,,, +US-CT-06870,US,CT,06870,6.35,,,, +US-CT-06875,US,CT,06875,6.35,,,, +US-CT-06876,US,CT,06876,6.35,,,, +US-CT-06877,US,CT,06877,6.35,,,, +US-CT-06878,US,CT,06878,6.35,,,, +US-CT-06879,US,CT,06879,6.35,,,, +US-CT-06880,US,CT,06880,6.35,,,, +US-CT-06881,US,CT,06881,6.35,,,, +US-CT-06883,US,CT,06883,6.35,,,, +US-CT-06888,US,CT,06888,6.35,,,, +US-CT-06889,US,CT,06889,6.35,,,, +US-CT-06890,US,CT,06890,6.35,,,, +US-CT-06896,US,CT,06896,6.35,,,, +US-CT-06897,US,CT,06897,6.35,,,, +US-CT-06901,US,CT,06901,6.35,,,, +US-CT-06902,US,CT,06902,6.35,,,, +US-CT-06903,US,CT,06903,6.35,,,, +US-CT-06904,US,CT,06904,6.35,,,, +US-CT-06905,US,CT,06905,6.35,,,, +US-CT-06906,US,CT,06906,6.35,,,, +US-CT-06907,US,CT,06907,6.35,,,, +US-CT-06910,US,CT,06910,6.35,,,, +US-CT-06911,US,CT,06911,6.35,,,, +US-CT-06912,US,CT,06912,6.35,,,, +US-CT-06913,US,CT,06913,6.35,,,, +US-CT-06914,US,CT,06914,6.35,,,, +US-CT-06920,US,CT,06920,6.35,,,, +US-CT-06921,US,CT,06921,6.35,,,, +US-CT-06922,US,CT,06922,6.35,,,, +US-CT-06925,US,CT,06925,6.35,,,, +US-CT-06926,US,CT,06926,6.35,,,, +US-CT-06927,US,CT,06927,6.35,,,, +US-CT-06928,US,CT,06928,6.35,,,, +US-DC-20001,US,DC,20001,5.75,,,, +US-DC-20002,US,DC,20002,5.75,,,, +US-DC-20003,US,DC,20003,5.75,,,, +US-DC-20004,US,DC,20004,5.75,,,, +US-DC-20005,US,DC,20005,5.75,,,, +US-DC-20006,US,DC,20006,5.75,,,, +US-DC-20007,US,DC,20007,5.75,,,, +US-DC-20008,US,DC,20008,5.75,,,, +US-DC-20009,US,DC,20009,5.75,,,, +US-DC-20010,US,DC,20010,5.75,,,, +US-DC-20011,US,DC,20011,5.75,,,, +US-DC-20012,US,DC,20012,5.75,,,, +US-DC-20013,US,DC,20013,5.75,,,, +US-DC-20015,US,DC,20015,5.75,,,, +US-DC-20016,US,DC,20016,5.75,,,, +US-DC-20017,US,DC,20017,5.75,,,, +US-DC-20018,US,DC,20018,5.75,,,, +US-DC-20019,US,DC,20019,5.75,,,, +US-DC-20020,US,DC,20020,5.75,,,, +US-DC-20022,US,DC,20022,5.75,,,, +US-DC-20023,US,DC,20023,5.75,,,, +US-DC-20024,US,DC,20024,5.75,,,, +US-DC-20026,US,DC,20026,5.75,,,, +US-DC-20027,US,DC,20027,5.75,,,, +US-DC-20029,US,DC,20029,5.75,,,, +US-DC-20030,US,DC,20030,5.75,,,, +US-DC-20032,US,DC,20032,5.75,,,, +US-DC-20033,US,DC,20033,5.75,,,, +US-DC-20035,US,DC,20035,5.75,,,, +US-DC-20036,US,DC,20036,5.75,,,, +US-DC-20037,US,DC,20037,5.75,,,, +US-DC-20038,US,DC,20038,5.75,,,, +US-DC-20039,US,DC,20039,5.75,,,, +US-DC-20040,US,DC,20040,5.75,,,, +US-DC-20042,US,DC,20042,5.75,,,, +US-DC-20043,US,DC,20043,5.75,,,, +US-DC-20044,US,DC,20044,5.75,,,, +US-DC-20045,US,DC,20045,5.75,,,, +US-DC-20046,US,DC,20046,5.75,,,, +US-DC-20047,US,DC,20047,5.75,,,, +US-DC-20049,US,DC,20049,5.75,,,, +US-DC-20050,US,DC,20050,5.75,,,, +US-DC-20051,US,DC,20051,5.75,,,, +US-DC-20052,US,DC,20052,5.75,,,, +US-DC-20053,US,DC,20053,5.75,,,, +US-DC-20055,US,DC,20055,5.75,,,, +US-DC-20056,US,DC,20056,5.75,,,, +US-DC-20057,US,DC,20057,5.75,,,, +US-DC-20058,US,DC,20058,5.75,,,, +US-DC-20059,US,DC,20059,5.75,,,, +US-DC-20060,US,DC,20060,5.75,,,, +US-DC-20061,US,DC,20061,5.75,,,, +US-DC-20062,US,DC,20062,5.75,,,, +US-DC-20063,US,DC,20063,5.75,,,, +US-DC-20064,US,DC,20064,5.75,,,, +US-DC-20065,US,DC,20065,5.75,,,, +US-DC-20066,US,DC,20066,5.75,,,, +US-DC-20067,US,DC,20067,5.75,,,, +US-DC-20068,US,DC,20068,5.75,,,, +US-DC-20069,US,DC,20069,5.75,,,, +US-DC-20070,US,DC,20070,5.75,,,, +US-DC-20071,US,DC,20071,5.75,,,, +US-DC-20073,US,DC,20073,5.75,,,, +US-DC-20074,US,DC,20074,5.75,,,, +US-DC-20075,US,DC,20075,5.75,,,, +US-DC-20076,US,DC,20076,5.75,,,, +US-DC-20077,US,DC,20077,5.75,,,, +US-DC-20078,US,DC,20078,5.75,,,, +US-DC-20080,US,DC,20080,5.75,,,, +US-DC-20081,US,DC,20081,5.75,,,, +US-DC-20082,US,DC,20082,5.75,,,, +US-DC-20088,US,DC,20088,5.75,,,, +US-DC-20090,US,DC,20090,5.75,,,, +US-DC-20091,US,DC,20091,5.75,,,, +US-DC-20097,US,DC,20097,5.75,,,, +US-DC-20098,US,DC,20098,5.75,,,, +US-DC-20201,US,DC,20201,5.75,,,, +US-DC-20202,US,DC,20202,5.75,,,, +US-DC-20203,US,DC,20203,5.75,,,, +US-DC-20204,US,DC,20204,5.75,,,, +US-DC-20206,US,DC,20206,5.75,,,, +US-DC-20207,US,DC,20207,5.75,,,, +US-DC-20208,US,DC,20208,5.75,,,, +US-DC-20210,US,DC,20210,5.75,,,, +US-DC-20211,US,DC,20211,5.75,,,, +US-DC-20212,US,DC,20212,5.75,,,, +US-DC-20213,US,DC,20213,5.75,,,, +US-DC-20214,US,DC,20214,5.75,,,, +US-DC-20215,US,DC,20215,5.75,,,, +US-DC-20216,US,DC,20216,5.75,,,, +US-DC-20217,US,DC,20217,5.75,,,, +US-DC-20218,US,DC,20218,5.75,,,, +US-DC-20219,US,DC,20219,5.75,,,, +US-DC-20220,US,DC,20220,5.75,,,, +US-DC-20221,US,DC,20221,5.75,,,, +US-DC-20222,US,DC,20222,5.75,,,, +US-DC-20223,US,DC,20223,5.75,,,, +US-DC-20224,US,DC,20224,5.75,,,, +US-DC-20226,US,DC,20226,5.75,,,, +US-DC-20227,US,DC,20227,5.75,,,, +US-DC-20228,US,DC,20228,5.75,,,, +US-DC-20229,US,DC,20229,5.75,,,, +US-DC-20230,US,DC,20230,5.75,,,, +US-DC-20232,US,DC,20232,5.75,,,, +US-DC-20233,US,DC,20233,5.75,,,, +US-DC-20235,US,DC,20235,5.75,,,, +US-DC-20237,US,DC,20237,5.75,,,, +US-DC-20238,US,DC,20238,5.75,,,, +US-DC-20239,US,DC,20239,5.75,,,, +US-DC-20240,US,DC,20240,5.75,,,, +US-DC-20241,US,DC,20241,5.75,,,, +US-DC-20242,US,DC,20242,5.75,,,, +US-DC-20244,US,DC,20244,5.75,,,, +US-DC-20245,US,DC,20245,5.75,,,, +US-DC-20250,US,DC,20250,5.75,,,, +US-DC-20251,US,DC,20251,5.75,,,, +US-DC-20254,US,DC,20254,5.75,,,, +US-DC-20260,US,DC,20260,5.75,,,, +US-DC-20261,US,DC,20261,5.75,,,, +US-DC-20262,US,DC,20262,5.75,,,, +US-DC-20265,US,DC,20265,5.75,,,, +US-DC-20266,US,DC,20266,5.75,,,, +US-DC-20268,US,DC,20268,5.75,,,, +US-DC-20270,US,DC,20270,5.75,,,, +US-DC-20277,US,DC,20277,5.75,,,, +US-DC-20289,US,DC,20289,5.75,,,, +US-DC-20299,US,DC,20299,5.75,,,, +US-DC-20301,US,DC,20301,5.75,,,, +US-DC-20303,US,DC,20303,5.75,,,, +US-DC-20306,US,DC,20306,5.75,,,, +US-DC-20307,US,DC,20307,5.75,,,, +US-DC-20310,US,DC,20310,5.75,,,, +US-DC-20314,US,DC,20314,5.75,,,, +US-DC-20317,US,DC,20317,5.75,,,, +US-DC-20318,US,DC,20318,5.75,,,, +US-DC-20319,US,DC,20319,5.75,,,, +US-DC-20330,US,DC,20330,5.75,,,, +US-DC-20340,US,DC,20340,5.75,,,, +US-DC-20350,US,DC,20350,5.75,,,, +US-DC-20355,US,DC,20355,5.75,,,, +US-DC-20370,US,DC,20370,5.75,,,, +US-DC-20372,US,DC,20372,5.75,,,, +US-DC-20373,US,DC,20373,5.75,,,, +US-DC-20374,US,DC,20374,5.75,,,, +US-DC-20375,US,DC,20375,5.75,,,, +US-DC-20376,US,DC,20376,5.75,,,, +US-DC-20380,US,DC,20380,5.75,,,, +US-DC-20388,US,DC,20388,5.75,,,, +US-DC-20389,US,DC,20389,5.75,,,, +US-DC-20390,US,DC,20390,5.75,,,, +US-DC-20391,US,DC,20391,5.75,,,, +US-DC-20392,US,DC,20392,5.75,,,, +US-DC-20393,US,DC,20393,5.75,,,, +US-DC-20394,US,DC,20394,5.75,,,, +US-DC-20395,US,DC,20395,5.75,,,, +US-DC-20398,US,DC,20398,5.75,,,, +US-DC-20401,US,DC,20401,5.75,,,, +US-DC-20402,US,DC,20402,5.75,,,, +US-DC-20403,US,DC,20403,5.75,,,, +US-DC-20404,US,DC,20404,5.75,,,, +US-DC-20405,US,DC,20405,5.75,,,, +US-DC-20406,US,DC,20406,5.75,,,, +US-DC-20407,US,DC,20407,5.75,,,, +US-DC-20408,US,DC,20408,5.75,,,, +US-DC-20409,US,DC,20409,5.75,,,, +US-DC-20410,US,DC,20410,5.75,,,, +US-DC-20411,US,DC,20411,5.75,,,, +US-DC-20412,US,DC,20412,5.75,,,, +US-DC-20413,US,DC,20413,5.75,,,, +US-DC-20414,US,DC,20414,5.75,,,, +US-DC-20415,US,DC,20415,5.75,,,, +US-DC-20416,US,DC,20416,5.75,,,, +US-DC-20417,US,DC,20417,5.75,,,, +US-DC-20418,US,DC,20418,5.75,,,, +US-DC-20419,US,DC,20419,5.75,,,, +US-DC-20420,US,DC,20420,5.75,,,, +US-DC-20421,US,DC,20421,5.75,,,, +US-DC-20422,US,DC,20422,5.75,,,, +US-DC-20423,US,DC,20423,5.75,,,, +US-DC-20424,US,DC,20424,5.75,,,, +US-DC-20425,US,DC,20425,5.75,,,, +US-DC-20426,US,DC,20426,5.75,,,, +US-DC-20427,US,DC,20427,5.75,,,, +US-DC-20428,US,DC,20428,5.75,,,, +US-DC-20429,US,DC,20429,5.75,,,, +US-DC-20431,US,DC,20431,5.75,,,, +US-DC-20433,US,DC,20433,5.75,,,, +US-DC-20434,US,DC,20434,5.75,,,, +US-DC-20435,US,DC,20435,5.75,,,, +US-DC-20436,US,DC,20436,5.75,,,, +US-DC-20437,US,DC,20437,5.75,,,, +US-DC-20439,US,DC,20439,5.75,,,, +US-DC-20440,US,DC,20440,5.75,,,, +US-DC-20441,US,DC,20441,5.75,,,, +US-DC-20442,US,DC,20442,5.75,,,, +US-DC-20444,US,DC,20444,5.75,,,, +US-DC-20447,US,DC,20447,5.75,,,, +US-DC-20451,US,DC,20451,5.75,,,, +US-DC-20453,US,DC,20453,5.75,,,, +US-DC-20456,US,DC,20456,5.75,,,, +US-DC-20460,US,DC,20460,5.75,,,, +US-DC-20463,US,DC,20463,5.75,,,, +US-DC-20468,US,DC,20468,5.75,,,, +US-DC-20469,US,DC,20469,5.75,,,, +US-DC-20470,US,DC,20470,5.75,,,, +US-DC-20472,US,DC,20472,5.75,,,, +US-DC-20500,US,DC,20500,5.75,,,, +US-DC-20501,US,DC,20501,5.75,,,, +US-DC-20502,US,DC,20502,5.75,,,, +US-DC-20503,US,DC,20503,5.75,,,, +US-DC-20504,US,DC,20504,5.75,,,, +US-DC-20505,US,DC,20505,5.75,,,, +US-DC-20506,US,DC,20506,5.75,,,, +US-DC-20507,US,DC,20507,5.75,,,, +US-DC-20508,US,DC,20508,5.75,,,, +US-DC-20509,US,DC,20509,5.75,,,, +US-DC-20510,US,DC,20510,5.75,,,, +US-DC-20511,US,DC,20511,5.75,,,, +US-DC-20515,US,DC,20515,5.75,,,, +US-DC-20520,US,DC,20520,5.75,,,, +US-DC-20521,US,DC,20521,5.75,,,, +US-DC-20522,US,DC,20522,5.75,,,, +US-DC-20523,US,DC,20523,5.75,,,, +US-DC-20524,US,DC,20524,5.75,,,, +US-DC-20525,US,DC,20525,5.75,,,, +US-DC-20526,US,DC,20526,5.75,,,, +US-DC-20527,US,DC,20527,5.75,,,, +US-DC-20528,US,DC,20528,5.75,,,, +US-DC-20529,US,DC,20529,5.75,,,, +US-DC-20530,US,DC,20530,5.75,,,, +US-DC-20531,US,DC,20531,5.75,,,, +US-DC-20532,US,DC,20532,5.75,,,, +US-DC-20533,US,DC,20533,5.75,,,, +US-DC-20534,US,DC,20534,5.75,,,, +US-DC-20535,US,DC,20535,5.75,,,, +US-DC-20536,US,DC,20536,5.75,,,, +US-DC-20537,US,DC,20537,5.75,,,, +US-DC-20538,US,DC,20538,5.75,,,, +US-DC-20539,US,DC,20539,5.75,,,, +US-DC-20540,US,DC,20540,5.75,,,, +US-DC-20541,US,DC,20541,5.75,,,, +US-DC-20542,US,DC,20542,5.75,,,, +US-DC-20543,US,DC,20543,5.75,,,, +US-DC-20544,US,DC,20544,5.75,,,, +US-DC-20546,US,DC,20546,5.75,,,, +US-DC-20547,US,DC,20547,5.75,,,, +US-DC-20548,US,DC,20548,5.75,,,, +US-DC-20549,US,DC,20549,5.75,,,, +US-DC-20551,US,DC,20551,5.75,,,, +US-DC-20552,US,DC,20552,5.75,,,, +US-DC-20553,US,DC,20553,5.75,,,, +US-DC-20554,US,DC,20554,5.75,,,, +US-DC-20555,US,DC,20555,5.75,,,, +US-DC-20557,US,DC,20557,5.75,,,, +US-DC-20558,US,DC,20558,5.75,,,, +US-DC-20559,US,DC,20559,5.75,,,, +US-DC-20560,US,DC,20560,5.75,,,, +US-DC-20565,US,DC,20565,5.75,,,, +US-DC-20566,US,DC,20566,5.75,,,, +US-DC-20570,US,DC,20570,5.75,,,, +US-DC-20571,US,DC,20571,5.75,,,, +US-DC-20572,US,DC,20572,5.75,,,, +US-DC-20573,US,DC,20573,5.75,,,, +US-DC-20575,US,DC,20575,5.75,,,, +US-DC-20576,US,DC,20576,5.75,,,, +US-DC-20577,US,DC,20577,5.75,,,, +US-DC-20578,US,DC,20578,5.75,,,, +US-DC-20579,US,DC,20579,5.75,,,, +US-DC-20580,US,DC,20580,5.75,,,, +US-DC-20581,US,DC,20581,5.75,,,, +US-DC-20585,US,DC,20585,5.75,,,, +US-DC-20586,US,DC,20586,5.75,,,, +US-DC-20590,US,DC,20590,5.75,,,, +US-DC-20591,US,DC,20591,5.75,,,, +US-DC-20593,US,DC,20593,5.75,,,, +US-DC-20594,US,DC,20594,5.75,,,, +US-DC-20597,US,DC,20597,5.75,,,, +US-DC-20599,US,DC,20599,5.75,,,, +US-DC-56901,US,DC,56901,5.75,,,, +US-DC-56902,US,DC,56902,5.75,,,, +US-DC-56904,US,DC,56904,5.75,,,, +US-DC-56915,US,DC,56915,5.75,,,, +US-DC-56920,US,DC,56920,5.75,,,, +US-DC-56933,US,DC,56933,5.75,,,, +US-DC-56944,US,DC,56944,5.75,,,, +US-DC-56945,US,DC,56945,5.75,,,, +US-DC-56950,US,DC,56950,5.75,,,, +US-DC-56965,US,DC,56965,5.75,,,, +US-DC-56967,US,DC,56967,5.75,,,, +US-DC-56972,US,DC,56972,5.75,,,, +US-DC-56999,US,DC,56999,5.75,,,, +US-FL-32003,US,FL,32003,7,,,, +US-FL-32004,US,FL,32004,6,,,, +US-FL-32006,US,FL,32006,7,,,, +US-FL-32007,US,FL,32007,7,,,, +US-FL-32008,US,FL,32008,7,,,, +US-FL-32009,US,FL,32009,7,,,, +US-FL-32011,US,FL,32011,7,,,, +US-FL-32013,US,FL,32013,7,,,, +US-FL-32024,US,FL,32024,7,,,, +US-FL-32025,US,FL,32025,7,,,, +US-FL-32030,US,FL,32030,7,,,, +US-FL-32033,US,FL,32033,6,,,, +US-FL-32034,US,FL,32034,7,,,, +US-FL-32035,US,FL,32035,7,,,, +US-FL-32038,US,FL,32038,7,,,, +US-FL-32040,US,FL,32040,7,,,, +US-FL-32041,US,FL,32041,7,,,, +US-FL-32042,US,FL,32042,7,,,, +US-FL-32043,US,FL,32043,7,,,, +US-FL-32044,US,FL,32044,7,,,, +US-FL-32046,US,FL,32046,7,,,, +US-FL-32050,US,FL,32050,7,,,, +US-FL-32052,US,FL,32052,7,,,, +US-FL-32053,US,FL,32053,7,,,, +US-FL-32054,US,FL,32054,7,,,, +US-FL-32055,US,FL,32055,7,,,, +US-FL-32056,US,FL,32056,7,,,, +US-FL-32058,US,FL,32058,7,,,, +US-FL-32059,US,FL,32059,7.5,,,, +US-FL-32060,US,FL,32060,7,,,, +US-FL-32061,US,FL,32061,7,,,, +US-FL-32062,US,FL,32062,7,,,, +US-FL-32063,US,FL,32063,7,,,, +US-FL-32064,US,FL,32064,7,,,, +US-FL-32065,US,FL,32065,7,,,, +US-FL-32066,US,FL,32066,7,,,, +US-FL-32067,US,FL,32067,7,,,, +US-FL-32068,US,FL,32068,7,,,, +US-FL-32071,US,FL,32071,7,,,, +US-FL-32072,US,FL,32072,7,,,, +US-FL-32073,US,FL,32073,7,,,, +US-FL-32079,US,FL,32079,7,,,, +US-FL-32080,US,FL,32080,6,,,, +US-FL-32081,US,FL,32081,6,,,, +US-FL-32082,US,FL,32082,6,,,, +US-FL-32083,US,FL,32083,7,,,, +US-FL-32084,US,FL,32084,6,,,, +US-FL-32085,US,FL,32085,6,,,, +US-FL-32086,US,FL,32086,6,,,, +US-FL-32087,US,FL,32087,7,,,, +US-FL-32091,US,FL,32091,7,,,, +US-FL-32092,US,FL,32092,6,,,, +US-FL-32094,US,FL,32094,7,,,, +US-FL-32095,US,FL,32095,6,,,, +US-FL-32096,US,FL,32096,7,,,, +US-FL-32097,US,FL,32097,7,,,, +US-FL-32099,US,FL,32099,7,,,, +US-FL-32102,US,FL,32102,7,,,, +US-FL-32105,US,FL,32105,6.5,,,, +US-FL-32110,US,FL,32110,7,,,, +US-FL-32111,US,FL,32111,6,,,, +US-FL-32112,US,FL,32112,7,,,, +US-FL-32113,US,FL,32113,6,,,, +US-FL-32114,US,FL,32114,6.5,,,, +US-FL-32115,US,FL,32115,6.5,,,, +US-FL-32116,US,FL,32116,6.5,,,, +US-FL-32117,US,FL,32117,6.5,,,, +US-FL-32118,US,FL,32118,6.5,,,, +US-FL-32119,US,FL,32119,6.5,,,, +US-FL-32120,US,FL,32120,6.5,,,, +US-FL-32121,US,FL,32121,6.5,,,, +US-FL-32122,US,FL,32122,6.5,,,, +US-FL-32123,US,FL,32123,6.5,,,, +US-FL-32124,US,FL,32124,6.5,,,, +US-FL-32125,US,FL,32125,6.5,,,, +US-FL-32126,US,FL,32126,6.5,,,, +US-FL-32127,US,FL,32127,6.5,,,, +US-FL-32128,US,FL,32128,6.5,,,, +US-FL-32129,US,FL,32129,6.5,,,, +US-FL-32130,US,FL,32130,6.5,,,, +US-FL-32131,US,FL,32131,7,,,, +US-FL-32132,US,FL,32132,6.5,,,, +US-FL-32133,US,FL,32133,6,,,, +US-FL-32134,US,FL,32134,6,,,, +US-FL-32135,US,FL,32135,7,,,, +US-FL-32136,US,FL,32136,7,,,, +US-FL-32137,US,FL,32137,7,,,, +US-FL-32138,US,FL,32138,7,,,, +US-FL-32139,US,FL,32139,7,,,, +US-FL-32140,US,FL,32140,7,,,, +US-FL-32141,US,FL,32141,6.5,,,, +US-FL-32142,US,FL,32142,7,,,, +US-FL-32143,US,FL,32143,7,,,, +US-FL-32145,US,FL,32145,6,,,, +US-FL-32147,US,FL,32147,7,,,, +US-FL-32148,US,FL,32148,7,,,, +US-FL-32149,US,FL,32149,7,,,, +US-FL-32157,US,FL,32157,7,,,, +US-FL-32158,US,FL,32158,7,,,, +US-FL-32159,US,FL,32159,7,,,, +US-FL-32160,US,FL,32160,7,,,, +US-FL-32162,US,FL,32162,7,,,, +US-FL-32163,US,FL,32163,7,,,, +US-FL-32164,US,FL,32164,7,,,, +US-FL-32168,US,FL,32168,6.5,,,, +US-FL-32169,US,FL,32169,6.5,,,, +US-FL-32170,US,FL,32170,6.5,,,, +US-FL-32173,US,FL,32173,6.5,,,, +US-FL-32174,US,FL,32174,6.5,,,, +US-FL-32175,US,FL,32175,6.5,,,, +US-FL-32176,US,FL,32176,6.5,,,, +US-FL-32177,US,FL,32177,7,,,, +US-FL-32178,US,FL,32178,7,,,, +US-FL-32179,US,FL,32179,6,,,, +US-FL-32180,US,FL,32180,6.5,,,, +US-FL-32181,US,FL,32181,7,,,, +US-FL-32182,US,FL,32182,6,,,, +US-FL-32183,US,FL,32183,6,,,, +US-FL-32185,US,FL,32185,7,,,, +US-FL-32187,US,FL,32187,7,,,, +US-FL-32189,US,FL,32189,7,,,, +US-FL-32190,US,FL,32190,6.5,,,, +US-FL-32192,US,FL,32192,6,,,, +US-FL-32193,US,FL,32193,7,,,, +US-FL-32195,US,FL,32195,6,,,, +US-FL-32198,US,FL,32198,6.5,,,, +US-FL-32201,US,FL,32201,7,,,, +US-FL-32202,US,FL,32202,7,,,, +US-FL-32203,US,FL,32203,7,,,, +US-FL-32204,US,FL,32204,7,,,, +US-FL-32205,US,FL,32205,7,,,, +US-FL-32206,US,FL,32206,7,,,, +US-FL-32207,US,FL,32207,7,,,, +US-FL-32208,US,FL,32208,7,,,, +US-FL-32209,US,FL,32209,7,,,, +US-FL-32210,US,FL,32210,7,,,, +US-FL-32211,US,FL,32211,7,,,, +US-FL-32212,US,FL,32212,7,,,, +US-FL-32214,US,FL,32214,7,,,, +US-FL-32216,US,FL,32216,7,,,, +US-FL-32217,US,FL,32217,7,,,, +US-FL-32218,US,FL,32218,7,,,, +US-FL-32219,US,FL,32219,7,,,, +US-FL-32220,US,FL,32220,7,,,, +US-FL-32221,US,FL,32221,7,,,, +US-FL-32222,US,FL,32222,7,,,, +US-FL-32223,US,FL,32223,7,,,, +US-FL-32224,US,FL,32224,7,,,, +US-FL-32225,US,FL,32225,7,,,, +US-FL-32226,US,FL,32226,7,,,, +US-FL-32227,US,FL,32227,7,,,, +US-FL-32228,US,FL,32228,7,,,, +US-FL-32229,US,FL,32229,7,,,, +US-FL-32231,US,FL,32231,7,,,, +US-FL-32232,US,FL,32232,7,,,, +US-FL-32233,US,FL,32233,7,,,, +US-FL-32234,US,FL,32234,7,,,, +US-FL-32235,US,FL,32235,7,,,, +US-FL-32236,US,FL,32236,7,,,, +US-FL-32237,US,FL,32237,7,,,, +US-FL-32238,US,FL,32238,7,,,, +US-FL-32239,US,FL,32239,7,,,, +US-FL-32240,US,FL,32240,7,,,, +US-FL-32241,US,FL,32241,7,,,, +US-FL-32244,US,FL,32244,7,,,, +US-FL-32245,US,FL,32245,7,,,, +US-FL-32246,US,FL,32246,7,,,, +US-FL-32247,US,FL,32247,7,,,, +US-FL-32250,US,FL,32250,7,,,, +US-FL-32254,US,FL,32254,7,,,, +US-FL-32255,US,FL,32255,7,,,, +US-FL-32256,US,FL,32256,7,,,, +US-FL-32257,US,FL,32257,7,,,, +US-FL-32258,US,FL,32258,7,,,, +US-FL-32259,US,FL,32259,6,,,, +US-FL-32260,US,FL,32260,7,,,, +US-FL-32266,US,FL,32266,7,,,, +US-FL-32277,US,FL,32277,7,,,, +US-FL-32301,US,FL,32301,7.5,,,, +US-FL-32302,US,FL,32302,7.5,,,, +US-FL-32303,US,FL,32303,7.5,,,, +US-FL-32304,US,FL,32304,7.5,,,, +US-FL-32305,US,FL,32305,7.5,,,, +US-FL-32306,US,FL,32306,7.5,,,, +US-FL-32307,US,FL,32307,7.5,,,, +US-FL-32308,US,FL,32308,7.5,,,, +US-FL-32309,US,FL,32309,7.5,,,, +US-FL-32310,US,FL,32310,7.5,,,, +US-FL-32311,US,FL,32311,7.5,,,, +US-FL-32312,US,FL,32312,7.5,,,, +US-FL-32313,US,FL,32313,7.5,,,, +US-FL-32314,US,FL,32314,7.5,,,, +US-FL-32315,US,FL,32315,7.5,,,, +US-FL-32316,US,FL,32316,7.5,,,, +US-FL-32317,US,FL,32317,7.5,,,, +US-FL-32318,US,FL,32318,7.5,,,, +US-FL-32320,US,FL,32320,7,,,, +US-FL-32321,US,FL,32321,7.5,,,, +US-FL-32322,US,FL,32322,7,,,, +US-FL-32323,US,FL,32323,7,,,, +US-FL-32324,US,FL,32324,7.5,,,, +US-FL-32326,US,FL,32326,7,,,, +US-FL-32327,US,FL,32327,7,,,, +US-FL-32328,US,FL,32328,7,,,, +US-FL-32329,US,FL,32329,7,,,, +US-FL-32330,US,FL,32330,7.5,,,, +US-FL-32331,US,FL,32331,7.5,,,, +US-FL-32332,US,FL,32332,7.5,,,, +US-FL-32333,US,FL,32333,7.5,,,, +US-FL-32334,US,FL,32334,7.5,,,, +US-FL-32335,US,FL,32335,7.5,,,, +US-FL-32336,US,FL,32336,7,,,, +US-FL-32337,US,FL,32337,7,,,, +US-FL-32340,US,FL,32340,7.5,,,, +US-FL-32341,US,FL,32341,7.5,,,, +US-FL-32343,US,FL,32343,7.5,,,, +US-FL-32344,US,FL,32344,7,,,, +US-FL-32345,US,FL,32345,7,,,, +US-FL-32346,US,FL,32346,7,,,, +US-FL-32347,US,FL,32347,7,,,, +US-FL-32348,US,FL,32348,7,,,, +US-FL-32350,US,FL,32350,7.5,,,, +US-FL-32351,US,FL,32351,7.5,,,, +US-FL-32352,US,FL,32352,7.5,,,, +US-FL-32353,US,FL,32353,7.5,,,, +US-FL-32355,US,FL,32355,7,,,, +US-FL-32356,US,FL,32356,7,,,, +US-FL-32357,US,FL,32357,7.5,,,, +US-FL-32358,US,FL,32358,7,,,, +US-FL-32359,US,FL,32359,7,,,, +US-FL-32360,US,FL,32360,7.5,,,, +US-FL-32361,US,FL,32361,7,,,, +US-FL-32362,US,FL,32362,7.5,,,, +US-FL-32395,US,FL,32395,7.5,,,, +US-FL-32399,US,FL,32399,7.5,,,, +US-FL-32401,US,FL,32401,6.5,,,, +US-FL-32402,US,FL,32402,6.5,,,, +US-FL-32403,US,FL,32403,6.5,,,, +US-FL-32404,US,FL,32404,6.5,,,, +US-FL-32405,US,FL,32405,6.5,,,, +US-FL-32406,US,FL,32406,6.5,,,, +US-FL-32407,US,FL,32407,6.5,,,, +US-FL-32408,US,FL,32408,6.5,,,, +US-FL-32409,US,FL,32409,6.5,,,, +US-FL-32410,US,FL,32410,7,,,, +US-FL-32411,US,FL,32411,6.5,,,, +US-FL-32412,US,FL,32412,6.5,,,, +US-FL-32413,US,FL,32413,6.5,,,, +US-FL-32417,US,FL,32417,6.5,,,, +US-FL-32420,US,FL,32420,7.5,,,, +US-FL-32421,US,FL,32421,7.5,,,, +US-FL-32422,US,FL,32422,7.5,,,, +US-FL-32423,US,FL,32423,7.5,,,, +US-FL-32424,US,FL,32424,7.5,,,, +US-FL-32425,US,FL,32425,7,,,, +US-FL-32426,US,FL,32426,7.5,,,, +US-FL-32427,US,FL,32427,7,,,, +US-FL-32428,US,FL,32428,7,,,, +US-FL-32430,US,FL,32430,7.5,,,, +US-FL-32431,US,FL,32431,7.5,,,, +US-FL-32432,US,FL,32432,7.5,,,, +US-FL-32433,US,FL,32433,7.5,,,, +US-FL-32434,US,FL,32434,7.5,,,, +US-FL-32435,US,FL,32435,7.5,,,, +US-FL-32437,US,FL,32437,7,,,, +US-FL-32438,US,FL,32438,6.5,,,, +US-FL-32439,US,FL,32439,7.5,,,, +US-FL-32440,US,FL,32440,7.5,,,, +US-FL-32442,US,FL,32442,7.5,,,, +US-FL-32443,US,FL,32443,7.5,,,, +US-FL-32444,US,FL,32444,6.5,,,, +US-FL-32445,US,FL,32445,7.5,,,, +US-FL-32446,US,FL,32446,7.5,,,, +US-FL-32447,US,FL,32447,7.5,,,, +US-FL-32448,US,FL,32448,7.5,,,, +US-FL-32449,US,FL,32449,7.5,,,, +US-FL-32452,US,FL,32452,7,,,, +US-FL-32455,US,FL,32455,7.5,,,, +US-FL-32456,US,FL,32456,7,,,, +US-FL-32457,US,FL,32457,7,,,, +US-FL-32459,US,FL,32459,7.5,,,, +US-FL-32460,US,FL,32460,7.5,,,, +US-FL-32461,US,FL,32461,6.5,,,, +US-FL-32462,US,FL,32462,7,,,, +US-FL-32463,US,FL,32463,7,,,, +US-FL-32464,US,FL,32464,7,,,, +US-FL-32465,US,FL,32465,7,,,, +US-FL-32466,US,FL,32466,6.5,,,, +US-FL-32501,US,FL,32501,7.5,,,, +US-FL-32502,US,FL,32502,7.5,,,, +US-FL-32503,US,FL,32503,7.5,,,, +US-FL-32504,US,FL,32504,7.5,,,, +US-FL-32505,US,FL,32505,7.5,,,, +US-FL-32506,US,FL,32506,7.5,,,, +US-FL-32507,US,FL,32507,7.5,,,, +US-FL-32508,US,FL,32508,7.5,,,, +US-FL-32509,US,FL,32509,7.5,,,, +US-FL-32511,US,FL,32511,7.5,,,, +US-FL-32512,US,FL,32512,7.5,,,, +US-FL-32513,US,FL,32513,7.5,,,, +US-FL-32514,US,FL,32514,7.5,,,, +US-FL-32516,US,FL,32516,7.5,,,, +US-FL-32520,US,FL,32520,7.5,,,, +US-FL-32521,US,FL,32521,7.5,,,, +US-FL-32522,US,FL,32522,7.5,,,, +US-FL-32523,US,FL,32523,7.5,,,, +US-FL-32524,US,FL,32524,7.5,,,, +US-FL-32526,US,FL,32526,7.5,,,, +US-FL-32530,US,FL,32530,6.5,,,, +US-FL-32531,US,FL,32531,6,,,, +US-FL-32533,US,FL,32533,7.5,,,, +US-FL-32534,US,FL,32534,7.5,,,, +US-FL-32535,US,FL,32535,7.5,,,, +US-FL-32536,US,FL,32536,6,,,, +US-FL-32538,US,FL,32538,6,,,, +US-FL-32539,US,FL,32539,6,,,, +US-FL-32540,US,FL,32540,6,,,, +US-FL-32541,US,FL,32541,6,,,, +US-FL-32542,US,FL,32542,6,,,, +US-FL-32544,US,FL,32544,6,,,, +US-FL-32547,US,FL,32547,6,,,, +US-FL-32548,US,FL,32548,6,,,, +US-FL-32549,US,FL,32549,6,,,, +US-FL-32550,US,FL,32550,7.5,,,, +US-FL-32559,US,FL,32559,7.5,,,, +US-FL-32560,US,FL,32560,7.5,,,, +US-FL-32561,US,FL,32561,7.5,,,, +US-FL-32562,US,FL,32562,6.5,,,, +US-FL-32563,US,FL,32563,6.5,,,, +US-FL-32564,US,FL,32564,6,,,, +US-FL-32565,US,FL,32565,6.5,,,, +US-FL-32566,US,FL,32566,6.5,,,, +US-FL-32567,US,FL,32567,7.5,,,, +US-FL-32568,US,FL,32568,7.5,,,, +US-FL-32569,US,FL,32569,6,,,, +US-FL-32570,US,FL,32570,6.5,,,, +US-FL-32571,US,FL,32571,6.5,,,, +US-FL-32572,US,FL,32572,6.5,,,, +US-FL-32577,US,FL,32577,7.5,,,, +US-FL-32578,US,FL,32578,6,,,, +US-FL-32579,US,FL,32579,6,,,, +US-FL-32580,US,FL,32580,6,,,, +US-FL-32583,US,FL,32583,6.5,,,, +US-FL-32588,US,FL,32588,6,,,, +US-FL-32591,US,FL,32591,7.5,,,, +US-FL-32601,US,FL,32601,6,,,, +US-FL-32602,US,FL,32602,6,,,, +US-FL-32603,US,FL,32603,6,,,, +US-FL-32604,US,FL,32604,6,,,, +US-FL-32605,US,FL,32605,6,,,, +US-FL-32606,US,FL,32606,6,,,, +US-FL-32607,US,FL,32607,6,,,, +US-FL-32608,US,FL,32608,6,,,, +US-FL-32609,US,FL,32609,6,,,, +US-FL-32610,US,FL,32610,6,,,, +US-FL-32611,US,FL,32611,6,,,, +US-FL-32612,US,FL,32612,6,,,, +US-FL-32614,US,FL,32614,6,,,, +US-FL-32615,US,FL,32615,6,,,, +US-FL-32616,US,FL,32616,6,,,, +US-FL-32617,US,FL,32617,6,,,, +US-FL-32618,US,FL,32618,6,,,, +US-FL-32619,US,FL,32619,7,,,, +US-FL-32621,US,FL,32621,7,,,, +US-FL-32622,US,FL,32622,7,,,, +US-FL-32625,US,FL,32625,7,,,, +US-FL-32626,US,FL,32626,7,,,, +US-FL-32627,US,FL,32627,6,,,, +US-FL-32628,US,FL,32628,7,,,, +US-FL-32631,US,FL,32631,6,,,, +US-FL-32633,US,FL,32633,6,,,, +US-FL-32634,US,FL,32634,6,,,, +US-FL-32635,US,FL,32635,6,,,, +US-FL-32639,US,FL,32639,7,,,, +US-FL-32640,US,FL,32640,6,,,, +US-FL-32641,US,FL,32641,6,,,, +US-FL-32643,US,FL,32643,6,,,, +US-FL-32644,US,FL,32644,7,,,, +US-FL-32648,US,FL,32648,7,,,, +US-FL-32653,US,FL,32653,6,,,, +US-FL-32654,US,FL,32654,6,,,, +US-FL-32655,US,FL,32655,6,,,, +US-FL-32656,US,FL,32656,7,,,, +US-FL-32658,US,FL,32658,6,,,, +US-FL-32662,US,FL,32662,6,,,, +US-FL-32663,US,FL,32663,6,,,, +US-FL-32664,US,FL,32664,6,,,, +US-FL-32666,US,FL,32666,7,,,, +US-FL-32667,US,FL,32667,6,,,, +US-FL-32668,US,FL,32668,7,,,, +US-FL-32669,US,FL,32669,6,,,, +US-FL-32680,US,FL,32680,7,,,, +US-FL-32681,US,FL,32681,6,,,, +US-FL-32683,US,FL,32683,7,,,, +US-FL-32686,US,FL,32686,6,,,, +US-FL-32692,US,FL,32692,7,,,, +US-FL-32693,US,FL,32693,7,,,, +US-FL-32694,US,FL,32694,6,,,, +US-FL-32696,US,FL,32696,7,,,, +US-FL-32697,US,FL,32697,7,,,, +US-FL-32701,US,FL,32701,6,,,, +US-FL-32702,US,FL,32702,7,,,, +US-FL-32703,US,FL,32703,6.5,,,, +US-FL-32704,US,FL,32704,6.5,,,, +US-FL-32706,US,FL,32706,6.5,,,, +US-FL-32707,US,FL,32707,6,,,, +US-FL-32708,US,FL,32708,6,,,, +US-FL-32709,US,FL,32709,6.5,,,, +US-FL-32710,US,FL,32710,6.5,,,, +US-FL-32712,US,FL,32712,6.5,,,, +US-FL-32713,US,FL,32713,6.5,,,, +US-FL-32714,US,FL,32714,6,,,, +US-FL-32715,US,FL,32715,6,,,, +US-FL-32716,US,FL,32716,6,,,, +US-FL-32718,US,FL,32718,6,,,, +US-FL-32719,US,FL,32719,6,,,, +US-FL-32720,US,FL,32720,6.5,,,, +US-FL-32721,US,FL,32721,6.5,,,, +US-FL-32722,US,FL,32722,6.5,,,, +US-FL-32723,US,FL,32723,6.5,,,, +US-FL-32724,US,FL,32724,6.5,,,, +US-FL-32725,US,FL,32725,6.5,,,, +US-FL-32726,US,FL,32726,7,,,, +US-FL-32727,US,FL,32727,7,,,, +US-FL-32728,US,FL,32728,6.5,,,, +US-FL-32730,US,FL,32730,6,,,, +US-FL-32732,US,FL,32732,6,,,, +US-FL-32733,US,FL,32733,6,,,, +US-FL-32735,US,FL,32735,7,,,, +US-FL-32736,US,FL,32736,7,,,, +US-FL-32738,US,FL,32738,6.5,,,, +US-FL-32739,US,FL,32739,6.5,,,, +US-FL-32744,US,FL,32744,6.5,,,, +US-FL-32745,US,FL,32745,6,,,, +US-FL-32746,US,FL,32746,6,,,, +US-FL-32747,US,FL,32747,6,,,, +US-FL-32750,US,FL,32750,6,,,, +US-FL-32751,US,FL,32751,6.5,,,, +US-FL-32752,US,FL,32752,6,,,, +US-FL-32753,US,FL,32753,6.5,,,, +US-FL-32754,US,FL,32754,6,,,, +US-FL-32756,US,FL,32756,7,,,, +US-FL-32757,US,FL,32757,7,,,, +US-FL-32759,US,FL,32759,6.5,,,, +US-FL-32762,US,FL,32762,6,,,, +US-FL-32763,US,FL,32763,6.5,,,, +US-FL-32764,US,FL,32764,6.5,,,, +US-FL-32765,US,FL,32765,6,,,, +US-FL-32766,US,FL,32766,6,,,, +US-FL-32767,US,FL,32767,7,,,, +US-FL-32768,US,FL,32768,6.5,,,, +US-FL-32771,US,FL,32771,6,,,, +US-FL-32772,US,FL,32772,6,,,, +US-FL-32773,US,FL,32773,6,,,, +US-FL-32774,US,FL,32774,6.5,,,, +US-FL-32775,US,FL,32775,6,,,, +US-FL-32776,US,FL,32776,7,,,, +US-FL-32777,US,FL,32777,6.5,,,, +US-FL-32778,US,FL,32778,7,,,, +US-FL-32779,US,FL,32779,6,,,, +US-FL-32780,US,FL,32780,6,,,, +US-FL-32781,US,FL,32781,6,,,, +US-FL-32783,US,FL,32783,6,,,, +US-FL-32784,US,FL,32784,7,,,, +US-FL-32789,US,FL,32789,6.5,,,, +US-FL-32790,US,FL,32790,6.5,,,, +US-FL-32791,US,FL,32791,6,,,, +US-FL-32792,US,FL,32792,6.5,,,, +US-FL-32793,US,FL,32793,6.5,,,, +US-FL-32794,US,FL,32794,6.5,,,, +US-FL-32795,US,FL,32795,6,,,, +US-FL-32796,US,FL,32796,6,,,, +US-FL-32798,US,FL,32798,6.5,,,, +US-FL-32799,US,FL,32799,6,,,, +US-FL-32801,US,FL,32801,6.5,,,, +US-FL-32802,US,FL,32802,6.5,,,, +US-FL-32803,US,FL,32803,6.5,,,, +US-FL-32804,US,FL,32804,6.5,,,, +US-FL-32805,US,FL,32805,6.5,,,, +US-FL-32806,US,FL,32806,6.5,,,, +US-FL-32807,US,FL,32807,6.5,,,, +US-FL-32808,US,FL,32808,6.5,,,, +US-FL-32809,US,FL,32809,6.5,,,, +US-FL-32810,US,FL,32810,6.5,,,, +US-FL-32811,US,FL,32811,6.5,,,, +US-FL-32812,US,FL,32812,6.5,,,, +US-FL-32814,US,FL,32814,6.5,,,, +US-FL-32815,US,FL,32815,6.5,,,, +US-FL-32816,US,FL,32816,6.5,,,, +US-FL-32817,US,FL,32817,6.5,,,, +US-FL-32818,US,FL,32818,6.5,,,, +US-FL-32819,US,FL,32819,6.5,,,, +US-FL-32820,US,FL,32820,6.5,,,, +US-FL-32821,US,FL,32821,6.5,,,, +US-FL-32822,US,FL,32822,6.5,,,, +US-FL-32824,US,FL,32824,6.5,,,, +US-FL-32825,US,FL,32825,6.5,,,, +US-FL-32826,US,FL,32826,6.5,,,, +US-FL-32827,US,FL,32827,6.5,,,, +US-FL-32828,US,FL,32828,6.5,,,, +US-FL-32829,US,FL,32829,6.5,,,, +US-FL-32830,US,FL,32830,6.5,,,, +US-FL-32831,US,FL,32831,6.5,,,, +US-FL-32832,US,FL,32832,6.5,,,, +US-FL-32833,US,FL,32833,6.5,,,, +US-FL-32834,US,FL,32834,6.5,,,, +US-FL-32835,US,FL,32835,6.5,,,, +US-FL-32836,US,FL,32836,6.5,,,, +US-FL-32837,US,FL,32837,6.5,,,, +US-FL-32839,US,FL,32839,6.5,,,, +US-FL-32853,US,FL,32853,6.5,,,, +US-FL-32854,US,FL,32854,6.5,,,, +US-FL-32855,US,FL,32855,6.5,,,, +US-FL-32856,US,FL,32856,6.5,,,, +US-FL-32857,US,FL,32857,6.5,,,, +US-FL-32858,US,FL,32858,6.5,,,, +US-FL-32859,US,FL,32859,6.5,,,, +US-FL-32860,US,FL,32860,6.5,,,, +US-FL-32861,US,FL,32861,6.5,,,, +US-FL-32862,US,FL,32862,6.5,,,, +US-FL-32867,US,FL,32867,6.5,,,, +US-FL-32868,US,FL,32868,6.5,,,, +US-FL-32869,US,FL,32869,6.5,,,, +US-FL-32872,US,FL,32872,6.5,,,, +US-FL-32877,US,FL,32877,6.5,,,, +US-FL-32878,US,FL,32878,6.5,,,, +US-FL-32885,US,FL,32885,6.5,,,, +US-FL-32886,US,FL,32886,6.5,,,, +US-FL-32887,US,FL,32887,6.5,,,, +US-FL-32891,US,FL,32891,6.5,,,, +US-FL-32896,US,FL,32896,6.5,,,, +US-FL-32897,US,FL,32897,6.5,,,, +US-FL-32901,US,FL,32901,6,,,, +US-FL-32902,US,FL,32902,6,,,, +US-FL-32903,US,FL,32903,6,,,, +US-FL-32904,US,FL,32904,6,,,, +US-FL-32905,US,FL,32905,6,,,, +US-FL-32906,US,FL,32906,6,,,, +US-FL-32907,US,FL,32907,6,,,, +US-FL-32908,US,FL,32908,6,,,, +US-FL-32909,US,FL,32909,6,,,, +US-FL-32910,US,FL,32910,6,,,, +US-FL-32911,US,FL,32911,6,,,, +US-FL-32912,US,FL,32912,6,,,, +US-FL-32919,US,FL,32919,6,,,, +US-FL-32920,US,FL,32920,6,,,, +US-FL-32922,US,FL,32922,6,,,, +US-FL-32923,US,FL,32923,6,,,, +US-FL-32924,US,FL,32924,6,,,, +US-FL-32925,US,FL,32925,6,,,, +US-FL-32926,US,FL,32926,6,,,, +US-FL-32927,US,FL,32927,6,,,, +US-FL-32931,US,FL,32931,6,,,, +US-FL-32932,US,FL,32932,6,,,, +US-FL-32934,US,FL,32934,6,,,, +US-FL-32935,US,FL,32935,6,,,, +US-FL-32936,US,FL,32936,6,,,, +US-FL-32937,US,FL,32937,6,,,, +US-FL-32940,US,FL,32940,6,,,, +US-FL-32941,US,FL,32941,6,,,, +US-FL-32948,US,FL,32948,7,,,, +US-FL-32949,US,FL,32949,6,,,, +US-FL-32950,US,FL,32950,6,,,, +US-FL-32951,US,FL,32951,6,,,, +US-FL-32952,US,FL,32952,6,,,, +US-FL-32953,US,FL,32953,6,,,, +US-FL-32954,US,FL,32954,6,,,, +US-FL-32955,US,FL,32955,6,,,, +US-FL-32956,US,FL,32956,6,,,, +US-FL-32957,US,FL,32957,7,,,, +US-FL-32958,US,FL,32958,7,,,, +US-FL-32959,US,FL,32959,6,,,, +US-FL-32960,US,FL,32960,7,,,, +US-FL-32961,US,FL,32961,7,,,, +US-FL-32962,US,FL,32962,7,,,, +US-FL-32963,US,FL,32963,7,,,, +US-FL-32964,US,FL,32964,7,,,, +US-FL-32965,US,FL,32965,7,,,, +US-FL-32966,US,FL,32966,7,,,, +US-FL-32967,US,FL,32967,7,,,, +US-FL-32968,US,FL,32968,7,,,, +US-FL-32969,US,FL,32969,7,,,, +US-FL-32970,US,FL,32970,7,,,, +US-FL-32971,US,FL,32971,7,,,, +US-FL-32976,US,FL,32976,6,,,, +US-FL-32978,US,FL,32978,7,,,, +US-FL-33001,US,FL,33001,7.5,,,, +US-FL-33002,US,FL,33002,7,,,, +US-FL-33004,US,FL,33004,6,,,, +US-FL-33008,US,FL,33008,6,,,, +US-FL-33009,US,FL,33009,6,,,, +US-FL-33010,US,FL,33010,7,,,, +US-FL-33011,US,FL,33011,7,,,, +US-FL-33012,US,FL,33012,7,,,, +US-FL-33013,US,FL,33013,7,,,, +US-FL-33014,US,FL,33014,7,,,, +US-FL-33015,US,FL,33015,7,,,, +US-FL-33016,US,FL,33016,7,,,, +US-FL-33017,US,FL,33017,7,,,, +US-FL-33018,US,FL,33018,7,,,, +US-FL-33019,US,FL,33019,6,,,, +US-FL-33020,US,FL,33020,6,,,, +US-FL-33021,US,FL,33021,6,,,, +US-FL-33022,US,FL,33022,6,,,, +US-FL-33023,US,FL,33023,6,,,, +US-FL-33024,US,FL,33024,6,,,, +US-FL-33025,US,FL,33025,6,,,, +US-FL-33026,US,FL,33026,6,,,, +US-FL-33027,US,FL,33027,6,,,, +US-FL-33028,US,FL,33028,6,,,, +US-FL-33029,US,FL,33029,6,,,, +US-FL-33030,US,FL,33030,7,,,, +US-FL-33031,US,FL,33031,7,,,, +US-FL-33032,US,FL,33032,7,,,, +US-FL-33033,US,FL,33033,7,,,, +US-FL-33034,US,FL,33034,7,,,, +US-FL-33035,US,FL,33035,7,,,, +US-FL-33036,US,FL,33036,7.5,,,, +US-FL-33037,US,FL,33037,7.5,,,, +US-FL-33039,US,FL,33039,7,,,, +US-FL-33040,US,FL,33040,7.5,,,, +US-FL-33041,US,FL,33041,7.5,,,, +US-FL-33042,US,FL,33042,7.5,,,, +US-FL-33043,US,FL,33043,7.5,,,, +US-FL-33045,US,FL,33045,7.5,,,, +US-FL-33050,US,FL,33050,7.5,,,, +US-FL-33051,US,FL,33051,7.5,,,, +US-FL-33052,US,FL,33052,7.5,,,, +US-FL-33054,US,FL,33054,7,,,, +US-FL-33055,US,FL,33055,7,,,, +US-FL-33056,US,FL,33056,7,,,, +US-FL-33060,US,FL,33060,6,,,, +US-FL-33061,US,FL,33061,6,,,, +US-FL-33062,US,FL,33062,6,,,, +US-FL-33063,US,FL,33063,6,,,, +US-FL-33064,US,FL,33064,6,,,, +US-FL-33065,US,FL,33065,6,,,, +US-FL-33066,US,FL,33066,6,,,, +US-FL-33067,US,FL,33067,6,,,, +US-FL-33068,US,FL,33068,6,,,, +US-FL-33069,US,FL,33069,6,,,, +US-FL-33070,US,FL,33070,7.5,,,, +US-FL-33071,US,FL,33071,6,,,, +US-FL-33072,US,FL,33072,6,,,, +US-FL-33073,US,FL,33073,6,,,, +US-FL-33074,US,FL,33074,6,,,, +US-FL-33075,US,FL,33075,6,,,, +US-FL-33076,US,FL,33076,6,,,, +US-FL-33077,US,FL,33077,6,,,, +US-FL-33081,US,FL,33081,6,,,, +US-FL-33082,US,FL,33082,6,,,, +US-FL-33083,US,FL,33083,6,,,, +US-FL-33084,US,FL,33084,6,,,, +US-FL-33090,US,FL,33090,7,,,, +US-FL-33092,US,FL,33092,7,,,, +US-FL-33093,US,FL,33093,6,,,, +US-FL-33097,US,FL,33097,6,,,, +US-FL-33101,US,FL,33101,7,,,, +US-FL-33102,US,FL,33102,7,,,, +US-FL-33106,US,FL,33106,7,,,, +US-FL-33109,US,FL,33109,7,,,, +US-FL-33111,US,FL,33111,7,,,, +US-FL-33112,US,FL,33112,7,,,, +US-FL-33114,US,FL,33114,7,,,, +US-FL-33116,US,FL,33116,7,,,, +US-FL-33119,US,FL,33119,7,,,, +US-FL-33122,US,FL,33122,7,,,, +US-FL-33124,US,FL,33124,7,,,, +US-FL-33125,US,FL,33125,7,,,, +US-FL-33126,US,FL,33126,7,,,, +US-FL-33127,US,FL,33127,7,,,, +US-FL-33128,US,FL,33128,7,,,, +US-FL-33129,US,FL,33129,7,,,, +US-FL-33130,US,FL,33130,7,,,, +US-FL-33131,US,FL,33131,7,,,, +US-FL-33132,US,FL,33132,7,,,, +US-FL-33133,US,FL,33133,7,,,, +US-FL-33134,US,FL,33134,7,,,, +US-FL-33135,US,FL,33135,7,,,, +US-FL-33136,US,FL,33136,7,,,, +US-FL-33137,US,FL,33137,7,,,, +US-FL-33138,US,FL,33138,7,,,, +US-FL-33139,US,FL,33139,7,,,, +US-FL-33140,US,FL,33140,7,,,, +US-FL-33141,US,FL,33141,7,,,, +US-FL-33142,US,FL,33142,7,,,, +US-FL-33143,US,FL,33143,7,,,, +US-FL-33144,US,FL,33144,7,,,, +US-FL-33145,US,FL,33145,7,,,, +US-FL-33146,US,FL,33146,7,,,, +US-FL-33147,US,FL,33147,7,,,, +US-FL-33149,US,FL,33149,7,,,, +US-FL-33150,US,FL,33150,7,,,, +US-FL-33151,US,FL,33151,7,,,, +US-FL-33152,US,FL,33152,7,,,, +US-FL-33153,US,FL,33153,7,,,, +US-FL-33154,US,FL,33154,7,,,, +US-FL-33155,US,FL,33155,7,,,, +US-FL-33156,US,FL,33156,7,,,, +US-FL-33157,US,FL,33157,7,,,, +US-FL-33158,US,FL,33158,7,,,, +US-FL-33159,US,FL,33159,7,,,, +US-FL-33160,US,FL,33160,7,,,, +US-FL-33161,US,FL,33161,7,,,, +US-FL-33162,US,FL,33162,7,,,, +US-FL-33163,US,FL,33163,7,,,, +US-FL-33164,US,FL,33164,7,,,, +US-FL-33165,US,FL,33165,7,,,, +US-FL-33166,US,FL,33166,7,,,, +US-FL-33167,US,FL,33167,7,,,, +US-FL-33168,US,FL,33168,7,,,, +US-FL-33169,US,FL,33169,7,,,, +US-FL-33170,US,FL,33170,7,,,, +US-FL-33172,US,FL,33172,7,,,, +US-FL-33173,US,FL,33173,7,,,, +US-FL-33174,US,FL,33174,7,,,, +US-FL-33175,US,FL,33175,7,,,, +US-FL-33176,US,FL,33176,7,,,, +US-FL-33177,US,FL,33177,7,,,, +US-FL-33178,US,FL,33178,7,,,, +US-FL-33179,US,FL,33179,7,,,, +US-FL-33180,US,FL,33180,7,,,, +US-FL-33181,US,FL,33181,7,,,, +US-FL-33182,US,FL,33182,7,,,, +US-FL-33183,US,FL,33183,7,,,, +US-FL-33184,US,FL,33184,7,,,, +US-FL-33185,US,FL,33185,7,,,, +US-FL-33186,US,FL,33186,7,,,, +US-FL-33187,US,FL,33187,7,,,, +US-FL-33188,US,FL,33188,7,,,, +US-FL-33189,US,FL,33189,7,,,, +US-FL-33190,US,FL,33190,7,,,, +US-FL-33193,US,FL,33193,7,,,, +US-FL-33194,US,FL,33194,7,,,, +US-FL-33196,US,FL,33196,7,,,, +US-FL-33197,US,FL,33197,7,,,, +US-FL-33199,US,FL,33199,7,,,, +US-FL-33222,US,FL,33222,7,,,, +US-FL-33231,US,FL,33231,7,,,, +US-FL-33233,US,FL,33233,7,,,, +US-FL-33234,US,FL,33234,7,,,, +US-FL-33238,US,FL,33238,7,,,, +US-FL-33239,US,FL,33239,7,,,, +US-FL-33242,US,FL,33242,7,,,, +US-FL-33243,US,FL,33243,7,,,, +US-FL-33245,US,FL,33245,7,,,, +US-FL-33247,US,FL,33247,7,,,, +US-FL-33255,US,FL,33255,7,,,, +US-FL-33256,US,FL,33256,7,,,, +US-FL-33257,US,FL,33257,7,,,, +US-FL-33261,US,FL,33261,7,,,, +US-FL-33265,US,FL,33265,7,,,, +US-FL-33266,US,FL,33266,7,,,, +US-FL-33269,US,FL,33269,7,,,, +US-FL-33280,US,FL,33280,7,,,, +US-FL-33283,US,FL,33283,7,,,, +US-FL-33296,US,FL,33296,7,,,, +US-FL-33299,US,FL,33299,7,,,, +US-FL-33301,US,FL,33301,6,,,, +US-FL-33302,US,FL,33302,6,,,, +US-FL-33303,US,FL,33303,6,,,, +US-FL-33304,US,FL,33304,6,,,, +US-FL-33305,US,FL,33305,6,,,, +US-FL-33306,US,FL,33306,6,,,, +US-FL-33307,US,FL,33307,6,,,, +US-FL-33308,US,FL,33308,6,,,, +US-FL-33309,US,FL,33309,6,,,, +US-FL-33310,US,FL,33310,6,,,, +US-FL-33311,US,FL,33311,6,,,, +US-FL-33312,US,FL,33312,6,,,, +US-FL-33313,US,FL,33313,6,,,, +US-FL-33314,US,FL,33314,6,,,, +US-FL-33315,US,FL,33315,6,,,, +US-FL-33316,US,FL,33316,6,,,, +US-FL-33317,US,FL,33317,6,,,, +US-FL-33318,US,FL,33318,6,,,, +US-FL-33319,US,FL,33319,6,,,, +US-FL-33320,US,FL,33320,6,,,, +US-FL-33321,US,FL,33321,6,,,, +US-FL-33322,US,FL,33322,6,,,, +US-FL-33323,US,FL,33323,6,,,, +US-FL-33324,US,FL,33324,6,,,, +US-FL-33325,US,FL,33325,6,,,, +US-FL-33326,US,FL,33326,6,,,, +US-FL-33327,US,FL,33327,6,,,, +US-FL-33328,US,FL,33328,6,,,, +US-FL-33329,US,FL,33329,6,,,, +US-FL-33330,US,FL,33330,6,,,, +US-FL-33331,US,FL,33331,6,,,, +US-FL-33332,US,FL,33332,6,,,, +US-FL-33334,US,FL,33334,6,,,, +US-FL-33335,US,FL,33335,6,,,, +US-FL-33336,US,FL,33336,6,,,, +US-FL-33337,US,FL,33337,6,,,, +US-FL-33338,US,FL,33338,6,,,, +US-FL-33339,US,FL,33339,6,,,, +US-FL-33340,US,FL,33340,6,,,, +US-FL-33345,US,FL,33345,6,,,, +US-FL-33346,US,FL,33346,6,,,, +US-FL-33348,US,FL,33348,6,,,, +US-FL-33349,US,FL,33349,6,,,, +US-FL-33351,US,FL,33351,6,,,, +US-FL-33355,US,FL,33355,6,,,, +US-FL-33359,US,FL,33359,6,,,, +US-FL-33388,US,FL,33388,6,,,, +US-FL-33394,US,FL,33394,6,,,, +US-FL-33401,US,FL,33401,6,,,, +US-FL-33402,US,FL,33402,6,,,, +US-FL-33403,US,FL,33403,6,,,, +US-FL-33404,US,FL,33404,6,,,, +US-FL-33405,US,FL,33405,6,,,, +US-FL-33406,US,FL,33406,6,,,, +US-FL-33407,US,FL,33407,6,,,, +US-FL-33408,US,FL,33408,6,,,, +US-FL-33409,US,FL,33409,6,,,, +US-FL-33410,US,FL,33410,6,,,, +US-FL-33411,US,FL,33411,6,,,, +US-FL-33412,US,FL,33412,6,,,, +US-FL-33413,US,FL,33413,6,,,, +US-FL-33414,US,FL,33414,6,,,, +US-FL-33415,US,FL,33415,6,,,, +US-FL-33416,US,FL,33416,6,,,, +US-FL-33417,US,FL,33417,6,,,, +US-FL-33418,US,FL,33418,6,,,, +US-FL-33419,US,FL,33419,6,,,, +US-FL-33420,US,FL,33420,6,,,, +US-FL-33421,US,FL,33421,6,,,, +US-FL-33422,US,FL,33422,6,,,, +US-FL-33424,US,FL,33424,6,,,, +US-FL-33425,US,FL,33425,6,,,, +US-FL-33426,US,FL,33426,6,,,, +US-FL-33427,US,FL,33427,6,,,, +US-FL-33428,US,FL,33428,6,,,, +US-FL-33429,US,FL,33429,6,,,, +US-FL-33430,US,FL,33430,6,,,, +US-FL-33431,US,FL,33431,6,,,, +US-FL-33432,US,FL,33432,6,,,, +US-FL-33433,US,FL,33433,6,,,, +US-FL-33434,US,FL,33434,6,,,, +US-FL-33435,US,FL,33435,6,,,, +US-FL-33436,US,FL,33436,6,,,, +US-FL-33437,US,FL,33437,6,,,, +US-FL-33438,US,FL,33438,6,,,, +US-FL-33440,US,FL,33440,7,,,, +US-FL-33441,US,FL,33441,6,,,, +US-FL-33442,US,FL,33442,6,,,, +US-FL-33443,US,FL,33443,6,,,, +US-FL-33444,US,FL,33444,6,,,, +US-FL-33445,US,FL,33445,6,,,, +US-FL-33446,US,FL,33446,6,,,, +US-FL-33448,US,FL,33448,6,,,, +US-FL-33449,US,FL,33449,6,,,, +US-FL-33454,US,FL,33454,6,,,, +US-FL-33455,US,FL,33455,6,,,, +US-FL-33458,US,FL,33458,6,,,, +US-FL-33459,US,FL,33459,6,,,, +US-FL-33460,US,FL,33460,6,,,, +US-FL-33461,US,FL,33461,6,,,, +US-FL-33462,US,FL,33462,6,,,, +US-FL-33463,US,FL,33463,6,,,, +US-FL-33464,US,FL,33464,6,,,, +US-FL-33465,US,FL,33465,6,,,, +US-FL-33466,US,FL,33466,6,,,, +US-FL-33467,US,FL,33467,6,,,, +US-FL-33468,US,FL,33468,6,,,, +US-FL-33469,US,FL,33469,6,,,, +US-FL-33470,US,FL,33470,6,,,, +US-FL-33471,US,FL,33471,7,,,, +US-FL-33472,US,FL,33472,6,,,, +US-FL-33473,US,FL,33473,6,,,, +US-FL-33474,US,FL,33474,6,,,, +US-FL-33475,US,FL,33475,6,,,, +US-FL-33476,US,FL,33476,6,,,, +US-FL-33477,US,FL,33477,6,,,, +US-FL-33478,US,FL,33478,6,,,, +US-FL-33480,US,FL,33480,6,,,, +US-FL-33481,US,FL,33481,6,,,, +US-FL-33482,US,FL,33482,6,,,, +US-FL-33483,US,FL,33483,6,,,, +US-FL-33484,US,FL,33484,6,,,, +US-FL-33486,US,FL,33486,6,,,, +US-FL-33487,US,FL,33487,6,,,, +US-FL-33488,US,FL,33488,6,,,, +US-FL-33493,US,FL,33493,6,,,, +US-FL-33496,US,FL,33496,6,,,, +US-FL-33497,US,FL,33497,6,,,, +US-FL-33498,US,FL,33498,6,,,, +US-FL-33499,US,FL,33499,6,,,, +US-FL-33503,US,FL,33503,7,,,, +US-FL-33508,US,FL,33508,7,,,, +US-FL-33509,US,FL,33509,7,,,, +US-FL-33510,US,FL,33510,7,,,, +US-FL-33511,US,FL,33511,7,,,, +US-FL-33513,US,FL,33513,7,,,, +US-FL-33514,US,FL,33514,7,,,, +US-FL-33521,US,FL,33521,7,,,, +US-FL-33523,US,FL,33523,7,,,, +US-FL-33524,US,FL,33524,7,,,, +US-FL-33525,US,FL,33525,7,,,, +US-FL-33526,US,FL,33526,7,,,, +US-FL-33527,US,FL,33527,7,,,, +US-FL-33530,US,FL,33530,7,,,, +US-FL-33534,US,FL,33534,7,,,, +US-FL-33537,US,FL,33537,7,,,, +US-FL-33538,US,FL,33538,7,,,, +US-FL-33540,US,FL,33540,7,,,, +US-FL-33541,US,FL,33541,7,,,, +US-FL-33542,US,FL,33542,7,,,, +US-FL-33543,US,FL,33543,7,,,, +US-FL-33544,US,FL,33544,7,,,, +US-FL-33545,US,FL,33545,7,,,, +US-FL-33547,US,FL,33547,7,,,, +US-FL-33548,US,FL,33548,7,,,, +US-FL-33549,US,FL,33549,7,,,, +US-FL-33550,US,FL,33550,7,,,, +US-FL-33556,US,FL,33556,7,,,, +US-FL-33558,US,FL,33558,7,,,, +US-FL-33559,US,FL,33559,7,,,, +US-FL-33563,US,FL,33563,7,,,, +US-FL-33564,US,FL,33564,7,,,, +US-FL-33565,US,FL,33565,7,,,, +US-FL-33566,US,FL,33566,7,,,, +US-FL-33567,US,FL,33567,7,,,, +US-FL-33568,US,FL,33568,7,,,, +US-FL-33569,US,FL,33569,7,,,, +US-FL-33570,US,FL,33570,7,,,, +US-FL-33571,US,FL,33571,7,,,, +US-FL-33572,US,FL,33572,7,,,, +US-FL-33573,US,FL,33573,7,,,, +US-FL-33574,US,FL,33574,7,,,, +US-FL-33575,US,FL,33575,7,,,, +US-FL-33576,US,FL,33576,7,,,, +US-FL-33578,US,FL,33578,7,,,, +US-FL-33579,US,FL,33579,7,,,, +US-FL-33583,US,FL,33583,7,,,, +US-FL-33584,US,FL,33584,7,,,, +US-FL-33585,US,FL,33585,7,,,, +US-FL-33586,US,FL,33586,7,,,, +US-FL-33587,US,FL,33587,7,,,, +US-FL-33592,US,FL,33592,7,,,, +US-FL-33593,US,FL,33593,7,,,, +US-FL-33594,US,FL,33594,7,,,, +US-FL-33595,US,FL,33595,7,,,, +US-FL-33596,US,FL,33596,7,,,, +US-FL-33597,US,FL,33597,7,,,, +US-FL-33598,US,FL,33598,7,,,, +US-FL-33601,US,FL,33601,7,,,, +US-FL-33602,US,FL,33602,7,,,, +US-FL-33603,US,FL,33603,7,,,, +US-FL-33604,US,FL,33604,7,,,, +US-FL-33605,US,FL,33605,7,,,, +US-FL-33606,US,FL,33606,7,,,, +US-FL-33607,US,FL,33607,7,,,, +US-FL-33608,US,FL,33608,7,,,, +US-FL-33609,US,FL,33609,7,,,, +US-FL-33610,US,FL,33610,7,,,, +US-FL-33611,US,FL,33611,7,,,, +US-FL-33612,US,FL,33612,7,,,, +US-FL-33613,US,FL,33613,7,,,, +US-FL-33614,US,FL,33614,7,,,, +US-FL-33615,US,FL,33615,7,,,, +US-FL-33616,US,FL,33616,7,,,, +US-FL-33617,US,FL,33617,7,,,, +US-FL-33618,US,FL,33618,7,,,, +US-FL-33619,US,FL,33619,7,,,, +US-FL-33620,US,FL,33620,7,,,, +US-FL-33621,US,FL,33621,7,,,, +US-FL-33622,US,FL,33622,7,,,, +US-FL-33623,US,FL,33623,7,,,, +US-FL-33624,US,FL,33624,7,,,, +US-FL-33625,US,FL,33625,7,,,, +US-FL-33626,US,FL,33626,7,,,, +US-FL-33629,US,FL,33629,7,,,, +US-FL-33630,US,FL,33630,7,,,, +US-FL-33631,US,FL,33631,7,,,, +US-FL-33633,US,FL,33633,7,,,, +US-FL-33634,US,FL,33634,7,,,, +US-FL-33635,US,FL,33635,7,,,, +US-FL-33637,US,FL,33637,7,,,, +US-FL-33646,US,FL,33646,7,,,, +US-FL-33647,US,FL,33647,7,,,, +US-FL-33650,US,FL,33650,7,,,, +US-FL-33655,US,FL,33655,7,,,, +US-FL-33660,US,FL,33660,7,,,, +US-FL-33661,US,FL,33661,7,,,, +US-FL-33662,US,FL,33662,7,,,, +US-FL-33663,US,FL,33663,7,,,, +US-FL-33664,US,FL,33664,7,,,, +US-FL-33672,US,FL,33672,7,,,, +US-FL-33673,US,FL,33673,7,,,, +US-FL-33674,US,FL,33674,7,,,, +US-FL-33675,US,FL,33675,7,,,, +US-FL-33677,US,FL,33677,7,,,, +US-FL-33679,US,FL,33679,7,,,, +US-FL-33680,US,FL,33680,7,,,, +US-FL-33681,US,FL,33681,7,,,, +US-FL-33682,US,FL,33682,7,,,, +US-FL-33684,US,FL,33684,7,,,, +US-FL-33685,US,FL,33685,7,,,, +US-FL-33686,US,FL,33686,7,,,, +US-FL-33687,US,FL,33687,7,,,, +US-FL-33688,US,FL,33688,7,,,, +US-FL-33689,US,FL,33689,7,,,, +US-FL-33694,US,FL,33694,7,,,, +US-FL-33701,US,FL,33701,7,,,, +US-FL-33702,US,FL,33702,7,,,, +US-FL-33703,US,FL,33703,7,,,, +US-FL-33704,US,FL,33704,7,,,, +US-FL-33705,US,FL,33705,7,,,, +US-FL-33706,US,FL,33706,7,,,, +US-FL-33707,US,FL,33707,7,,,, +US-FL-33708,US,FL,33708,7,,,, +US-FL-33709,US,FL,33709,7,,,, +US-FL-33710,US,FL,33710,7,,,, +US-FL-33711,US,FL,33711,7,,,, +US-FL-33712,US,FL,33712,7,,,, +US-FL-33713,US,FL,33713,7,,,, +US-FL-33714,US,FL,33714,7,,,, +US-FL-33715,US,FL,33715,7,,,, +US-FL-33716,US,FL,33716,7,,,, +US-FL-33729,US,FL,33729,7,,,, +US-FL-33730,US,FL,33730,7,,,, +US-FL-33731,US,FL,33731,7,,,, +US-FL-33732,US,FL,33732,7,,,, +US-FL-33733,US,FL,33733,7,,,, +US-FL-33734,US,FL,33734,7,,,, +US-FL-33736,US,FL,33736,7,,,, +US-FL-33737,US,FL,33737,7,,,, +US-FL-33738,US,FL,33738,7,,,, +US-FL-33740,US,FL,33740,7,,,, +US-FL-33741,US,FL,33741,7,,,, +US-FL-33742,US,FL,33742,7,,,, +US-FL-33743,US,FL,33743,7,,,, +US-FL-33744,US,FL,33744,7,,,, +US-FL-33747,US,FL,33747,7,,,, +US-FL-33755,US,FL,33755,7,,,, +US-FL-33756,US,FL,33756,7,,,, +US-FL-33757,US,FL,33757,7,,,, +US-FL-33758,US,FL,33758,7,,,, +US-FL-33759,US,FL,33759,7,,,, +US-FL-33760,US,FL,33760,7,,,, +US-FL-33761,US,FL,33761,7,,,, +US-FL-33762,US,FL,33762,7,,,, +US-FL-33763,US,FL,33763,7,,,, +US-FL-33764,US,FL,33764,7,,,, +US-FL-33765,US,FL,33765,7,,,, +US-FL-33766,US,FL,33766,7,,,, +US-FL-33767,US,FL,33767,7,,,, +US-FL-33769,US,FL,33769,7,,,, +US-FL-33770,US,FL,33770,7,,,, +US-FL-33771,US,FL,33771,7,,,, +US-FL-33772,US,FL,33772,7,,,, +US-FL-33773,US,FL,33773,7,,,, +US-FL-33774,US,FL,33774,7,,,, +US-FL-33775,US,FL,33775,7,,,, +US-FL-33776,US,FL,33776,7,,,, +US-FL-33777,US,FL,33777,7,,,, +US-FL-33778,US,FL,33778,7,,,, +US-FL-33779,US,FL,33779,7,,,, +US-FL-33780,US,FL,33780,7,,,, +US-FL-33781,US,FL,33781,7,,,, +US-FL-33782,US,FL,33782,7,,,, +US-FL-33784,US,FL,33784,7,,,, +US-FL-33785,US,FL,33785,7,,,, +US-FL-33786,US,FL,33786,7,,,, +US-FL-33801,US,FL,33801,7,,,, +US-FL-33802,US,FL,33802,7,,,, +US-FL-33803,US,FL,33803,7,,,, +US-FL-33804,US,FL,33804,7,,,, +US-FL-33805,US,FL,33805,7,,,, +US-FL-33806,US,FL,33806,7,,,, +US-FL-33807,US,FL,33807,7,,,, +US-FL-33809,US,FL,33809,7,,,, +US-FL-33810,US,FL,33810,7,,,, +US-FL-33811,US,FL,33811,7,,,, +US-FL-33812,US,FL,33812,7,,,, +US-FL-33813,US,FL,33813,7,,,, +US-FL-33815,US,FL,33815,7,,,, +US-FL-33820,US,FL,33820,7,,,, +US-FL-33823,US,FL,33823,7,,,, +US-FL-33825,US,FL,33825,7,,,, +US-FL-33826,US,FL,33826,7,,,, +US-FL-33827,US,FL,33827,7,,,, +US-FL-33830,US,FL,33830,7,,,, +US-FL-33831,US,FL,33831,7,,,, +US-FL-33834,US,FL,33834,7,,,, +US-FL-33835,US,FL,33835,7,,,, +US-FL-33836,US,FL,33836,7,,,, +US-FL-33837,US,FL,33837,7,,,, +US-FL-33838,US,FL,33838,7,,,, +US-FL-33839,US,FL,33839,7,,,, +US-FL-33840,US,FL,33840,7,,,, +US-FL-33841,US,FL,33841,7,,,, +US-FL-33843,US,FL,33843,7,,,, +US-FL-33844,US,FL,33844,7,,,, +US-FL-33845,US,FL,33845,7,,,, +US-FL-33846,US,FL,33846,7,,,, +US-FL-33847,US,FL,33847,7,,,, +US-FL-33848,US,FL,33848,7,,,, +US-FL-33849,US,FL,33849,7,,,, +US-FL-33850,US,FL,33850,7,,,, +US-FL-33851,US,FL,33851,7,,,, +US-FL-33852,US,FL,33852,7,,,, +US-FL-33853,US,FL,33853,7,,,, +US-FL-33854,US,FL,33854,7,,,, +US-FL-33855,US,FL,33855,7,,,, +US-FL-33856,US,FL,33856,7,,,, +US-FL-33857,US,FL,33857,7,,,, +US-FL-33858,US,FL,33858,7,,,, +US-FL-33859,US,FL,33859,7,,,, +US-FL-33860,US,FL,33860,7,,,, +US-FL-33862,US,FL,33862,7,,,, +US-FL-33863,US,FL,33863,7,,,, +US-FL-33865,US,FL,33865,7,,,, +US-FL-33867,US,FL,33867,7,,,, +US-FL-33868,US,FL,33868,7,,,, +US-FL-33870,US,FL,33870,7,,,, +US-FL-33871,US,FL,33871,7,,,, +US-FL-33872,US,FL,33872,7,,,, +US-FL-33873,US,FL,33873,7,,,, +US-FL-33875,US,FL,33875,7,,,, +US-FL-33876,US,FL,33876,7,,,, +US-FL-33877,US,FL,33877,7,,,, +US-FL-33880,US,FL,33880,7,,,, +US-FL-33881,US,FL,33881,7,,,, +US-FL-33882,US,FL,33882,7,,,, +US-FL-33883,US,FL,33883,7,,,, +US-FL-33884,US,FL,33884,7,,,, +US-FL-33885,US,FL,33885,7,,,, +US-FL-33888,US,FL,33888,7,,,, +US-FL-33890,US,FL,33890,7,,,, +US-FL-33896,US,FL,33896,7,,,, +US-FL-33897,US,FL,33897,7,,,, +US-FL-33898,US,FL,33898,7,,,, +US-FL-33901,US,FL,33901,6,,,, +US-FL-33902,US,FL,33902,6,,,, +US-FL-33903,US,FL,33903,6,,,, +US-FL-33904,US,FL,33904,6,,,, +US-FL-33905,US,FL,33905,6,,,, +US-FL-33906,US,FL,33906,6,,,, +US-FL-33907,US,FL,33907,6,,,, +US-FL-33908,US,FL,33908,6,,,, +US-FL-33909,US,FL,33909,6,,,, +US-FL-33910,US,FL,33910,6,,,, +US-FL-33911,US,FL,33911,6,,,, +US-FL-33912,US,FL,33912,6,,,, +US-FL-33913,US,FL,33913,6,,,, +US-FL-33914,US,FL,33914,6,,,, +US-FL-33915,US,FL,33915,6,,,, +US-FL-33916,US,FL,33916,6,,,, +US-FL-33917,US,FL,33917,6,,,, +US-FL-33918,US,FL,33918,6,,,, +US-FL-33919,US,FL,33919,6,,,, +US-FL-33920,US,FL,33920,6,,,, +US-FL-33921,US,FL,33921,6,,,, +US-FL-33922,US,FL,33922,6,,,, +US-FL-33924,US,FL,33924,6,,,, +US-FL-33927,US,FL,33927,7,,,, +US-FL-33928,US,FL,33928,6,,,, +US-FL-33929,US,FL,33929,6,,,, +US-FL-33930,US,FL,33930,7,,,, +US-FL-33931,US,FL,33931,6,,,, +US-FL-33932,US,FL,33932,6,,,, +US-FL-33935,US,FL,33935,7,,,, +US-FL-33936,US,FL,33936,6,,,, +US-FL-33938,US,FL,33938,7,,,, +US-FL-33944,US,FL,33944,7,,,, +US-FL-33945,US,FL,33945,6,,,, +US-FL-33946,US,FL,33946,7,,,, +US-FL-33947,US,FL,33947,7,,,, +US-FL-33948,US,FL,33948,7,,,, +US-FL-33949,US,FL,33949,7,,,, +US-FL-33950,US,FL,33950,7,,,, +US-FL-33951,US,FL,33951,7,,,, +US-FL-33952,US,FL,33952,7,,,, +US-FL-33953,US,FL,33953,7,,,, +US-FL-33954,US,FL,33954,7,,,, +US-FL-33955,US,FL,33955,7,,,, +US-FL-33956,US,FL,33956,6,,,, +US-FL-33957,US,FL,33957,6,,,, +US-FL-33960,US,FL,33960,7,,,, +US-FL-33965,US,FL,33965,6,,,, +US-FL-33966,US,FL,33966,6,,,, +US-FL-33967,US,FL,33967,6,,,, +US-FL-33970,US,FL,33970,6,,,, +US-FL-33971,US,FL,33971,6,,,, +US-FL-33972,US,FL,33972,6,,,, +US-FL-33973,US,FL,33973,6,,,, +US-FL-33974,US,FL,33974,6,,,, +US-FL-33975,US,FL,33975,7,,,, +US-FL-33976,US,FL,33976,6,,,, +US-FL-33980,US,FL,33980,7,,,, +US-FL-33981,US,FL,33981,7,,,, +US-FL-33982,US,FL,33982,7,,,, +US-FL-33983,US,FL,33983,7,,,, +US-FL-33990,US,FL,33990,6,,,, +US-FL-33991,US,FL,33991,6,,,, +US-FL-33993,US,FL,33993,6,,,, +US-FL-33994,US,FL,33994,6,,,, +US-FL-34101,US,FL,34101,6,,,, +US-FL-34102,US,FL,34102,6,,,, +US-FL-34103,US,FL,34103,6,,,, +US-FL-34104,US,FL,34104,6,,,, +US-FL-34105,US,FL,34105,6,,,, +US-FL-34106,US,FL,34106,6,,,, +US-FL-34107,US,FL,34107,6,,,, +US-FL-34108,US,FL,34108,6,,,, +US-FL-34109,US,FL,34109,6,,,, +US-FL-34110,US,FL,34110,6,,,, +US-FL-34112,US,FL,34112,6,,,, +US-FL-34113,US,FL,34113,6,,,, +US-FL-34114,US,FL,34114,6,,,, +US-FL-34116,US,FL,34116,6,,,, +US-FL-34117,US,FL,34117,6,,,, +US-FL-34119,US,FL,34119,6,,,, +US-FL-34120,US,FL,34120,6,,,, +US-FL-34133,US,FL,34133,6,,,, +US-FL-34134,US,FL,34134,6,,,, +US-FL-34135,US,FL,34135,6,,,, +US-FL-34136,US,FL,34136,6,,,, +US-FL-34137,US,FL,34137,6,,,, +US-FL-34138,US,FL,34138,6,,,, +US-FL-34139,US,FL,34139,6,,,, +US-FL-34140,US,FL,34140,6,,,, +US-FL-34141,US,FL,34141,6,,,, +US-FL-34142,US,FL,34142,6,,,, +US-FL-34143,US,FL,34143,6,,,, +US-FL-34145,US,FL,34145,6,,,, +US-FL-34146,US,FL,34146,6,,,, +US-FL-34201,US,FL,34201,6.5,,,, +US-FL-34202,US,FL,34202,6.5,,,, +US-FL-34203,US,FL,34203,6.5,,,, +US-FL-34204,US,FL,34204,6.5,,,, +US-FL-34205,US,FL,34205,6.5,,,, +US-FL-34206,US,FL,34206,6.5,,,, +US-FL-34207,US,FL,34207,6.5,,,, +US-FL-34208,US,FL,34208,6.5,,,, +US-FL-34209,US,FL,34209,6.5,,,, +US-FL-34210,US,FL,34210,6.5,,,, +US-FL-34211,US,FL,34211,6.5,,,, +US-FL-34212,US,FL,34212,6.5,,,, +US-FL-34215,US,FL,34215,6.5,,,, +US-FL-34216,US,FL,34216,6.5,,,, +US-FL-34217,US,FL,34217,6.5,,,, +US-FL-34218,US,FL,34218,6.5,,,, +US-FL-34219,US,FL,34219,6.5,,,, +US-FL-34220,US,FL,34220,6.5,,,, +US-FL-34221,US,FL,34221,6.5,,,, +US-FL-34222,US,FL,34222,6.5,,,, +US-FL-34223,US,FL,34223,7,,,, +US-FL-34224,US,FL,34224,7,,,, +US-FL-34228,US,FL,34228,7,,,, +US-FL-34229,US,FL,34229,7,,,, +US-FL-34230,US,FL,34230,7,,,, +US-FL-34231,US,FL,34231,7,,,, +US-FL-34232,US,FL,34232,7,,,, +US-FL-34233,US,FL,34233,7,,,, +US-FL-34234,US,FL,34234,7,,,, +US-FL-34235,US,FL,34235,7,,,, +US-FL-34236,US,FL,34236,7,,,, +US-FL-34237,US,FL,34237,7,,,, +US-FL-34238,US,FL,34238,7,,,, +US-FL-34239,US,FL,34239,7,,,, +US-FL-34240,US,FL,34240,7,,,, +US-FL-34241,US,FL,34241,7,,,, +US-FL-34242,US,FL,34242,7,,,, +US-FL-34243,US,FL,34243,6.5,,,, +US-FL-34250,US,FL,34250,6.5,,,, +US-FL-34251,US,FL,34251,6.5,,,, +US-FL-34260,US,FL,34260,6.5,,,, +US-FL-34264,US,FL,34264,6.5,,,, +US-FL-34265,US,FL,34265,7,,,, +US-FL-34266,US,FL,34266,7,,,, +US-FL-34267,US,FL,34267,7,,,, +US-FL-34268,US,FL,34268,7,,,, +US-FL-34269,US,FL,34269,7,,,, +US-FL-34270,US,FL,34270,6.5,,,, +US-FL-34272,US,FL,34272,7,,,, +US-FL-34274,US,FL,34274,7,,,, +US-FL-34275,US,FL,34275,7,,,, +US-FL-34276,US,FL,34276,7,,,, +US-FL-34277,US,FL,34277,7,,,, +US-FL-34278,US,FL,34278,7,,,, +US-FL-34280,US,FL,34280,6.5,,,, +US-FL-34281,US,FL,34281,6.5,,,, +US-FL-34282,US,FL,34282,6.5,,,, +US-FL-34284,US,FL,34284,7,,,, +US-FL-34285,US,FL,34285,7,,,, +US-FL-34286,US,FL,34286,7,,,, +US-FL-34287,US,FL,34287,7,,,, +US-FL-34288,US,FL,34288,7,,,, +US-FL-34289,US,FL,34289,7,,,, +US-FL-34290,US,FL,34290,7,,,, +US-FL-34291,US,FL,34291,7,,,, +US-FL-34292,US,FL,34292,7,,,, +US-FL-34293,US,FL,34293,7,,,, +US-FL-34295,US,FL,34295,7,,,, +US-FL-34420,US,FL,34420,6,,,, +US-FL-34421,US,FL,34421,6,,,, +US-FL-34423,US,FL,34423,6,,,, +US-FL-34428,US,FL,34428,6,,,, +US-FL-34429,US,FL,34429,6,,,, +US-FL-34430,US,FL,34430,6,,,, +US-FL-34431,US,FL,34431,6,,,, +US-FL-34432,US,FL,34432,6,,,, +US-FL-34433,US,FL,34433,6,,,, +US-FL-34434,US,FL,34434,6,,,, +US-FL-34436,US,FL,34436,6,,,, +US-FL-34441,US,FL,34441,6,,,, +US-FL-34442,US,FL,34442,6,,,, +US-FL-34445,US,FL,34445,6,,,, +US-FL-34446,US,FL,34446,6,,,, +US-FL-34447,US,FL,34447,6,,,, +US-FL-34448,US,FL,34448,6,,,, +US-FL-34449,US,FL,34449,7,,,, +US-FL-34450,US,FL,34450,6,,,, +US-FL-34451,US,FL,34451,6,,,, +US-FL-34452,US,FL,34452,6,,,, +US-FL-34453,US,FL,34453,6,,,, +US-FL-34460,US,FL,34460,6,,,, +US-FL-34461,US,FL,34461,6,,,, +US-FL-34464,US,FL,34464,6,,,, +US-FL-34465,US,FL,34465,6,,,, +US-FL-34470,US,FL,34470,6,,,, +US-FL-34471,US,FL,34471,6,,,, +US-FL-34472,US,FL,34472,6,,,, +US-FL-34473,US,FL,34473,6,,,, +US-FL-34474,US,FL,34474,6,,,, +US-FL-34475,US,FL,34475,6,,,, +US-FL-34476,US,FL,34476,6,,,, +US-FL-34477,US,FL,34477,6,,,, +US-FL-34478,US,FL,34478,6,,,, +US-FL-34479,US,FL,34479,6,,,, +US-FL-34480,US,FL,34480,6,,,, +US-FL-34481,US,FL,34481,6,,,, +US-FL-34482,US,FL,34482,6,,,, +US-FL-34483,US,FL,34483,6,,,, +US-FL-34484,US,FL,34484,7,,,, +US-FL-34487,US,FL,34487,6,,,, +US-FL-34488,US,FL,34488,6,,,, +US-FL-34489,US,FL,34489,6,,,, +US-FL-34491,US,FL,34491,6,,,, +US-FL-34492,US,FL,34492,6,,,, +US-FL-34498,US,FL,34498,7,,,, +US-FL-34601,US,FL,34601,6.5,,,, +US-FL-34602,US,FL,34602,6.5,,,, +US-FL-34603,US,FL,34603,6.5,,,, +US-FL-34604,US,FL,34604,6.5,,,, +US-FL-34605,US,FL,34605,6.5,,,, +US-FL-34606,US,FL,34606,6.5,,,, +US-FL-34607,US,FL,34607,6.5,,,, +US-FL-34608,US,FL,34608,6.5,,,, +US-FL-34609,US,FL,34609,6.5,,,, +US-FL-34610,US,FL,34610,7,,,, +US-FL-34611,US,FL,34611,6.5,,,, +US-FL-34613,US,FL,34613,6.5,,,, +US-FL-34614,US,FL,34614,6.5,,,, +US-FL-34636,US,FL,34636,6.5,,,, +US-FL-34637,US,FL,34637,7,,,, +US-FL-34638,US,FL,34638,7,,,, +US-FL-34639,US,FL,34639,7,,,, +US-FL-34652,US,FL,34652,7,,,, +US-FL-34653,US,FL,34653,7,,,, +US-FL-34654,US,FL,34654,7,,,, +US-FL-34655,US,FL,34655,7,,,, +US-FL-34656,US,FL,34656,7,,,, +US-FL-34660,US,FL,34660,7,,,, +US-FL-34661,US,FL,34661,6.5,,,, +US-FL-34667,US,FL,34667,7,,,, +US-FL-34668,US,FL,34668,7,,,, +US-FL-34669,US,FL,34669,7,,,, +US-FL-34673,US,FL,34673,7,,,, +US-FL-34674,US,FL,34674,7,,,, +US-FL-34677,US,FL,34677,7,,,, +US-FL-34679,US,FL,34679,7,,,, +US-FL-34680,US,FL,34680,7,,,, +US-FL-34681,US,FL,34681,7,,,, +US-FL-34682,US,FL,34682,7,,,, +US-FL-34683,US,FL,34683,7,,,, +US-FL-34684,US,FL,34684,7,,,, +US-FL-34685,US,FL,34685,7,,,, +US-FL-34688,US,FL,34688,7,,,, +US-FL-34689,US,FL,34689,7,,,, +US-FL-34690,US,FL,34690,7,,,, +US-FL-34691,US,FL,34691,7,,,, +US-FL-34692,US,FL,34692,7,,,, +US-FL-34695,US,FL,34695,7,,,, +US-FL-34697,US,FL,34697,7,,,, +US-FL-34698,US,FL,34698,7,,,, +US-FL-34705,US,FL,34705,7,,,, +US-FL-34711,US,FL,34711,7,,,, +US-FL-34712,US,FL,34712,7,,,, +US-FL-34713,US,FL,34713,7,,,, +US-FL-34714,US,FL,34714,7,,,, +US-FL-34715,US,FL,34715,7,,,, +US-FL-34729,US,FL,34729,7,,,, +US-FL-34731,US,FL,34731,7,,,, +US-FL-34734,US,FL,34734,6.5,,,, +US-FL-34736,US,FL,34736,7,,,, +US-FL-34737,US,FL,34737,7,,,, +US-FL-34739,US,FL,34739,7,,,, +US-FL-34740,US,FL,34740,6.5,,,, +US-FL-34741,US,FL,34741,7,,,, +US-FL-34742,US,FL,34742,7,,,, +US-FL-34743,US,FL,34743,7,,,, +US-FL-34744,US,FL,34744,7,,,, +US-FL-34745,US,FL,34745,7,,,, +US-FL-34746,US,FL,34746,7,,,, +US-FL-34747,US,FL,34747,7,,,, +US-FL-34748,US,FL,34748,7,,,, +US-FL-34749,US,FL,34749,7,,,, +US-FL-34753,US,FL,34753,7,,,, +US-FL-34755,US,FL,34755,7,,,, +US-FL-34756,US,FL,34756,7,,,, +US-FL-34758,US,FL,34758,7,,,, +US-FL-34759,US,FL,34759,7,,,, +US-FL-34760,US,FL,34760,6.5,,,, +US-FL-34761,US,FL,34761,6.5,,,, +US-FL-34762,US,FL,34762,7,,,, +US-FL-34769,US,FL,34769,7,,,, +US-FL-34770,US,FL,34770,7,,,, +US-FL-34771,US,FL,34771,7,,,, +US-FL-34772,US,FL,34772,7,,,, +US-FL-34773,US,FL,34773,7,,,, +US-FL-34777,US,FL,34777,6.5,,,, +US-FL-34778,US,FL,34778,6.5,,,, +US-FL-34785,US,FL,34785,7,,,, +US-FL-34786,US,FL,34786,6.5,,,, +US-FL-34787,US,FL,34787,6.5,,,, +US-FL-34788,US,FL,34788,7,,,, +US-FL-34789,US,FL,34789,7,,,, +US-FL-34797,US,FL,34797,7,,,, +US-FL-34945,US,FL,34945,6.5,,,, +US-FL-34946,US,FL,34946,6.5,,,, +US-FL-34947,US,FL,34947,6.5,,,, +US-FL-34948,US,FL,34948,6.5,,,, +US-FL-34949,US,FL,34949,6.5,,,, +US-FL-34950,US,FL,34950,6.5,,,, +US-FL-34951,US,FL,34951,6.5,,,, +US-FL-34952,US,FL,34952,6.5,,,, +US-FL-34953,US,FL,34953,6.5,,,, +US-FL-34954,US,FL,34954,6.5,,,, +US-FL-34956,US,FL,34956,6,,,, +US-FL-34957,US,FL,34957,6,,,, +US-FL-34958,US,FL,34958,6,,,, +US-FL-34972,US,FL,34972,7,,,, +US-FL-34973,US,FL,34973,7,,,, +US-FL-34974,US,FL,34974,7,,,, +US-FL-34979,US,FL,34979,6.5,,,, +US-FL-34981,US,FL,34981,6.5,,,, +US-FL-34982,US,FL,34982,6.5,,,, +US-FL-34983,US,FL,34983,6.5,,,, +US-FL-34984,US,FL,34984,6.5,,,, +US-FL-34985,US,FL,34985,6.5,,,, +US-FL-34986,US,FL,34986,6.5,,,, +US-FL-34987,US,FL,34987,6.5,,,, +US-FL-34988,US,FL,34988,6.5,,,, +US-FL-34990,US,FL,34990,6,,,, +US-FL-34991,US,FL,34991,6,,,, +US-FL-34992,US,FL,34992,6,,,, +US-FL-34994,US,FL,34994,6,,,, +US-FL-34995,US,FL,34995,6,,,, +US-FL-34996,US,FL,34996,6,,,, +US-FL-34997,US,FL,34997,6,,,, +US-GA-30002,US,GA,30002,7,,,, +US-GA-30003,US,GA,30003,6,,,, +US-GA-30004,US,GA,30004,7,,,, +US-GA-30005,US,GA,30005,7,,,, +US-GA-30006,US,GA,30006,6,,,, +US-GA-30007,US,GA,30007,6,,,, +US-GA-30008,US,GA,30008,6,,,, +US-GA-30009,US,GA,30009,7,,,, +US-GA-30010,US,GA,30010,6,,,, +US-GA-30011,US,GA,30011,7,,,, +US-GA-30012,US,GA,30012,6,,,, +US-GA-30013,US,GA,30013,6,,,, +US-GA-30014,US,GA,30014,7,,,, +US-GA-30015,US,GA,30015,7,,,, +US-GA-30016,US,GA,30016,7,,,, +US-GA-30017,US,GA,30017,6,,,, +US-GA-30018,US,GA,30018,7,,,, +US-GA-30019,US,GA,30019,6,,,, +US-GA-30021,US,GA,30021,7,,,, +US-GA-30022,US,GA,30022,7,,,, +US-GA-30023,US,GA,30023,7,,,, +US-GA-30024,US,GA,30024,6,,,, +US-GA-30025,US,GA,30025,7,,,, +US-GA-30026,US,GA,30026,6,,,, +US-GA-30028,US,GA,30028,7,,,, +US-GA-30029,US,GA,30029,6,,,, +US-GA-30030,US,GA,30030,7,,,, +US-GA-30031,US,GA,30031,7,,,, +US-GA-30032,US,GA,30032,7,,,, +US-GA-30033,US,GA,30033,7,,,, +US-GA-30034,US,GA,30034,7,,,, +US-GA-30035,US,GA,30035,7,,,, +US-GA-30036,US,GA,30036,7,,,, +US-GA-30037,US,GA,30037,7,,,, +US-GA-30038,US,GA,30038,7,,,, +US-GA-30039,US,GA,30039,6,,,, +US-GA-30040,US,GA,30040,7,,,, +US-GA-30041,US,GA,30041,7,,,, +US-GA-30042,US,GA,30042,6,,,, +US-GA-30043,US,GA,30043,6,,,, +US-GA-30044,US,GA,30044,6,,,, +US-GA-30045,US,GA,30045,6,,,, +US-GA-30046,US,GA,30046,6,,,, +US-GA-30047,US,GA,30047,6,,,, +US-GA-30048,US,GA,30048,6,,,, +US-GA-30049,US,GA,30049,6,,,, +US-GA-30052,US,GA,30052,6,,,, +US-GA-30054,US,GA,30054,7,,,, +US-GA-30055,US,GA,30055,7,,,, +US-GA-30056,US,GA,30056,7,,,, +US-GA-30058,US,GA,30058,7,,,, +US-GA-30060,US,GA,30060,6,,,, +US-GA-30061,US,GA,30061,6,,,, +US-GA-30062,US,GA,30062,6,,,, +US-GA-30063,US,GA,30063,6,,,, +US-GA-30064,US,GA,30064,6,,,, +US-GA-30065,US,GA,30065,6,,,, +US-GA-30066,US,GA,30066,6,,,, +US-GA-30067,US,GA,30067,6,,,, +US-GA-30068,US,GA,30068,6,,,, +US-GA-30069,US,GA,30069,6,,,, +US-GA-30070,US,GA,30070,7,,,, +US-GA-30071,US,GA,30071,6,,,, +US-GA-30072,US,GA,30072,7,,,, +US-GA-30074,US,GA,30074,7,,,, +US-GA-30075,US,GA,30075,7,,,, +US-GA-30076,US,GA,30076,7,,,, +US-GA-30077,US,GA,30077,7,,,, +US-GA-30078,US,GA,30078,6,,,, +US-GA-30079,US,GA,30079,7,,,, +US-GA-30080,US,GA,30080,6,,,, +US-GA-30081,US,GA,30081,6,,,, +US-GA-30082,US,GA,30082,6,,,, +US-GA-30083,US,GA,30083,7,,,, +US-GA-30084,US,GA,30084,7,,,, +US-GA-30085,US,GA,30085,7,,,, +US-GA-30086,US,GA,30086,7,,,, +US-GA-30087,US,GA,30087,7,,,, +US-GA-30088,US,GA,30088,7,,,, +US-GA-30090,US,GA,30090,6,,,, +US-GA-30091,US,GA,30091,6,,,, +US-GA-30092,US,GA,30092,6,,,, +US-GA-30093,US,GA,30093,6,,,, +US-GA-30094,US,GA,30094,6,,,, +US-GA-30095,US,GA,30095,6,,,, +US-GA-30096,US,GA,30096,6,,,, +US-GA-30097,US,GA,30097,6,,,, +US-GA-30098,US,GA,30098,7,,,, +US-GA-30099,US,GA,30099,6,,,, +US-GA-30101,US,GA,30101,6,,,, +US-GA-30102,US,GA,30102,6,,,, +US-GA-30103,US,GA,30103,7,,,, +US-GA-30104,US,GA,30104,7,,,, +US-GA-30105,US,GA,30105,6,,,, +US-GA-30106,US,GA,30106,6,,,, +US-GA-30107,US,GA,30107,6,,,, +US-GA-30108,US,GA,30108,7,,,, +US-GA-30109,US,GA,30109,7,,,, +US-GA-30110,US,GA,30110,7,,,, +US-GA-30111,US,GA,30111,6,,,, +US-GA-30112,US,GA,30112,7,,,, +US-GA-30113,US,GA,30113,7,,,, +US-GA-30114,US,GA,30114,6,,,, +US-GA-30115,US,GA,30115,6,,,, +US-GA-30116,US,GA,30116,7,,,, +US-GA-30117,US,GA,30117,7,,,, +US-GA-30118,US,GA,30118,7,,,, +US-GA-30119,US,GA,30119,7,,,, +US-GA-30120,US,GA,30120,7,,,, +US-GA-30121,US,GA,30121,7,,,, +US-GA-30122,US,GA,30122,7,,,, +US-GA-30123,US,GA,30123,7,,,, +US-GA-30124,US,GA,30124,6,,,, +US-GA-30125,US,GA,30125,7,,,, +US-GA-30126,US,GA,30126,6,,,, +US-GA-30127,US,GA,30127,6,,,, +US-GA-30129,US,GA,30129,6,,,, +US-GA-30132,US,GA,30132,7,,,, +US-GA-30133,US,GA,30133,7,,,, +US-GA-30134,US,GA,30134,7,,,, +US-GA-30135,US,GA,30135,7,,,, +US-GA-30137,US,GA,30137,7,,,, +US-GA-30138,US,GA,30138,7,,,, +US-GA-30139,US,GA,30139,7,,,, +US-GA-30140,US,GA,30140,7,,,, +US-GA-30141,US,GA,30141,7,,,, +US-GA-30142,US,GA,30142,6,,,, +US-GA-30143,US,GA,30143,7,,,, +US-GA-30144,US,GA,30144,6,,,, +US-GA-30145,US,GA,30145,7,,,, +US-GA-30146,US,GA,30146,6,,,, +US-GA-30147,US,GA,30147,6,,,, +US-GA-30148,US,GA,30148,7,,,, +US-GA-30149,US,GA,30149,6,,,, +US-GA-30150,US,GA,30150,7,,,, +US-GA-30151,US,GA,30151,6,,,, +US-GA-30152,US,GA,30152,6,,,, +US-GA-30153,US,GA,30153,7,,,, +US-GA-30154,US,GA,30154,7,,,, +US-GA-30156,US,GA,30156,6,,,, +US-GA-30157,US,GA,30157,7,,,, +US-GA-30160,US,GA,30160,6,,,, +US-GA-30161,US,GA,30161,6,,,, +US-GA-30162,US,GA,30162,6,,,, +US-GA-30163,US,GA,30163,6,,,, +US-GA-30164,US,GA,30164,6,,,, +US-GA-30165,US,GA,30165,6,,,, +US-GA-30168,US,GA,30168,6,,,, +US-GA-30169,US,GA,30169,6,,,, +US-GA-30170,US,GA,30170,7,,,, +US-GA-30171,US,GA,30171,7,,,, +US-GA-30172,US,GA,30172,6,,,, +US-GA-30173,US,GA,30173,6,,,, +US-GA-30175,US,GA,30175,7,,,, +US-GA-30176,US,GA,30176,7,,,, +US-GA-30177,US,GA,30177,7,,,, +US-GA-30178,US,GA,30178,7,,,, +US-GA-30179,US,GA,30179,7,,,, +US-GA-30180,US,GA,30180,7,,,, +US-GA-30182,US,GA,30182,7,,,, +US-GA-30183,US,GA,30183,6,,,, +US-GA-30184,US,GA,30184,7,,,, +US-GA-30185,US,GA,30185,7,,,, +US-GA-30187,US,GA,30187,7,,,, +US-GA-30188,US,GA,30188,6,,,, +US-GA-30189,US,GA,30189,6,,,, +US-GA-30204,US,GA,30204,7,,,, +US-GA-30205,US,GA,30205,7,,,, +US-GA-30206,US,GA,30206,7,,,, +US-GA-30212,US,GA,30212,7,,,, +US-GA-30213,US,GA,30213,7,,,, +US-GA-30214,US,GA,30214,6,,,, +US-GA-30215,US,GA,30215,6,,,, +US-GA-30216,US,GA,30216,7,,,, +US-GA-30217,US,GA,30217,7,,,, +US-GA-30218,US,GA,30218,7,,,, +US-GA-30219,US,GA,30219,7,,,, +US-GA-30220,US,GA,30220,7,,,, +US-GA-30222,US,GA,30222,7,,,, +US-GA-30223,US,GA,30223,7,,,, +US-GA-30224,US,GA,30224,7,,,, +US-GA-30228,US,GA,30228,7,,,, +US-GA-30229,US,GA,30229,7,,,, +US-GA-30230,US,GA,30230,7,,,, +US-GA-30233,US,GA,30233,7,,,, +US-GA-30234,US,GA,30234,7,,,, +US-GA-30236,US,GA,30236,7,,,, +US-GA-30237,US,GA,30237,7,,,, +US-GA-30238,US,GA,30238,7,,,, +US-GA-30240,US,GA,30240,7,,,, +US-GA-30241,US,GA,30241,7,,,, +US-GA-30248,US,GA,30248,7,,,, +US-GA-30250,US,GA,30250,7,,,, +US-GA-30251,US,GA,30251,7,,,, +US-GA-30252,US,GA,30252,7,,,, +US-GA-30253,US,GA,30253,7,,,, +US-GA-30256,US,GA,30256,7,,,, +US-GA-30257,US,GA,30257,7,,,, +US-GA-30258,US,GA,30258,7,,,, +US-GA-30259,US,GA,30259,7,,,, +US-GA-30260,US,GA,30260,7,,,, +US-GA-30261,US,GA,30261,7,,,, +US-GA-30263,US,GA,30263,7,,,, +US-GA-30264,US,GA,30264,7,,,, +US-GA-30265,US,GA,30265,7,,,, +US-GA-30266,US,GA,30266,7,,,, +US-GA-30268,US,GA,30268,7,,,, +US-GA-30269,US,GA,30269,6,,,, +US-GA-30270,US,GA,30270,6,,,, +US-GA-30271,US,GA,30271,7,,,, +US-GA-30272,US,GA,30272,7,,,, +US-GA-30273,US,GA,30273,7,,,, +US-GA-30274,US,GA,30274,7,,,, +US-GA-30275,US,GA,30275,7,,,, +US-GA-30276,US,GA,30276,7,,,, +US-GA-30277,US,GA,30277,7,,,, +US-GA-30281,US,GA,30281,7,,,, +US-GA-30284,US,GA,30284,7,,,, +US-GA-30285,US,GA,30285,7,,,, +US-GA-30286,US,GA,30286,7,,,, +US-GA-30287,US,GA,30287,7,,,, +US-GA-30288,US,GA,30288,7,,,, +US-GA-30289,US,GA,30289,7,,,, +US-GA-30290,US,GA,30290,6,,,, +US-GA-30291,US,GA,30291,7,,,, +US-GA-30292,US,GA,30292,7,,,, +US-GA-30293,US,GA,30293,7,,,, +US-GA-30294,US,GA,30294,7,,,, +US-GA-30295,US,GA,30295,7,,,, +US-GA-30296,US,GA,30296,7,,,, +US-GA-30297,US,GA,30297,7,,,, +US-GA-30298,US,GA,30298,7,,,, +US-GA-30301,US,GA,30301,7,,,, +US-GA-30302,US,GA,30302,7,,,, +US-GA-30303,US,GA,30303,8,,,, +US-GA-30304,US,GA,30304,7,,,, +US-GA-30305,US,GA,30305,8,,,, +US-GA-30306,US,GA,30306,8,,,, +US-GA-30307,US,GA,30307,8,,,, +US-GA-30308,US,GA,30308,8,,,, +US-GA-30309,US,GA,30309,8,,,, +US-GA-30310,US,GA,30310,8,,,, +US-GA-30311,US,GA,30311,8,,,, +US-GA-30312,US,GA,30312,8,,,, +US-GA-30313,US,GA,30313,8,,,, +US-GA-30314,US,GA,30314,8,,,, +US-GA-30315,US,GA,30315,8,,,, +US-GA-30316,US,GA,30316,7,,,, +US-GA-30317,US,GA,30317,8,,,, +US-GA-30318,US,GA,30318,8,,,, +US-GA-30319,US,GA,30319,7,,,, +US-GA-30320,US,GA,30320,7,,,, +US-GA-30321,US,GA,30321,7,,,, +US-GA-30322,US,GA,30322,7,,,, +US-GA-30324,US,GA,30324,8,,,, +US-GA-30325,US,GA,30325,7,,,, +US-GA-30326,US,GA,30326,8,,,, +US-GA-30327,US,GA,30327,8,,,, +US-GA-30328,US,GA,30328,7,,,, +US-GA-30329,US,GA,30329,7,,,, +US-GA-30331,US,GA,30331,8,,,, +US-GA-30332,US,GA,30332,7,,,, +US-GA-30333,US,GA,30333,7,,,, +US-GA-30334,US,GA,30334,8,,,, +US-GA-30336,US,GA,30336,7,,,, +US-GA-30337,US,GA,30337,7,,,, +US-GA-30338,US,GA,30338,7,,,, +US-GA-30339,US,GA,30339,6,,,, +US-GA-30340,US,GA,30340,7,,,, +US-GA-30341,US,GA,30341,7,,,, +US-GA-30342,US,GA,30342,8,,,, +US-GA-30343,US,GA,30343,7,,,, +US-GA-30344,US,GA,30344,8,,,, +US-GA-30345,US,GA,30345,7,,,, +US-GA-30346,US,GA,30346,7,,,, +US-GA-30348,US,GA,30348,7,,,, +US-GA-30349,US,GA,30349,7,,,, +US-GA-30350,US,GA,30350,7,,,, +US-GA-30353,US,GA,30353,7,,,, +US-GA-30354,US,GA,30354,8,,,, +US-GA-30355,US,GA,30355,8,,,, +US-GA-30356,US,GA,30356,7,,,, +US-GA-30357,US,GA,30357,7,,,, +US-GA-30358,US,GA,30358,7,,,, +US-GA-30359,US,GA,30359,7,,,, +US-GA-30360,US,GA,30360,7,,,, +US-GA-30361,US,GA,30361,8,,,, +US-GA-30362,US,GA,30362,7,,,, +US-GA-30363,US,GA,30363,8,,,, +US-GA-30364,US,GA,30364,8,,,, +US-GA-30366,US,GA,30366,7,,,, +US-GA-30368,US,GA,30368,7,,,, +US-GA-30369,US,GA,30369,8,,,, +US-GA-30370,US,GA,30370,7,,,, +US-GA-30371,US,GA,30371,7,,,, +US-GA-30374,US,GA,30374,7,,,, +US-GA-30375,US,GA,30375,8,,,, +US-GA-30377,US,GA,30377,7,,,, +US-GA-30378,US,GA,30378,7,,,, +US-GA-30380,US,GA,30380,7,,,, +US-GA-30384,US,GA,30384,7,,,, +US-GA-30385,US,GA,30385,7,,,, +US-GA-30388,US,GA,30388,7,,,, +US-GA-30392,US,GA,30392,7,,,, +US-GA-30394,US,GA,30394,7,,,, +US-GA-30396,US,GA,30396,7,,,, +US-GA-30398,US,GA,30398,7,,,, +US-GA-30401,US,GA,30401,8,,,, +US-GA-30410,US,GA,30410,8,,,, +US-GA-30411,US,GA,30411,8,,,, +US-GA-30412,US,GA,30412,8,,,, +US-GA-30413,US,GA,30413,8,,,, +US-GA-30414,US,GA,30414,8,,,, +US-GA-30415,US,GA,30415,7,,,, +US-GA-30417,US,GA,30417,8,,,, +US-GA-30420,US,GA,30420,8,,,, +US-GA-30421,US,GA,30421,8,,,, +US-GA-30423,US,GA,30423,8,,,, +US-GA-30424,US,GA,30424,7,,,, +US-GA-30425,US,GA,30425,7,,,, +US-GA-30426,US,GA,30426,7,,,, +US-GA-30427,US,GA,30427,8,,,, +US-GA-30428,US,GA,30428,8,,,, +US-GA-30429,US,GA,30429,8,,,, +US-GA-30434,US,GA,30434,8,,,, +US-GA-30436,US,GA,30436,8,,,, +US-GA-30438,US,GA,30438,8,,,, +US-GA-30439,US,GA,30439,8,,,, +US-GA-30441,US,GA,30441,7,,,, +US-GA-30442,US,GA,30442,8,,,, +US-GA-30445,US,GA,30445,8,,,, +US-GA-30446,US,GA,30446,7,,,, +US-GA-30447,US,GA,30447,8,,,, +US-GA-30448,US,GA,30448,8,,,, +US-GA-30449,US,GA,30449,7,,,, +US-GA-30450,US,GA,30450,7,,,, +US-GA-30451,US,GA,30451,8,,,, +US-GA-30452,US,GA,30452,7,,,, +US-GA-30453,US,GA,30453,8,,,, +US-GA-30454,US,GA,30454,8,,,, +US-GA-30455,US,GA,30455,7,,,, +US-GA-30456,US,GA,30456,7,,,, +US-GA-30457,US,GA,30457,8,,,, +US-GA-30458,US,GA,30458,7,,,, +US-GA-30459,US,GA,30459,7,,,, +US-GA-30460,US,GA,30460,7,,,, +US-GA-30461,US,GA,30461,7,,,, +US-GA-30464,US,GA,30464,8,,,, +US-GA-30467,US,GA,30467,7,,,, +US-GA-30470,US,GA,30470,8,,,, +US-GA-30471,US,GA,30471,8,,,, +US-GA-30473,US,GA,30473,8,,,, +US-GA-30474,US,GA,30474,8,,,, +US-GA-30475,US,GA,30475,8,,,, +US-GA-30477,US,GA,30477,8,,,, +US-GA-30499,US,GA,30499,8,,,, +US-GA-30501,US,GA,30501,7,,,, +US-GA-30502,US,GA,30502,7,,,, +US-GA-30503,US,GA,30503,7,,,, +US-GA-30504,US,GA,30504,7,,,, +US-GA-30506,US,GA,30506,7,,,, +US-GA-30507,US,GA,30507,7,,,, +US-GA-30510,US,GA,30510,7,,,, +US-GA-30511,US,GA,30511,7,,,, +US-GA-30512,US,GA,30512,7,,,, +US-GA-30513,US,GA,30513,7,,,, +US-GA-30514,US,GA,30514,7,,,, +US-GA-30515,US,GA,30515,6,,,, +US-GA-30516,US,GA,30516,7,,,, +US-GA-30517,US,GA,30517,7,,,, +US-GA-30518,US,GA,30518,6,,,, +US-GA-30519,US,GA,30519,6,,,, +US-GA-30520,US,GA,30520,7,,,, +US-GA-30521,US,GA,30521,7,,,, +US-GA-30522,US,GA,30522,7,,,, +US-GA-30523,US,GA,30523,7,,,, +US-GA-30525,US,GA,30525,7,,,, +US-GA-30527,US,GA,30527,7,,,, +US-GA-30528,US,GA,30528,7,,,, +US-GA-30529,US,GA,30529,7,,,, +US-GA-30530,US,GA,30530,7,,,, +US-GA-30531,US,GA,30531,7,,,, +US-GA-30533,US,GA,30533,7,,,, +US-GA-30534,US,GA,30534,7,,,, +US-GA-30535,US,GA,30535,7,,,, +US-GA-30536,US,GA,30536,7,,,, +US-GA-30537,US,GA,30537,7,,,, +US-GA-30538,US,GA,30538,7,,,, +US-GA-30539,US,GA,30539,7,,,, +US-GA-30540,US,GA,30540,7,,,, +US-GA-30541,US,GA,30541,7,,,, +US-GA-30542,US,GA,30542,7,,,, +US-GA-30543,US,GA,30543,7,,,, +US-GA-30545,US,GA,30545,7,,,, +US-GA-30546,US,GA,30546,7,,,, +US-GA-30547,US,GA,30547,7,,,, +US-GA-30548,US,GA,30548,7,,,, +US-GA-30549,US,GA,30549,7,,,, +US-GA-30552,US,GA,30552,7,,,, +US-GA-30553,US,GA,30553,7,,,, +US-GA-30554,US,GA,30554,7,,,, +US-GA-30555,US,GA,30555,7,,,, +US-GA-30557,US,GA,30557,7,,,, +US-GA-30558,US,GA,30558,7,,,, +US-GA-30559,US,GA,30559,7,,,, +US-GA-30560,US,GA,30560,7,,,, +US-GA-30562,US,GA,30562,7,,,, +US-GA-30563,US,GA,30563,7,,,, +US-GA-30564,US,GA,30564,7,,,, +US-GA-30565,US,GA,30565,7,,,, +US-GA-30566,US,GA,30566,7,,,, +US-GA-30567,US,GA,30567,7,,,, +US-GA-30568,US,GA,30568,7,,,, +US-GA-30571,US,GA,30571,7,,,, +US-GA-30572,US,GA,30572,7,,,, +US-GA-30573,US,GA,30573,7,,,, +US-GA-30575,US,GA,30575,7,,,, +US-GA-30576,US,GA,30576,7,,,, +US-GA-30577,US,GA,30577,7,,,, +US-GA-30580,US,GA,30580,7,,,, +US-GA-30581,US,GA,30581,7,,,, +US-GA-30582,US,GA,30582,7,,,, +US-GA-30597,US,GA,30597,7,,,, +US-GA-30598,US,GA,30598,7,,,, +US-GA-30599,US,GA,30599,7,,,, +US-GA-30601,US,GA,30601,7,,,, +US-GA-30602,US,GA,30602,7,,,, +US-GA-30603,US,GA,30603,7,,,, +US-GA-30604,US,GA,30604,7,,,, +US-GA-30605,US,GA,30605,7,,,, +US-GA-30606,US,GA,30606,7,,,, +US-GA-30607,US,GA,30607,7,,,, +US-GA-30608,US,GA,30608,7,,,, +US-GA-30609,US,GA,30609,7,,,, +US-GA-30612,US,GA,30612,7,,,, +US-GA-30619,US,GA,30619,7,,,, +US-GA-30620,US,GA,30620,7,,,, +US-GA-30621,US,GA,30621,7,,,, +US-GA-30622,US,GA,30622,7,,,, +US-GA-30623,US,GA,30623,7,,,, +US-GA-30624,US,GA,30624,7,,,, +US-GA-30625,US,GA,30625,7,,,, +US-GA-30627,US,GA,30627,7,,,, +US-GA-30628,US,GA,30628,7,,,, +US-GA-30629,US,GA,30629,7,,,, +US-GA-30630,US,GA,30630,7,,,, +US-GA-30631,US,GA,30631,8,,,, +US-GA-30633,US,GA,30633,7,,,, +US-GA-30634,US,GA,30634,7,,,, +US-GA-30635,US,GA,30635,7,,,, +US-GA-30638,US,GA,30638,7,,,, +US-GA-30639,US,GA,30639,7,,,, +US-GA-30641,US,GA,30641,7,,,, +US-GA-30642,US,GA,30642,6,,,, +US-GA-30643,US,GA,30643,7,,,, +US-GA-30645,US,GA,30645,7,,,, +US-GA-30646,US,GA,30646,7,,,, +US-GA-30647,US,GA,30647,7,,,, +US-GA-30648,US,GA,30648,7,,,, +US-GA-30650,US,GA,30650,7,,,, +US-GA-30655,US,GA,30655,7,,,, +US-GA-30656,US,GA,30656,7,,,, +US-GA-30660,US,GA,30660,8,,,, +US-GA-30662,US,GA,30662,7,,,, +US-GA-30663,US,GA,30663,7,,,, +US-GA-30664,US,GA,30664,8,,,, +US-GA-30665,US,GA,30665,6,,,, +US-GA-30666,US,GA,30666,7,,,, +US-GA-30667,US,GA,30667,7,,,, +US-GA-30668,US,GA,30668,8,,,, +US-GA-30669,US,GA,30669,6,,,, +US-GA-30671,US,GA,30671,7,,,, +US-GA-30673,US,GA,30673,8,,,, +US-GA-30677,US,GA,30677,7,,,, +US-GA-30678,US,GA,30678,6,,,, +US-GA-30680,US,GA,30680,7,,,, +US-GA-30683,US,GA,30683,7,,,, +US-GA-30701,US,GA,30701,7,,,, +US-GA-30703,US,GA,30703,7,,,, +US-GA-30705,US,GA,30705,7,,,, +US-GA-30707,US,GA,30707,7,,,, +US-GA-30708,US,GA,30708,7,,,, +US-GA-30710,US,GA,30710,6,,,, +US-GA-30711,US,GA,30711,7,,,, +US-GA-30719,US,GA,30719,6,,,, +US-GA-30720,US,GA,30720,6,,,, +US-GA-30721,US,GA,30721,6,,,, +US-GA-30722,US,GA,30722,6,,,, +US-GA-30724,US,GA,30724,7,,,, +US-GA-30725,US,GA,30725,7,,,, +US-GA-30726,US,GA,30726,7,,,, +US-GA-30728,US,GA,30728,7,,,, +US-GA-30730,US,GA,30730,7,,,, +US-GA-30731,US,GA,30731,7,,,, +US-GA-30732,US,GA,30732,7,,,, +US-GA-30733,US,GA,30733,7,,,, +US-GA-30734,US,GA,30734,7,,,, +US-GA-30735,US,GA,30735,7,,,, +US-GA-30736,US,GA,30736,7,,,, +US-GA-30738,US,GA,30738,7,,,, +US-GA-30739,US,GA,30739,7,,,, +US-GA-30740,US,GA,30740,6,,,, +US-GA-30741,US,GA,30741,7,,,, +US-GA-30742,US,GA,30742,7,,,, +US-GA-30746,US,GA,30746,7,,,, +US-GA-30747,US,GA,30747,7,,,, +US-GA-30750,US,GA,30750,7,,,, +US-GA-30751,US,GA,30751,7,,,, +US-GA-30752,US,GA,30752,7,,,, +US-GA-30753,US,GA,30753,7,,,, +US-GA-30755,US,GA,30755,6,,,, +US-GA-30756,US,GA,30756,6,,,, +US-GA-30757,US,GA,30757,7,,,, +US-GA-30802,US,GA,30802,8,,,, +US-GA-30803,US,GA,30803,8,,,, +US-GA-30805,US,GA,30805,7,,,, +US-GA-30806,US,GA,30806,8,,,, +US-GA-30807,US,GA,30807,8,,,, +US-GA-30808,US,GA,30808,8,,,, +US-GA-30809,US,GA,30809,8,,,, +US-GA-30810,US,GA,30810,8,,,, +US-GA-30811,US,GA,30811,7,,,, +US-GA-30812,US,GA,30812,8,,,, +US-GA-30813,US,GA,30813,8,,,, +US-GA-30814,US,GA,30814,8,,,, +US-GA-30815,US,GA,30815,8,,,, +US-GA-30816,US,GA,30816,7,,,, +US-GA-30817,US,GA,30817,8,,,, +US-GA-30818,US,GA,30818,8,,,, +US-GA-30819,US,GA,30819,8,,,, +US-GA-30820,US,GA,30820,8,,,, +US-GA-30821,US,GA,30821,8,,,, +US-GA-30822,US,GA,30822,8,,,, +US-GA-30823,US,GA,30823,8,,,, +US-GA-30824,US,GA,30824,8,,,, +US-GA-30828,US,GA,30828,8,,,, +US-GA-30830,US,GA,30830,7,,,, +US-GA-30833,US,GA,30833,8,,,, +US-GA-30901,US,GA,30901,8,,,, +US-GA-30903,US,GA,30903,8,,,, +US-GA-30904,US,GA,30904,8,,,, +US-GA-30905,US,GA,30905,8,,,, +US-GA-30906,US,GA,30906,8,,,, +US-GA-30907,US,GA,30907,8,,,, +US-GA-30909,US,GA,30909,8,,,, +US-GA-30912,US,GA,30912,8,,,, +US-GA-30914,US,GA,30914,8,,,, +US-GA-30916,US,GA,30916,8,,,, +US-GA-30917,US,GA,30917,8,,,, +US-GA-30919,US,GA,30919,8,,,, +US-GA-30999,US,GA,30999,8,,,, +US-GA-31001,US,GA,31001,8,,,, +US-GA-31002,US,GA,31002,8,,,, +US-GA-31003,US,GA,31003,7,,,, +US-GA-31004,US,GA,31004,7,,,, +US-GA-31005,US,GA,31005,7,,,, +US-GA-31006,US,GA,31006,8,,,, +US-GA-31007,US,GA,31007,8,,,, +US-GA-31008,US,GA,31008,7,,,, +US-GA-31009,US,GA,31009,8,,,, +US-GA-31010,US,GA,31010,8,,,, +US-GA-31011,US,GA,31011,8,,,, +US-GA-31012,US,GA,31012,8,,,, +US-GA-31013,US,GA,31013,7,,,, +US-GA-31014,US,GA,31014,8,,,, +US-GA-31015,US,GA,31015,8,,,, +US-GA-31016,US,GA,31016,7,,,, +US-GA-31017,US,GA,31017,7,,,, +US-GA-31018,US,GA,31018,8,,,, +US-GA-31019,US,GA,31019,8,,,, +US-GA-31020,US,GA,31020,7,,,, +US-GA-31021,US,GA,31021,8,,,, +US-GA-31022,US,GA,31022,8,,,, +US-GA-31023,US,GA,31023,8,,,, +US-GA-31024,US,GA,31024,7,,,, +US-GA-31025,US,GA,31025,7,,,, +US-GA-31026,US,GA,31026,7,,,, +US-GA-31027,US,GA,31027,8,,,, +US-GA-31028,US,GA,31028,7,,,, +US-GA-31029,US,GA,31029,7,,,, +US-GA-31030,US,GA,31030,7,,,, +US-GA-31031,US,GA,31031,7,,,, +US-GA-31032,US,GA,31032,7,,,, +US-GA-31033,US,GA,31033,7,,,, +US-GA-31034,US,GA,31034,7,,,, +US-GA-31035,US,GA,31035,8,,,, +US-GA-31036,US,GA,31036,7,,,, +US-GA-31037,US,GA,31037,8,,,, +US-GA-31038,US,GA,31038,7,,,, +US-GA-31039,US,GA,31039,8,,,, +US-GA-31040,US,GA,31040,8,,,, +US-GA-31041,US,GA,31041,8,,,, +US-GA-31042,US,GA,31042,7,,,, +US-GA-31044,US,GA,31044,7,,,, +US-GA-31045,US,GA,31045,8,,,, +US-GA-31046,US,GA,31046,7,,,, +US-GA-31047,US,GA,31047,7,,,, +US-GA-31049,US,GA,31049,8,,,, +US-GA-31050,US,GA,31050,7,,,, +US-GA-31051,US,GA,31051,8,,,, +US-GA-31052,US,GA,31052,7,,,, +US-GA-31054,US,GA,31054,7,,,, +US-GA-31055,US,GA,31055,8,,,, +US-GA-31057,US,GA,31057,8,,,, +US-GA-31058,US,GA,31058,8,,,, +US-GA-31059,US,GA,31059,7,,,, +US-GA-31060,US,GA,31060,8,,,, +US-GA-31061,US,GA,31061,7,,,, +US-GA-31062,US,GA,31062,7,,,, +US-GA-31063,US,GA,31063,8,,,, +US-GA-31064,US,GA,31064,7,,,, +US-GA-31065,US,GA,31065,8,,,, +US-GA-31066,US,GA,31066,7,,,, +US-GA-31067,US,GA,31067,8,,,, +US-GA-31068,US,GA,31068,8,,,, +US-GA-31069,US,GA,31069,7,,,, +US-GA-31070,US,GA,31070,8,,,, +US-GA-31071,US,GA,31071,8,,,, +US-GA-31072,US,GA,31072,8,,,, +US-GA-31075,US,GA,31075,8,,,, +US-GA-31076,US,GA,31076,8,,,, +US-GA-31077,US,GA,31077,8,,,, +US-GA-31078,US,GA,31078,7,,,, +US-GA-31079,US,GA,31079,8,,,, +US-GA-31081,US,GA,31081,8,,,, +US-GA-31082,US,GA,31082,8,,,, +US-GA-31083,US,GA,31083,8,,,, +US-GA-31084,US,GA,31084,8,,,, +US-GA-31085,US,GA,31085,7,,,, +US-GA-31086,US,GA,31086,7,,,, +US-GA-31087,US,GA,31087,8,,,, +US-GA-31088,US,GA,31088,7,,,, +US-GA-31089,US,GA,31089,8,,,, +US-GA-31090,US,GA,31090,7,,,, +US-GA-31091,US,GA,31091,8,,,, +US-GA-31092,US,GA,31092,8,,,, +US-GA-31093,US,GA,31093,7,,,, +US-GA-31094,US,GA,31094,8,,,, +US-GA-31095,US,GA,31095,7,,,, +US-GA-31096,US,GA,31096,8,,,, +US-GA-31097,US,GA,31097,7,,,, +US-GA-31098,US,GA,31098,7,,,, +US-GA-31099,US,GA,31099,7,,,, +US-GA-31106,US,GA,31106,7,,,, +US-GA-31107,US,GA,31107,7,,,, +US-GA-31119,US,GA,31119,7,,,, +US-GA-31126,US,GA,31126,7,,,, +US-GA-31131,US,GA,31131,7,,,, +US-GA-31136,US,GA,31136,7,,,, +US-GA-31139,US,GA,31139,7,,,, +US-GA-31141,US,GA,31141,7,,,, +US-GA-31144,US,GA,31144,6,,,, +US-GA-31145,US,GA,31145,7,,,, +US-GA-31146,US,GA,31146,7,,,, +US-GA-31150,US,GA,31150,7,,,, +US-GA-31156,US,GA,31156,7,,,, +US-GA-31169,US,GA,31169,6,,,, +US-GA-31192,US,GA,31192,7,,,, +US-GA-31193,US,GA,31193,7,,,, +US-GA-31195,US,GA,31195,7,,,, +US-GA-31196,US,GA,31196,7,,,, +US-GA-31201,US,GA,31201,7,,,, +US-GA-31202,US,GA,31202,7,,,, +US-GA-31203,US,GA,31203,7,,,, +US-GA-31204,US,GA,31204,7,,,, +US-GA-31205,US,GA,31205,7,,,, +US-GA-31206,US,GA,31206,7,,,, +US-GA-31207,US,GA,31207,7,,,, +US-GA-31208,US,GA,31208,7,,,, +US-GA-31209,US,GA,31209,7,,,, +US-GA-31210,US,GA,31210,7,,,, +US-GA-31211,US,GA,31211,7,,,, +US-GA-31213,US,GA,31213,7,,,, +US-GA-31216,US,GA,31216,7,,,, +US-GA-31217,US,GA,31217,7,,,, +US-GA-31220,US,GA,31220,7,,,, +US-GA-31221,US,GA,31221,7,,,, +US-GA-31294,US,GA,31294,7,,,, +US-GA-31295,US,GA,31295,7,,,, +US-GA-31296,US,GA,31296,7,,,, +US-GA-31297,US,GA,31297,7,,,, +US-GA-31301,US,GA,31301,7,,,, +US-GA-31302,US,GA,31302,7,,,, +US-GA-31303,US,GA,31303,7,,,, +US-GA-31304,US,GA,31304,7,,,, +US-GA-31305,US,GA,31305,7,,,, +US-GA-31307,US,GA,31307,7,,,, +US-GA-31308,US,GA,31308,7,,,, +US-GA-31309,US,GA,31309,7,,,, +US-GA-31310,US,GA,31310,7,,,, +US-GA-31312,US,GA,31312,7,,,, +US-GA-31313,US,GA,31313,7,,,, +US-GA-31314,US,GA,31314,7,,,, +US-GA-31315,US,GA,31315,7,,,, +US-GA-31316,US,GA,31316,7,,,, +US-GA-31318,US,GA,31318,7,,,, +US-GA-31319,US,GA,31319,7,,,, +US-GA-31320,US,GA,31320,7,,,, +US-GA-31321,US,GA,31321,7,,,, +US-GA-31322,US,GA,31322,7,,,, +US-GA-31323,US,GA,31323,7,,,, +US-GA-31324,US,GA,31324,7,,,, +US-GA-31326,US,GA,31326,7,,,, +US-GA-31327,US,GA,31327,7,,,, +US-GA-31328,US,GA,31328,7,,,, +US-GA-31329,US,GA,31329,7,,,, +US-GA-31331,US,GA,31331,7,,,, +US-GA-31333,US,GA,31333,7,,,, +US-GA-31401,US,GA,31401,7,,,, +US-GA-31402,US,GA,31402,7,,,, +US-GA-31403,US,GA,31403,7,,,, +US-GA-31404,US,GA,31404,7,,,, +US-GA-31405,US,GA,31405,7,,,, +US-GA-31406,US,GA,31406,7,,,, +US-GA-31407,US,GA,31407,7,,,, +US-GA-31408,US,GA,31408,7,,,, +US-GA-31409,US,GA,31409,7,,,, +US-GA-31410,US,GA,31410,7,,,, +US-GA-31411,US,GA,31411,7,,,, +US-GA-31412,US,GA,31412,7,,,, +US-GA-31414,US,GA,31414,7,,,, +US-GA-31415,US,GA,31415,7,,,, +US-GA-31416,US,GA,31416,7,,,, +US-GA-31418,US,GA,31418,7,,,, +US-GA-31419,US,GA,31419,7,,,, +US-GA-31420,US,GA,31420,7,,,, +US-GA-31421,US,GA,31421,7,,,, +US-GA-31501,US,GA,31501,7,,,, +US-GA-31502,US,GA,31502,7,,,, +US-GA-31503,US,GA,31503,7,,,, +US-GA-31510,US,GA,31510,7,,,, +US-GA-31512,US,GA,31512,7,,,, +US-GA-31513,US,GA,31513,8,,,, +US-GA-31515,US,GA,31515,8,,,, +US-GA-31516,US,GA,31516,6,,,, +US-GA-31518,US,GA,31518,8,,,, +US-GA-31519,US,GA,31519,7,,,, +US-GA-31520,US,GA,31520,6,,,, +US-GA-31521,US,GA,31521,6,,,, +US-GA-31522,US,GA,31522,6,,,, +US-GA-31523,US,GA,31523,6,,,, +US-GA-31524,US,GA,31524,6,,,, +US-GA-31525,US,GA,31525,6,,,, +US-GA-31527,US,GA,31527,6,,,, +US-GA-31532,US,GA,31532,8,,,, +US-GA-31533,US,GA,31533,7,,,, +US-GA-31534,US,GA,31534,7,,,, +US-GA-31535,US,GA,31535,7,,,, +US-GA-31537,US,GA,31537,7,,,, +US-GA-31539,US,GA,31539,8,,,, +US-GA-31542,US,GA,31542,7,,,, +US-GA-31543,US,GA,31543,7,,,, +US-GA-31544,US,GA,31544,8,,,, +US-GA-31545,US,GA,31545,8,,,, +US-GA-31546,US,GA,31546,8,,,, +US-GA-31547,US,GA,31547,7,,,, +US-GA-31548,US,GA,31548,7,,,, +US-GA-31549,US,GA,31549,8,,,, +US-GA-31550,US,GA,31550,7,,,, +US-GA-31551,US,GA,31551,6,,,, +US-GA-31552,US,GA,31552,7,,,, +US-GA-31553,US,GA,31553,7,,,, +US-GA-31554,US,GA,31554,7,,,, +US-GA-31555,US,GA,31555,8,,,, +US-GA-31556,US,GA,31556,6,,,, +US-GA-31557,US,GA,31557,6,,,, +US-GA-31558,US,GA,31558,7,,,, +US-GA-31560,US,GA,31560,8,,,, +US-GA-31561,US,GA,31561,6,,,, +US-GA-31562,US,GA,31562,7,,,, +US-GA-31563,US,GA,31563,8,,,, +US-GA-31564,US,GA,31564,7,,,, +US-GA-31565,US,GA,31565,7,,,, +US-GA-31566,US,GA,31566,7,,,, +US-GA-31567,US,GA,31567,7,,,, +US-GA-31568,US,GA,31568,7,,,, +US-GA-31569,US,GA,31569,7,,,, +US-GA-31598,US,GA,31598,8,,,, +US-GA-31599,US,GA,31599,8,,,, +US-GA-31601,US,GA,31601,7,,,, +US-GA-31602,US,GA,31602,7,,,, +US-GA-31603,US,GA,31603,7,,,, +US-GA-31604,US,GA,31604,7,,,, +US-GA-31605,US,GA,31605,7,,,, +US-GA-31606,US,GA,31606,7,,,, +US-GA-31620,US,GA,31620,7,,,, +US-GA-31622,US,GA,31622,7,,,, +US-GA-31623,US,GA,31623,7,,,, +US-GA-31624,US,GA,31624,7,,,, +US-GA-31625,US,GA,31625,7,,,, +US-GA-31626,US,GA,31626,7,,,, +US-GA-31627,US,GA,31627,7,,,, +US-GA-31629,US,GA,31629,7,,,, +US-GA-31630,US,GA,31630,7,,,, +US-GA-31631,US,GA,31631,7,,,, +US-GA-31632,US,GA,31632,7,,,, +US-GA-31634,US,GA,31634,7,,,, +US-GA-31635,US,GA,31635,7,,,, +US-GA-31636,US,GA,31636,7,,,, +US-GA-31637,US,GA,31637,7,,,, +US-GA-31638,US,GA,31638,7,,,, +US-GA-31639,US,GA,31639,7,,,, +US-GA-31641,US,GA,31641,7,,,, +US-GA-31642,US,GA,31642,7,,,, +US-GA-31643,US,GA,31643,7,,,, +US-GA-31645,US,GA,31645,7,,,, +US-GA-31647,US,GA,31647,7,,,, +US-GA-31648,US,GA,31648,7,,,, +US-GA-31649,US,GA,31649,7,,,, +US-GA-31650,US,GA,31650,7,,,, +US-GA-31698,US,GA,31698,7,,,, +US-GA-31699,US,GA,31699,7,,,, +US-GA-31701,US,GA,31701,7,,,, +US-GA-31702,US,GA,31702,7,,,, +US-GA-31703,US,GA,31703,7,,,, +US-GA-31704,US,GA,31704,7,,,, +US-GA-31705,US,GA,31705,7,,,, +US-GA-31706,US,GA,31706,7,,,, +US-GA-31707,US,GA,31707,7,,,, +US-GA-31708,US,GA,31708,7,,,, +US-GA-31709,US,GA,31709,8,,,, +US-GA-31711,US,GA,31711,8,,,, +US-GA-31712,US,GA,31712,8,,,, +US-GA-31714,US,GA,31714,7,,,, +US-GA-31716,US,GA,31716,7,,,, +US-GA-31719,US,GA,31719,8,,,, +US-GA-31720,US,GA,31720,7,,,, +US-GA-31721,US,GA,31721,7,,,, +US-GA-31722,US,GA,31722,7,,,, +US-GA-31727,US,GA,31727,7,,,, +US-GA-31730,US,GA,31730,7,,,, +US-GA-31733,US,GA,31733,7,,,, +US-GA-31735,US,GA,31735,8,,,, +US-GA-31738,US,GA,31738,7,,,, +US-GA-31739,US,GA,31739,7,,,, +US-GA-31743,US,GA,31743,8,,,, +US-GA-31744,US,GA,31744,7,,,, +US-GA-31747,US,GA,31747,7,,,, +US-GA-31749,US,GA,31749,7,,,, +US-GA-31750,US,GA,31750,7,,,, +US-GA-31753,US,GA,31753,7,,,, +US-GA-31756,US,GA,31756,7,,,, +US-GA-31757,US,GA,31757,7,,,, +US-GA-31758,US,GA,31758,7,,,, +US-GA-31760,US,GA,31760,7,,,, +US-GA-31763,US,GA,31763,7,,,, +US-GA-31764,US,GA,31764,8,,,, +US-GA-31765,US,GA,31765,7,,,, +US-GA-31768,US,GA,31768,7,,,, +US-GA-31769,US,GA,31769,7,,,, +US-GA-31771,US,GA,31771,7,,,, +US-GA-31772,US,GA,31772,7,,,, +US-GA-31773,US,GA,31773,7,,,, +US-GA-31774,US,GA,31774,7,,,, +US-GA-31775,US,GA,31775,7,,,, +US-GA-31776,US,GA,31776,7,,,, +US-GA-31778,US,GA,31778,7,,,, +US-GA-31779,US,GA,31779,7,,,, +US-GA-31780,US,GA,31780,8,,,, +US-GA-31781,US,GA,31781,7,,,, +US-GA-31782,US,GA,31782,7,,,, +US-GA-31783,US,GA,31783,7,,,, +US-GA-31784,US,GA,31784,7,,,, +US-GA-31787,US,GA,31787,7,,,, +US-GA-31788,US,GA,31788,7,,,, +US-GA-31789,US,GA,31789,7,,,, +US-GA-31790,US,GA,31790,7,,,, +US-GA-31791,US,GA,31791,7,,,, +US-GA-31792,US,GA,31792,7,,,, +US-GA-31793,US,GA,31793,7,,,, +US-GA-31794,US,GA,31794,7,,,, +US-GA-31795,US,GA,31795,7,,,, +US-GA-31796,US,GA,31796,7,,,, +US-GA-31798,US,GA,31798,7,,,, +US-GA-31799,US,GA,31799,7,,,, +US-GA-31801,US,GA,31801,8,,,, +US-GA-31803,US,GA,31803,8,,,, +US-GA-31804,US,GA,31804,8,,,, +US-GA-31805,US,GA,31805,8,,,, +US-GA-31806,US,GA,31806,8,,,, +US-GA-31807,US,GA,31807,8,,,, +US-GA-31808,US,GA,31808,8,,,, +US-GA-31810,US,GA,31810,8,,,, +US-GA-31811,US,GA,31811,8,,,, +US-GA-31812,US,GA,31812,8,,,, +US-GA-31814,US,GA,31814,8,,,, +US-GA-31815,US,GA,31815,8,,,, +US-GA-31816,US,GA,31816,7,,,, +US-GA-31820,US,GA,31820,8,,,, +US-GA-31821,US,GA,31821,8,,,, +US-GA-31822,US,GA,31822,8,,,, +US-GA-31823,US,GA,31823,8,,,, +US-GA-31824,US,GA,31824,8,,,, +US-GA-31825,US,GA,31825,8,,,, +US-GA-31826,US,GA,31826,8,,,, +US-GA-31827,US,GA,31827,8,,,, +US-GA-31829,US,GA,31829,8,,,, +US-GA-31830,US,GA,31830,7,,,, +US-GA-31831,US,GA,31831,8,,,, +US-GA-31832,US,GA,31832,8,,,, +US-GA-31833,US,GA,31833,7,,,, +US-GA-31836,US,GA,31836,8,,,, +US-GA-31901,US,GA,31901,8,,,, +US-GA-31902,US,GA,31902,8,,,, +US-GA-31903,US,GA,31903,8,,,, +US-GA-31904,US,GA,31904,8,,,, +US-GA-31905,US,GA,31905,8,,,, +US-GA-31906,US,GA,31906,8,,,, +US-GA-31907,US,GA,31907,8,,,, +US-GA-31908,US,GA,31908,8,,,, +US-GA-31909,US,GA,31909,8,,,, +US-GA-31914,US,GA,31914,8,,,, +US-GA-31917,US,GA,31917,8,,,, +US-GA-31993,US,GA,31993,8,,,, +US-GA-31995,US,GA,31995,8,,,, +US-GA-31997,US,GA,31997,8,,,, +US-GA-31998,US,GA,31998,8,,,, +US-GA-31999,US,GA,31999,8,,,, +US-GA-39813,US,GA,39813,7,,,, +US-GA-39815,US,GA,39815,7,,,, +US-GA-39817,US,GA,39817,7,,,, +US-GA-39818,US,GA,39818,7,,,, +US-GA-39819,US,GA,39819,7,,,, +US-GA-39823,US,GA,39823,7,,,, +US-GA-39824,US,GA,39824,8,,,, +US-GA-39825,US,GA,39825,7,,,, +US-GA-39826,US,GA,39826,7,,,, +US-GA-39827,US,GA,39827,7,,,, +US-GA-39828,US,GA,39828,7,,,, +US-GA-39829,US,GA,39829,7,,,, +US-GA-39832,US,GA,39832,7,,,, +US-GA-39834,US,GA,39834,7,,,, +US-GA-39836,US,GA,39836,8,,,, +US-GA-39837,US,GA,39837,7,,,, +US-GA-39840,US,GA,39840,8,,,, +US-GA-39841,US,GA,39841,7,,,, +US-GA-39842,US,GA,39842,7,,,, +US-GA-39845,US,GA,39845,7,,,, +US-GA-39846,US,GA,39846,7,,,, +US-GA-39851,US,GA,39851,8,,,, +US-GA-39852,US,GA,39852,7,,,, +US-GA-39854,US,GA,39854,8,,,, +US-GA-39859,US,GA,39859,7,,,, +US-GA-39861,US,GA,39861,7,,,, +US-GA-39862,US,GA,39862,7,,,, +US-GA-39866,US,GA,39866,7,,,, +US-GA-39867,US,GA,39867,8,,,, +US-GA-39870,US,GA,39870,7,,,, +US-GA-39877,US,GA,39877,7,,,, +US-GA-39885,US,GA,39885,7,,,, +US-GA-39886,US,GA,39886,8,,,, +US-GA-39897,US,GA,39897,7,,,, +US-GA-39901,US,GA,39901,7,,,, +US-HI-96701,US,HI,96701,4.5,,,, +US-HI-96703,US,HI,96703,4,,,, +US-HI-96704,US,HI,96704,4,,,, +US-HI-96705,US,HI,96705,4,,,, +US-HI-96706,US,HI,96706,4.5,,,, +US-HI-96707,US,HI,96707,4.5,,,, +US-HI-96708,US,HI,96708,4,,,, +US-HI-96709,US,HI,96709,4.5,,,, +US-HI-96710,US,HI,96710,4,,,, +US-HI-96712,US,HI,96712,4.5,,,, +US-HI-96713,US,HI,96713,4,,,, +US-HI-96714,US,HI,96714,4,,,, +US-HI-96715,US,HI,96715,4,,,, +US-HI-96716,US,HI,96716,4,,,, +US-HI-96717,US,HI,96717,4.5,,,, +US-HI-96718,US,HI,96718,4,,,, +US-HI-96719,US,HI,96719,4,,,, +US-HI-96720,US,HI,96720,4,,,, +US-HI-96721,US,HI,96721,4,,,, +US-HI-96722,US,HI,96722,4,,,, +US-HI-96725,US,HI,96725,4,,,, +US-HI-96726,US,HI,96726,4,,,, +US-HI-96727,US,HI,96727,4,,,, +US-HI-96728,US,HI,96728,4,,,, +US-HI-96729,US,HI,96729,4,,,, +US-HI-96730,US,HI,96730,4.5,,,, +US-HI-96731,US,HI,96731,4.5,,,, +US-HI-96732,US,HI,96732,4,,,, +US-HI-96733,US,HI,96733,4,,,, +US-HI-96734,US,HI,96734,4.5,,,, +US-HI-96737,US,HI,96737,4,,,, +US-HI-96738,US,HI,96738,4,,,, +US-HI-96739,US,HI,96739,4,,,, +US-HI-96740,US,HI,96740,4,,,, +US-HI-96741,US,HI,96741,4,,,, +US-HI-96743,US,HI,96743,4,,,, +US-HI-96744,US,HI,96744,4.5,,,, +US-HI-96745,US,HI,96745,4,,,, +US-HI-96746,US,HI,96746,4,,,, +US-HI-96747,US,HI,96747,4,,,, +US-HI-96748,US,HI,96748,4,,,, +US-HI-96749,US,HI,96749,4,,,, +US-HI-96750,US,HI,96750,4,,,, +US-HI-96751,US,HI,96751,4,,,, +US-HI-96752,US,HI,96752,4,,,, +US-HI-96753,US,HI,96753,4,,,, +US-HI-96754,US,HI,96754,4,,,, +US-HI-96755,US,HI,96755,4,,,, +US-HI-96756,US,HI,96756,4,,,, +US-HI-96757,US,HI,96757,4,,,, +US-HI-96759,US,HI,96759,4.5,,,, +US-HI-96760,US,HI,96760,4,,,, +US-HI-96761,US,HI,96761,4,,,, +US-HI-96762,US,HI,96762,4.5,,,, +US-HI-96763,US,HI,96763,4,,,, +US-HI-96764,US,HI,96764,4,,,, +US-HI-96765,US,HI,96765,4,,,, +US-HI-96766,US,HI,96766,4,,,, +US-HI-96767,US,HI,96767,4,,,, +US-HI-96768,US,HI,96768,4,,,, +US-HI-96769,US,HI,96769,4,,,, +US-HI-96770,US,HI,96770,4,,,, +US-HI-96771,US,HI,96771,4,,,, +US-HI-96772,US,HI,96772,4,,,, +US-HI-96773,US,HI,96773,4,,,, +US-HI-96774,US,HI,96774,4,,,, +US-HI-96776,US,HI,96776,4,,,, +US-HI-96777,US,HI,96777,4,,,, +US-HI-96778,US,HI,96778,4,,,, +US-HI-96779,US,HI,96779,4,,,, +US-HI-96780,US,HI,96780,4,,,, +US-HI-96781,US,HI,96781,4,,,, +US-HI-96782,US,HI,96782,4.5,,,, +US-HI-96783,US,HI,96783,4,,,, +US-HI-96784,US,HI,96784,4,,,, +US-HI-96785,US,HI,96785,4,,,, +US-HI-96786,US,HI,96786,4.5,,,, +US-HI-96788,US,HI,96788,4,,,, +US-HI-96789,US,HI,96789,4.5,,,, +US-HI-96790,US,HI,96790,4,,,, +US-HI-96791,US,HI,96791,4.5,,,, +US-HI-96792,US,HI,96792,4.5,,,, +US-HI-96793,US,HI,96793,4,,,, +US-HI-96795,US,HI,96795,4.5,,,, +US-HI-96796,US,HI,96796,4,,,, +US-HI-96797,US,HI,96797,4.5,,,, +US-HI-96801,US,HI,96801,4.5,,,, +US-HI-96802,US,HI,96802,4.5,,,, +US-HI-96803,US,HI,96803,4.5,,,, +US-HI-96804,US,HI,96804,4.5,,,, +US-HI-96805,US,HI,96805,4.5,,,, +US-HI-96806,US,HI,96806,4.5,,,, +US-HI-96807,US,HI,96807,4.5,,,, +US-HI-96808,US,HI,96808,4.5,,,, +US-HI-96809,US,HI,96809,4.5,,,, +US-HI-96810,US,HI,96810,4.5,,,, +US-HI-96811,US,HI,96811,4.5,,,, +US-HI-96812,US,HI,96812,4.5,,,, +US-HI-96813,US,HI,96813,4.5,,,, +US-HI-96814,US,HI,96814,4.5,,,, +US-HI-96815,US,HI,96815,4.5,,,, +US-HI-96816,US,HI,96816,4.5,,,, +US-HI-96817,US,HI,96817,4.5,,,, +US-HI-96818,US,HI,96818,4.5,,,, +US-HI-96819,US,HI,96819,4.5,,,, +US-HI-96820,US,HI,96820,4.5,,,, +US-HI-96821,US,HI,96821,4.5,,,, +US-HI-96822,US,HI,96822,4.5,,,, +US-HI-96823,US,HI,96823,4.5,,,, +US-HI-96824,US,HI,96824,4.5,,,, +US-HI-96825,US,HI,96825,4.5,,,, +US-HI-96826,US,HI,96826,4.5,,,, +US-HI-96828,US,HI,96828,4.5,,,, +US-HI-96830,US,HI,96830,4.5,,,, +US-HI-96836,US,HI,96836,4.5,,,, +US-HI-96837,US,HI,96837,4.5,,,, +US-HI-96838,US,HI,96838,4.5,,,, +US-HI-96839,US,HI,96839,4.5,,,, +US-HI-96840,US,HI,96840,4.5,,,, +US-HI-96841,US,HI,96841,4.5,,,, +US-HI-96843,US,HI,96843,4.5,,,, +US-HI-96844,US,HI,96844,4.5,,,, +US-HI-96846,US,HI,96846,4.5,,,, +US-HI-96847,US,HI,96847,4.5,,,, +US-HI-96848,US,HI,96848,4.5,,,, +US-HI-96849,US,HI,96849,4.5,,,, +US-HI-96850,US,HI,96850,4.5,,,, +US-HI-96853,US,HI,96853,4.5,,,, +US-HI-96854,US,HI,96854,4.5,,,, +US-HI-96857,US,HI,96857,4.5,,,, +US-HI-96858,US,HI,96858,4.5,,,, +US-HI-96859,US,HI,96859,4.5,,,, +US-HI-96860,US,HI,96860,4.5,,,, +US-HI-96861,US,HI,96861,4.5,,,, +US-HI-96863,US,HI,96863,4.5,,,, +US-HI-96898,US,HI,96898,4.5,,,, +US-IA-50001,US,IA,50001,6,,,, +US-IA-50002,US,IA,50002,7,,,, +US-IA-50003,US,IA,50003,6,,,, +US-IA-50005,US,IA,50005,7,,,, +US-IA-50006,US,IA,50006,7,,,, +US-IA-50007,US,IA,50007,6,,,, +US-IA-50008,US,IA,50008,7,,,, +US-IA-50009,US,IA,50009,6,,,, +US-IA-50010,US,IA,50010,7,,,, +US-IA-50011,US,IA,50011,7,,,, +US-IA-50012,US,IA,50012,7,,,, +US-IA-50013,US,IA,50013,7,,,, +US-IA-50014,US,IA,50014,7,,,, +US-IA-50020,US,IA,50020,7,,,, +US-IA-50021,US,IA,50021,6,,,, +US-IA-50022,US,IA,50022,7,,,, +US-IA-50023,US,IA,50023,6,,,, +US-IA-50025,US,IA,50025,7,,,, +US-IA-50026,US,IA,50026,7,,,, +US-IA-50027,US,IA,50027,7,,,, +US-IA-50028,US,IA,50028,7,,,, +US-IA-50029,US,IA,50029,7,,,, +US-IA-50031,US,IA,50031,7,,,, +US-IA-50032,US,IA,50032,6,,,, +US-IA-50033,US,IA,50033,7,,,, +US-IA-50034,US,IA,50034,7,,,, +US-IA-50035,US,IA,50035,6,,,, +US-IA-50036,US,IA,50036,7,,,, +US-IA-50037,US,IA,50037,7,,,, +US-IA-50038,US,IA,50038,6,,,, +US-IA-50039,US,IA,50039,6,,,, +US-IA-50040,US,IA,50040,7,,,, +US-IA-50041,US,IA,50041,7,,,, +US-IA-50042,US,IA,50042,7,,,, +US-IA-50044,US,IA,50044,7,,,, +US-IA-50046,US,IA,50046,7,,,, +US-IA-50047,US,IA,50047,6,,,, +US-IA-50048,US,IA,50048,7,,,, +US-IA-50049,US,IA,50049,7,,,, +US-IA-50050,US,IA,50050,7,,,, +US-IA-50051,US,IA,50051,7,,,, +US-IA-50052,US,IA,50052,7,,,, +US-IA-50054,US,IA,50054,7,,,, +US-IA-50055,US,IA,50055,7,,,, +US-IA-50056,US,IA,50056,7,,,, +US-IA-50057,US,IA,50057,7,,,, +US-IA-50058,US,IA,50058,7,,,, +US-IA-50059,US,IA,50059,7,,,, +US-IA-50060,US,IA,50060,7,,,, +US-IA-50061,US,IA,50061,6,,,, +US-IA-50062,US,IA,50062,7,,,, +US-IA-50063,US,IA,50063,6,,,, +US-IA-50064,US,IA,50064,7,,,, +US-IA-50065,US,IA,50065,7,,,, +US-IA-50066,US,IA,50066,6,,,, +US-IA-50067,US,IA,50067,7,,,, +US-IA-50068,US,IA,50068,7,,,, +US-IA-50069,US,IA,50069,6,,,, +US-IA-50070,US,IA,50070,6,,,, +US-IA-50071,US,IA,50071,7,,,, +US-IA-50072,US,IA,50072,7,,,, +US-IA-50073,US,IA,50073,6,,,, +US-IA-50074,US,IA,50074,7,,,, +US-IA-50075,US,IA,50075,7,,,, +US-IA-50076,US,IA,50076,7,,,, +US-IA-50078,US,IA,50078,7,,,, +US-IA-50099,US,IA,50099,7,,,, +US-IA-50101,US,IA,50101,7,,,, +US-IA-50102,US,IA,50102,7,,,, +US-IA-50103,US,IA,50103,7,,,, +US-IA-50104,US,IA,50104,6,,,, +US-IA-50105,US,IA,50105,7,,,, +US-IA-50106,US,IA,50106,7,,,, +US-IA-50107,US,IA,50107,7,,,, +US-IA-50108,US,IA,50108,7,,,, +US-IA-50109,US,IA,50109,6,,,, +US-IA-50110,US,IA,50110,7,,,, +US-IA-50111,US,IA,50111,6,,,, +US-IA-50112,US,IA,50112,7,,,, +US-IA-50115,US,IA,50115,7,,,, +US-IA-50116,US,IA,50116,7,,,, +US-IA-50117,US,IA,50117,7,,,, +US-IA-50118,US,IA,50118,6,,,, +US-IA-50119,US,IA,50119,7,,,, +US-IA-50120,US,IA,50120,7,,,, +US-IA-50122,US,IA,50122,7,,,, +US-IA-50123,US,IA,50123,7,,,, +US-IA-50124,US,IA,50124,7,,,, +US-IA-50125,US,IA,50125,6,,,, +US-IA-50126,US,IA,50126,7,,,, +US-IA-50127,US,IA,50127,7,,,, +US-IA-50128,US,IA,50128,7,,,, +US-IA-50129,US,IA,50129,7,,,, +US-IA-50130,US,IA,50130,7,,,, +US-IA-50131,US,IA,50131,6,,,, +US-IA-50132,US,IA,50132,7,,,, +US-IA-50133,US,IA,50133,7,,,, +US-IA-50134,US,IA,50134,7,,,, +US-IA-50135,US,IA,50135,7,,,, +US-IA-50136,US,IA,50136,6,,,, +US-IA-50137,US,IA,50137,7,,,, +US-IA-50138,US,IA,50138,7,,,, +US-IA-50139,US,IA,50139,6,,,, +US-IA-50140,US,IA,50140,7,,,, +US-IA-50141,US,IA,50141,7,,,, +US-IA-50142,US,IA,50142,7,,,, +US-IA-50143,US,IA,50143,7,,,, +US-IA-50144,US,IA,50144,7,,,, +US-IA-50145,US,IA,50145,6,,,, +US-IA-50146,US,IA,50146,6,,,, +US-IA-50147,US,IA,50147,7,,,, +US-IA-50148,US,IA,50148,7,,,, +US-IA-50149,US,IA,50149,7,,,, +US-IA-50150,US,IA,50150,7,,,, +US-IA-50151,US,IA,50151,7,,,, +US-IA-50152,US,IA,50152,7,,,, +US-IA-50153,US,IA,50153,7,,,, +US-IA-50154,US,IA,50154,7,,,, +US-IA-50155,US,IA,50155,7,,,, +US-IA-50156,US,IA,50156,7,,,, +US-IA-50157,US,IA,50157,7,,,, +US-IA-50158,US,IA,50158,7,,,, +US-IA-50160,US,IA,50160,6,,,, +US-IA-50161,US,IA,50161,7,,,, +US-IA-50162,US,IA,50162,7,,,, +US-IA-50163,US,IA,50163,7,,,, +US-IA-50164,US,IA,50164,7,,,, +US-IA-50165,US,IA,50165,7,,,, +US-IA-50166,US,IA,50166,6,,,, +US-IA-50167,US,IA,50167,6,,,, +US-IA-50168,US,IA,50168,7,,,, +US-IA-50169,US,IA,50169,6,,,, +US-IA-50170,US,IA,50170,7,,,, +US-IA-50171,US,IA,50171,7,,,, +US-IA-50173,US,IA,50173,7,,,, +US-IA-50174,US,IA,50174,7,,,, +US-IA-50201,US,IA,50201,7,,,, +US-IA-50206,US,IA,50206,7,,,, +US-IA-50207,US,IA,50207,7,,,, +US-IA-50208,US,IA,50208,7,,,, +US-IA-50210,US,IA,50210,6,,,, +US-IA-50211,US,IA,50211,6,,,, +US-IA-50212,US,IA,50212,7,,,, +US-IA-50213,US,IA,50213,7,,,, +US-IA-50214,US,IA,50214,7,,,, +US-IA-50216,US,IA,50216,7,,,, +US-IA-50217,US,IA,50217,7,,,, +US-IA-50218,US,IA,50218,7,,,, +US-IA-50219,US,IA,50219,7,,,, +US-IA-50220,US,IA,50220,7,,,, +US-IA-50222,US,IA,50222,7,,,, +US-IA-50223,US,IA,50223,7,,,, +US-IA-50225,US,IA,50225,7,,,, +US-IA-50226,US,IA,50226,7,,,, +US-IA-50227,US,IA,50227,7,,,, +US-IA-50228,US,IA,50228,7,,,, +US-IA-50229,US,IA,50229,6,,,, +US-IA-50230,US,IA,50230,7,,,, +US-IA-50231,US,IA,50231,7,,,, +US-IA-50232,US,IA,50232,7,,,, +US-IA-50233,US,IA,50233,6,,,, +US-IA-50234,US,IA,50234,7,,,, +US-IA-50235,US,IA,50235,7,,,, +US-IA-50236,US,IA,50236,7,,,, +US-IA-50237,US,IA,50237,6,,,, +US-IA-50238,US,IA,50238,7,,,, +US-IA-50239,US,IA,50239,7,,,, +US-IA-50240,US,IA,50240,7,,,, +US-IA-50241,US,IA,50241,6,,,, +US-IA-50242,US,IA,50242,7,,,, +US-IA-50243,US,IA,50243,7,,,, +US-IA-50244,US,IA,50244,7,,,, +US-IA-50246,US,IA,50246,7,,,, +US-IA-50247,US,IA,50247,7,,,, +US-IA-50248,US,IA,50248,7,,,, +US-IA-50249,US,IA,50249,7,,,, +US-IA-50250,US,IA,50250,7,,,, +US-IA-50251,US,IA,50251,7,,,, +US-IA-50252,US,IA,50252,6,,,, +US-IA-50254,US,IA,50254,7,,,, +US-IA-50255,US,IA,50255,7,,,, +US-IA-50256,US,IA,50256,7,,,, +US-IA-50257,US,IA,50257,7,,,, +US-IA-50258,US,IA,50258,7,,,, +US-IA-50259,US,IA,50259,7,,,, +US-IA-50261,US,IA,50261,6,,,, +US-IA-50262,US,IA,50262,7,,,, +US-IA-50263,US,IA,50263,6,,,, +US-IA-50264,US,IA,50264,7,,,, +US-IA-50265,US,IA,50265,6,,,, +US-IA-50266,US,IA,50266,6,,,, +US-IA-50268,US,IA,50268,7,,,, +US-IA-50269,US,IA,50269,7,,,, +US-IA-50271,US,IA,50271,7,,,, +US-IA-50272,US,IA,50272,7,,,, +US-IA-50273,US,IA,50273,7,,,, +US-IA-50274,US,IA,50274,7,,,, +US-IA-50275,US,IA,50275,6,,,, +US-IA-50276,US,IA,50276,6,,,, +US-IA-50277,US,IA,50277,7,,,, +US-IA-50278,US,IA,50278,7,,,, +US-IA-50301,US,IA,50301,6,,,, +US-IA-50302,US,IA,50302,6,,,, +US-IA-50303,US,IA,50303,6,,,, +US-IA-50304,US,IA,50304,6,,,, +US-IA-50305,US,IA,50305,6,,,, +US-IA-50306,US,IA,50306,6,,,, +US-IA-50307,US,IA,50307,6,,,, +US-IA-50308,US,IA,50308,6,,,, +US-IA-50309,US,IA,50309,6,,,, +US-IA-50310,US,IA,50310,6,,,, +US-IA-50311,US,IA,50311,6,,,, +US-IA-50312,US,IA,50312,6,,,, +US-IA-50313,US,IA,50313,6,,,, +US-IA-50314,US,IA,50314,6,,,, +US-IA-50315,US,IA,50315,6,,,, +US-IA-50316,US,IA,50316,6,,,, +US-IA-50317,US,IA,50317,6,,,, +US-IA-50318,US,IA,50318,6,,,, +US-IA-50319,US,IA,50319,6,,,, +US-IA-50320,US,IA,50320,6,,,, +US-IA-50321,US,IA,50321,6,,,, +US-IA-50322,US,IA,50322,6,,,, +US-IA-50323,US,IA,50323,6,,,, +US-IA-50324,US,IA,50324,6,,,, +US-IA-50325,US,IA,50325,6,,,, +US-IA-50327,US,IA,50327,6,,,, +US-IA-50328,US,IA,50328,6,,,, +US-IA-50329,US,IA,50329,6,,,, +US-IA-50330,US,IA,50330,6,,,, +US-IA-50331,US,IA,50331,6,,,, +US-IA-50332,US,IA,50332,6,,,, +US-IA-50333,US,IA,50333,6,,,, +US-IA-50334,US,IA,50334,6,,,, +US-IA-50335,US,IA,50335,6,,,, +US-IA-50336,US,IA,50336,6,,,, +US-IA-50339,US,IA,50339,6,,,, +US-IA-50340,US,IA,50340,6,,,, +US-IA-50359,US,IA,50359,6,,,, +US-IA-50360,US,IA,50360,6,,,, +US-IA-50361,US,IA,50361,6,,,, +US-IA-50362,US,IA,50362,6,,,, +US-IA-50363,US,IA,50363,6,,,, +US-IA-50364,US,IA,50364,6,,,, +US-IA-50367,US,IA,50367,6,,,, +US-IA-50368,US,IA,50368,6,,,, +US-IA-50369,US,IA,50369,6,,,, +US-IA-50380,US,IA,50380,6,,,, +US-IA-50381,US,IA,50381,6,,,, +US-IA-50391,US,IA,50391,6,,,, +US-IA-50392,US,IA,50392,6,,,, +US-IA-50393,US,IA,50393,6,,,, +US-IA-50394,US,IA,50394,6,,,, +US-IA-50395,US,IA,50395,6,,,, +US-IA-50396,US,IA,50396,6,,,, +US-IA-50398,US,IA,50398,6,,,, +US-IA-50401,US,IA,50401,7,,,, +US-IA-50402,US,IA,50402,7,,,, +US-IA-50420,US,IA,50420,7,,,, +US-IA-50421,US,IA,50421,7,,,, +US-IA-50423,US,IA,50423,7,,,, +US-IA-50424,US,IA,50424,7,,,, +US-IA-50426,US,IA,50426,7,,,, +US-IA-50427,US,IA,50427,7,,,, +US-IA-50428,US,IA,50428,7,,,, +US-IA-50430,US,IA,50430,7,,,, +US-IA-50431,US,IA,50431,7,,,, +US-IA-50432,US,IA,50432,7,,,, +US-IA-50433,US,IA,50433,7,,,, +US-IA-50434,US,IA,50434,7,,,, +US-IA-50435,US,IA,50435,7,,,, +US-IA-50436,US,IA,50436,7,,,, +US-IA-50438,US,IA,50438,7,,,, +US-IA-50439,US,IA,50439,7,,,, +US-IA-50440,US,IA,50440,7,,,, +US-IA-50441,US,IA,50441,7,,,, +US-IA-50444,US,IA,50444,7,,,, +US-IA-50446,US,IA,50446,7,,,, +US-IA-50447,US,IA,50447,7,,,, +US-IA-50448,US,IA,50448,7,,,, +US-IA-50449,US,IA,50449,7,,,, +US-IA-50450,US,IA,50450,7,,,, +US-IA-50451,US,IA,50451,7,,,, +US-IA-50452,US,IA,50452,7,,,, +US-IA-50453,US,IA,50453,7,,,, +US-IA-50454,US,IA,50454,7,,,, +US-IA-50455,US,IA,50455,7,,,, +US-IA-50456,US,IA,50456,7,,,, +US-IA-50457,US,IA,50457,7,,,, +US-IA-50458,US,IA,50458,7,,,, +US-IA-50459,US,IA,50459,7,,,, +US-IA-50460,US,IA,50460,7,,,, +US-IA-50461,US,IA,50461,7,,,, +US-IA-50464,US,IA,50464,7,,,, +US-IA-50465,US,IA,50465,7,,,, +US-IA-50466,US,IA,50466,7,,,, +US-IA-50467,US,IA,50467,7,,,, +US-IA-50468,US,IA,50468,7,,,, +US-IA-50469,US,IA,50469,7,,,, +US-IA-50470,US,IA,50470,7,,,, +US-IA-50471,US,IA,50471,7,,,, +US-IA-50472,US,IA,50472,7,,,, +US-IA-50473,US,IA,50473,7,,,, +US-IA-50475,US,IA,50475,7,,,, +US-IA-50476,US,IA,50476,7,,,, +US-IA-50477,US,IA,50477,7,,,, +US-IA-50478,US,IA,50478,7,,,, +US-IA-50479,US,IA,50479,7,,,, +US-IA-50480,US,IA,50480,7,,,, +US-IA-50481,US,IA,50481,7,,,, +US-IA-50482,US,IA,50482,7,,,, +US-IA-50483,US,IA,50483,7,,,, +US-IA-50484,US,IA,50484,7,,,, +US-IA-50501,US,IA,50501,7,,,, +US-IA-50510,US,IA,50510,7,,,, +US-IA-50511,US,IA,50511,7,,,, +US-IA-50514,US,IA,50514,7,,,, +US-IA-50515,US,IA,50515,7,,,, +US-IA-50516,US,IA,50516,7,,,, +US-IA-50517,US,IA,50517,7,,,, +US-IA-50518,US,IA,50518,7,,,, +US-IA-50519,US,IA,50519,7,,,, +US-IA-50520,US,IA,50520,7,,,, +US-IA-50521,US,IA,50521,7,,,, +US-IA-50522,US,IA,50522,7,,,, +US-IA-50523,US,IA,50523,7,,,, +US-IA-50524,US,IA,50524,7,,,, +US-IA-50525,US,IA,50525,7,,,, +US-IA-50526,US,IA,50526,7,,,, +US-IA-50527,US,IA,50527,7,,,, +US-IA-50528,US,IA,50528,7,,,, +US-IA-50529,US,IA,50529,7,,,, +US-IA-50530,US,IA,50530,7,,,, +US-IA-50531,US,IA,50531,7,,,, +US-IA-50532,US,IA,50532,7,,,, +US-IA-50533,US,IA,50533,7,,,, +US-IA-50535,US,IA,50535,7,,,, +US-IA-50536,US,IA,50536,7,,,, +US-IA-50538,US,IA,50538,7,,,, +US-IA-50539,US,IA,50539,7,,,, +US-IA-50540,US,IA,50540,7,,,, +US-IA-50541,US,IA,50541,7,,,, +US-IA-50542,US,IA,50542,7,,,, +US-IA-50543,US,IA,50543,7,,,, +US-IA-50544,US,IA,50544,7,,,, +US-IA-50545,US,IA,50545,7,,,, +US-IA-50546,US,IA,50546,7,,,, +US-IA-50548,US,IA,50548,7,,,, +US-IA-50551,US,IA,50551,7,,,, +US-IA-50552,US,IA,50552,7,,,, +US-IA-50554,US,IA,50554,7,,,, +US-IA-50556,US,IA,50556,7,,,, +US-IA-50557,US,IA,50557,7,,,, +US-IA-50558,US,IA,50558,7,,,, +US-IA-50559,US,IA,50559,7,,,, +US-IA-50560,US,IA,50560,7,,,, +US-IA-50561,US,IA,50561,7,,,, +US-IA-50562,US,IA,50562,7,,,, +US-IA-50563,US,IA,50563,7,,,, +US-IA-50565,US,IA,50565,7,,,, +US-IA-50566,US,IA,50566,7,,,, +US-IA-50567,US,IA,50567,7,,,, +US-IA-50568,US,IA,50568,7,,,, +US-IA-50569,US,IA,50569,7,,,, +US-IA-50570,US,IA,50570,7,,,, +US-IA-50571,US,IA,50571,7,,,, +US-IA-50573,US,IA,50573,7,,,, +US-IA-50574,US,IA,50574,7,,,, +US-IA-50575,US,IA,50575,7,,,, +US-IA-50576,US,IA,50576,7,,,, +US-IA-50577,US,IA,50577,7,,,, +US-IA-50578,US,IA,50578,7,,,, +US-IA-50579,US,IA,50579,7,,,, +US-IA-50581,US,IA,50581,7,,,, +US-IA-50582,US,IA,50582,7,,,, +US-IA-50583,US,IA,50583,7,,,, +US-IA-50585,US,IA,50585,7,,,, +US-IA-50586,US,IA,50586,7,,,, +US-IA-50588,US,IA,50588,7,,,, +US-IA-50590,US,IA,50590,7,,,, +US-IA-50591,US,IA,50591,7,,,, +US-IA-50592,US,IA,50592,7,,,, +US-IA-50593,US,IA,50593,7,,,, +US-IA-50594,US,IA,50594,7,,,, +US-IA-50595,US,IA,50595,7,,,, +US-IA-50597,US,IA,50597,7,,,, +US-IA-50598,US,IA,50598,7,,,, +US-IA-50599,US,IA,50599,7,,,, +US-IA-50601,US,IA,50601,7,,,, +US-IA-50602,US,IA,50602,7,,,, +US-IA-50603,US,IA,50603,7,,,, +US-IA-50604,US,IA,50604,7,,,, +US-IA-50605,US,IA,50605,7,,,, +US-IA-50606,US,IA,50606,7,,,, +US-IA-50607,US,IA,50607,7,,,, +US-IA-50608,US,IA,50608,7,,,, +US-IA-50609,US,IA,50609,7,,,, +US-IA-50611,US,IA,50611,7,,,, +US-IA-50612,US,IA,50612,7,,,, +US-IA-50613,US,IA,50613,7,,,, +US-IA-50614,US,IA,50614,7,,,, +US-IA-50616,US,IA,50616,7,,,, +US-IA-50619,US,IA,50619,7,,,, +US-IA-50620,US,IA,50620,7,,,, +US-IA-50621,US,IA,50621,7,,,, +US-IA-50622,US,IA,50622,7,,,, +US-IA-50623,US,IA,50623,7,,,, +US-IA-50624,US,IA,50624,7,,,, +US-IA-50625,US,IA,50625,7,,,, +US-IA-50626,US,IA,50626,7,,,, +US-IA-50627,US,IA,50627,7,,,, +US-IA-50628,US,IA,50628,7,,,, +US-IA-50629,US,IA,50629,7,,,, +US-IA-50630,US,IA,50630,7,,,, +US-IA-50631,US,IA,50631,7,,,, +US-IA-50632,US,IA,50632,7,,,, +US-IA-50633,US,IA,50633,7,,,, +US-IA-50634,US,IA,50634,7,,,, +US-IA-50635,US,IA,50635,7,,,, +US-IA-50636,US,IA,50636,7,,,, +US-IA-50638,US,IA,50638,7,,,, +US-IA-50641,US,IA,50641,7,,,, +US-IA-50642,US,IA,50642,7,,,, +US-IA-50643,US,IA,50643,7,,,, +US-IA-50644,US,IA,50644,7,,,, +US-IA-50645,US,IA,50645,7,,,, +US-IA-50647,US,IA,50647,7,,,, +US-IA-50648,US,IA,50648,7,,,, +US-IA-50649,US,IA,50649,7,,,, +US-IA-50650,US,IA,50650,7,,,, +US-IA-50651,US,IA,50651,7,,,, +US-IA-50652,US,IA,50652,7,,,, +US-IA-50653,US,IA,50653,7,,,, +US-IA-50654,US,IA,50654,7,,,, +US-IA-50655,US,IA,50655,7,,,, +US-IA-50657,US,IA,50657,7,,,, +US-IA-50658,US,IA,50658,7,,,, +US-IA-50659,US,IA,50659,7,,,, +US-IA-50660,US,IA,50660,7,,,, +US-IA-50661,US,IA,50661,7,,,, +US-IA-50662,US,IA,50662,7,,,, +US-IA-50664,US,IA,50664,7,,,, +US-IA-50665,US,IA,50665,7,,,, +US-IA-50666,US,IA,50666,7,,,, +US-IA-50667,US,IA,50667,7,,,, +US-IA-50668,US,IA,50668,7,,,, +US-IA-50669,US,IA,50669,6,,,, +US-IA-50670,US,IA,50670,7,,,, +US-IA-50671,US,IA,50671,7,,,, +US-IA-50672,US,IA,50672,7,,,, +US-IA-50673,US,IA,50673,7,,,, +US-IA-50674,US,IA,50674,7,,,, +US-IA-50675,US,IA,50675,7,,,, +US-IA-50676,US,IA,50676,7,,,, +US-IA-50677,US,IA,50677,7,,,, +US-IA-50680,US,IA,50680,7,,,, +US-IA-50681,US,IA,50681,7,,,, +US-IA-50682,US,IA,50682,7,,,, +US-IA-50701,US,IA,50701,7,,,, +US-IA-50702,US,IA,50702,7,,,, +US-IA-50703,US,IA,50703,7,,,, +US-IA-50704,US,IA,50704,7,,,, +US-IA-50707,US,IA,50707,7,,,, +US-IA-50801,US,IA,50801,7,,,, +US-IA-50830,US,IA,50830,7,,,, +US-IA-50831,US,IA,50831,7,,,, +US-IA-50833,US,IA,50833,7,,,, +US-IA-50835,US,IA,50835,7,,,, +US-IA-50836,US,IA,50836,7,,,, +US-IA-50837,US,IA,50837,7,,,, +US-IA-50839,US,IA,50839,7,,,, +US-IA-50840,US,IA,50840,7,,,, +US-IA-50841,US,IA,50841,7,,,, +US-IA-50842,US,IA,50842,7,,,, +US-IA-50843,US,IA,50843,7,,,, +US-IA-50845,US,IA,50845,7,,,, +US-IA-50846,US,IA,50846,7,,,, +US-IA-50847,US,IA,50847,7,,,, +US-IA-50848,US,IA,50848,7,,,, +US-IA-50849,US,IA,50849,7,,,, +US-IA-50851,US,IA,50851,7,,,, +US-IA-50853,US,IA,50853,7,,,, +US-IA-50854,US,IA,50854,7,,,, +US-IA-50857,US,IA,50857,7,,,, +US-IA-50858,US,IA,50858,7,,,, +US-IA-50859,US,IA,50859,7,,,, +US-IA-50860,US,IA,50860,7,,,, +US-IA-50861,US,IA,50861,7,,,, +US-IA-50862,US,IA,50862,7,,,, +US-IA-50863,US,IA,50863,7,,,, +US-IA-50864,US,IA,50864,7,,,, +US-IA-50936,US,IA,50936,6,,,, +US-IA-50940,US,IA,50940,6,,,, +US-IA-50947,US,IA,50947,6,,,, +US-IA-50950,US,IA,50950,6,,,, +US-IA-50980,US,IA,50980,6,,,, +US-IA-50981,US,IA,50981,6,,,, +US-IA-50982,US,IA,50982,6,,,, +US-IA-50983,US,IA,50983,6,,,, +US-IA-51001,US,IA,51001,7,,,, +US-IA-51002,US,IA,51002,7,,,, +US-IA-51003,US,IA,51003,7,,,, +US-IA-51004,US,IA,51004,7,,,, +US-IA-51005,US,IA,51005,7,,,, +US-IA-51006,US,IA,51006,7,,,, +US-IA-51007,US,IA,51007,7,,,, +US-IA-51008,US,IA,51008,7,,,, +US-IA-51009,US,IA,51009,7,,,, +US-IA-51010,US,IA,51010,7,,,, +US-IA-51011,US,IA,51011,7,,,, +US-IA-51012,US,IA,51012,7,,,, +US-IA-51014,US,IA,51014,7,,,, +US-IA-51015,US,IA,51015,7,,,, +US-IA-51016,US,IA,51016,7,,,, +US-IA-51018,US,IA,51018,7,,,, +US-IA-51019,US,IA,51019,7,,,, +US-IA-51020,US,IA,51020,7,,,, +US-IA-51022,US,IA,51022,7,,,, +US-IA-51023,US,IA,51023,7,,,, +US-IA-51024,US,IA,51024,7,,,, +US-IA-51025,US,IA,51025,7,,,, +US-IA-51026,US,IA,51026,7,,,, +US-IA-51027,US,IA,51027,7,,,, +US-IA-51028,US,IA,51028,7,,,, +US-IA-51029,US,IA,51029,7,,,, +US-IA-51030,US,IA,51030,7,,,, +US-IA-51031,US,IA,51031,7,,,, +US-IA-51033,US,IA,51033,7,,,, +US-IA-51034,US,IA,51034,7,,,, +US-IA-51035,US,IA,51035,7,,,, +US-IA-51036,US,IA,51036,7,,,, +US-IA-51037,US,IA,51037,7,,,, +US-IA-51038,US,IA,51038,7,,,, +US-IA-51039,US,IA,51039,7,,,, +US-IA-51040,US,IA,51040,7,,,, +US-IA-51041,US,IA,51041,7,,,, +US-IA-51044,US,IA,51044,7,,,, +US-IA-51045,US,IA,51045,7,,,, +US-IA-51046,US,IA,51046,7,,,, +US-IA-51047,US,IA,51047,7,,,, +US-IA-51048,US,IA,51048,7,,,, +US-IA-51049,US,IA,51049,7,,,, +US-IA-51050,US,IA,51050,7,,,, +US-IA-51051,US,IA,51051,7,,,, +US-IA-51052,US,IA,51052,7,,,, +US-IA-51053,US,IA,51053,7,,,, +US-IA-51054,US,IA,51054,7,,,, +US-IA-51055,US,IA,51055,7,,,, +US-IA-51056,US,IA,51056,7,,,, +US-IA-51058,US,IA,51058,7,,,, +US-IA-51060,US,IA,51060,7,,,, +US-IA-51061,US,IA,51061,7,,,, +US-IA-51062,US,IA,51062,7,,,, +US-IA-51063,US,IA,51063,7,,,, +US-IA-51101,US,IA,51101,7,,,, +US-IA-51102,US,IA,51102,7,,,, +US-IA-51103,US,IA,51103,7,,,, +US-IA-51104,US,IA,51104,7,,,, +US-IA-51105,US,IA,51105,7,,,, +US-IA-51106,US,IA,51106,7,,,, +US-IA-51108,US,IA,51108,7,,,, +US-IA-51109,US,IA,51109,7,,,, +US-IA-51111,US,IA,51111,7,,,, +US-IA-51201,US,IA,51201,7,,,, +US-IA-51230,US,IA,51230,7,,,, +US-IA-51231,US,IA,51231,7,,,, +US-IA-51232,US,IA,51232,6,,,, +US-IA-51234,US,IA,51234,7,,,, +US-IA-51235,US,IA,51235,7,,,, +US-IA-51237,US,IA,51237,7,,,, +US-IA-51238,US,IA,51238,7,,,, +US-IA-51239,US,IA,51239,7,,,, +US-IA-51240,US,IA,51240,7,,,, +US-IA-51241,US,IA,51241,7,,,, +US-IA-51242,US,IA,51242,7,,,, +US-IA-51243,US,IA,51243,7,,,, +US-IA-51244,US,IA,51244,7,,,, +US-IA-51245,US,IA,51245,7,,,, +US-IA-51246,US,IA,51246,7,,,, +US-IA-51247,US,IA,51247,7,,,, +US-IA-51248,US,IA,51248,7,,,, +US-IA-51249,US,IA,51249,7,,,, +US-IA-51250,US,IA,51250,7,,,, +US-IA-51301,US,IA,51301,7,,,, +US-IA-51331,US,IA,51331,7,,,, +US-IA-51333,US,IA,51333,7,,,, +US-IA-51334,US,IA,51334,7,,,, +US-IA-51338,US,IA,51338,7,,,, +US-IA-51340,US,IA,51340,7,,,, +US-IA-51341,US,IA,51341,7,,,, +US-IA-51342,US,IA,51342,7,,,, +US-IA-51343,US,IA,51343,7,,,, +US-IA-51345,US,IA,51345,6,,,, +US-IA-51346,US,IA,51346,7,,,, +US-IA-51347,US,IA,51347,7,,,, +US-IA-51350,US,IA,51350,6,,,, +US-IA-51351,US,IA,51351,7,,,, +US-IA-51354,US,IA,51354,6,,,, +US-IA-51355,US,IA,51355,7,,,, +US-IA-51357,US,IA,51357,7,,,, +US-IA-51358,US,IA,51358,7,,,, +US-IA-51360,US,IA,51360,7,,,, +US-IA-51363,US,IA,51363,7,,,, +US-IA-51364,US,IA,51364,7,,,, +US-IA-51365,US,IA,51365,7,,,, +US-IA-51366,US,IA,51366,7,,,, +US-IA-51401,US,IA,51401,7,,,, +US-IA-51430,US,IA,51430,7,,,, +US-IA-51431,US,IA,51431,7,,,, +US-IA-51432,US,IA,51432,7,,,, +US-IA-51433,US,IA,51433,7,,,, +US-IA-51436,US,IA,51436,7,,,, +US-IA-51439,US,IA,51439,7,,,, +US-IA-51440,US,IA,51440,7,,,, +US-IA-51441,US,IA,51441,7,,,, +US-IA-51442,US,IA,51442,7,,,, +US-IA-51443,US,IA,51443,7,,,, +US-IA-51444,US,IA,51444,7,,,, +US-IA-51445,US,IA,51445,7,,,, +US-IA-51446,US,IA,51446,7,,,, +US-IA-51447,US,IA,51447,7,,,, +US-IA-51448,US,IA,51448,7,,,, +US-IA-51449,US,IA,51449,7,,,, +US-IA-51450,US,IA,51450,7,,,, +US-IA-51451,US,IA,51451,7,,,, +US-IA-51452,US,IA,51452,7,,,, +US-IA-51453,US,IA,51453,7,,,, +US-IA-51454,US,IA,51454,7,,,, +US-IA-51455,US,IA,51455,7,,,, +US-IA-51458,US,IA,51458,7,,,, +US-IA-51459,US,IA,51459,7,,,, +US-IA-51460,US,IA,51460,7,,,, +US-IA-51461,US,IA,51461,7,,,, +US-IA-51462,US,IA,51462,7,,,, +US-IA-51463,US,IA,51463,7,,,, +US-IA-51465,US,IA,51465,7,,,, +US-IA-51466,US,IA,51466,7,,,, +US-IA-51467,US,IA,51467,7,,,, +US-IA-51501,US,IA,51501,7,,,, +US-IA-51502,US,IA,51502,7,,,, +US-IA-51503,US,IA,51503,7,,,, +US-IA-51510,US,IA,51510,7,,,, +US-IA-51520,US,IA,51520,7,,,, +US-IA-51521,US,IA,51521,7,,,, +US-IA-51523,US,IA,51523,7,,,, +US-IA-51525,US,IA,51525,7,,,, +US-IA-51526,US,IA,51526,7,,,, +US-IA-51527,US,IA,51527,7,,,, +US-IA-51528,US,IA,51528,7,,,, +US-IA-51529,US,IA,51529,7,,,, +US-IA-51530,US,IA,51530,7,,,, +US-IA-51531,US,IA,51531,7,,,, +US-IA-51532,US,IA,51532,7,,,, +US-IA-51533,US,IA,51533,7,,,, +US-IA-51534,US,IA,51534,7,,,, +US-IA-51535,US,IA,51535,7,,,, +US-IA-51536,US,IA,51536,7,,,, +US-IA-51537,US,IA,51537,7,,,, +US-IA-51540,US,IA,51540,7,,,, +US-IA-51541,US,IA,51541,7,,,, +US-IA-51542,US,IA,51542,7,,,, +US-IA-51543,US,IA,51543,7,,,, +US-IA-51544,US,IA,51544,7,,,, +US-IA-51545,US,IA,51545,7,,,, +US-IA-51546,US,IA,51546,7,,,, +US-IA-51548,US,IA,51548,7,,,, +US-IA-51549,US,IA,51549,7,,,, +US-IA-51550,US,IA,51550,7,,,, +US-IA-51551,US,IA,51551,7,,,, +US-IA-51552,US,IA,51552,7,,,, +US-IA-51553,US,IA,51553,7,,,, +US-IA-51554,US,IA,51554,7,,,, +US-IA-51555,US,IA,51555,7,,,, +US-IA-51556,US,IA,51556,7,,,, +US-IA-51557,US,IA,51557,7,,,, +US-IA-51558,US,IA,51558,7,,,, +US-IA-51559,US,IA,51559,7,,,, +US-IA-51560,US,IA,51560,7,,,, +US-IA-51561,US,IA,51561,7,,,, +US-IA-51562,US,IA,51562,7,,,, +US-IA-51563,US,IA,51563,7,,,, +US-IA-51564,US,IA,51564,7,,,, +US-IA-51565,US,IA,51565,7,,,, +US-IA-51566,US,IA,51566,7,,,, +US-IA-51570,US,IA,51570,7,,,, +US-IA-51571,US,IA,51571,7,,,, +US-IA-51572,US,IA,51572,7,,,, +US-IA-51573,US,IA,51573,7,,,, +US-IA-51575,US,IA,51575,7,,,, +US-IA-51576,US,IA,51576,7,,,, +US-IA-51577,US,IA,51577,7,,,, +US-IA-51578,US,IA,51578,7,,,, +US-IA-51579,US,IA,51579,7,,,, +US-IA-51591,US,IA,51591,7,,,, +US-IA-51593,US,IA,51593,7,,,, +US-IA-51601,US,IA,51601,7,,,, +US-IA-51603,US,IA,51603,7,,,, +US-IA-51630,US,IA,51630,7,,,, +US-IA-51631,US,IA,51631,7,,,, +US-IA-51632,US,IA,51632,7,,,, +US-IA-51636,US,IA,51636,7,,,, +US-IA-51637,US,IA,51637,7,,,, +US-IA-51638,US,IA,51638,7,,,, +US-IA-51639,US,IA,51639,7,,,, +US-IA-51640,US,IA,51640,7,,,, +US-IA-51645,US,IA,51645,7,,,, +US-IA-51646,US,IA,51646,7,,,, +US-IA-51647,US,IA,51647,7,,,, +US-IA-51648,US,IA,51648,7,,,, +US-IA-51649,US,IA,51649,7,,,, +US-IA-51650,US,IA,51650,7,,,, +US-IA-51651,US,IA,51651,7,,,, +US-IA-51652,US,IA,51652,7,,,, +US-IA-51653,US,IA,51653,7,,,, +US-IA-51654,US,IA,51654,7,,,, +US-IA-51656,US,IA,51656,7,,,, +US-IA-52001,US,IA,52001,7,,,, +US-IA-52002,US,IA,52002,7,,,, +US-IA-52003,US,IA,52003,7,,,, +US-IA-52004,US,IA,52004,7,,,, +US-IA-52030,US,IA,52030,7,,,, +US-IA-52031,US,IA,52031,7,,,, +US-IA-52032,US,IA,52032,7,,,, +US-IA-52033,US,IA,52033,7,,,, +US-IA-52035,US,IA,52035,7,,,, +US-IA-52036,US,IA,52036,7,,,, +US-IA-52037,US,IA,52037,7,,,, +US-IA-52038,US,IA,52038,7,,,, +US-IA-52039,US,IA,52039,7,,,, +US-IA-52040,US,IA,52040,7,,,, +US-IA-52041,US,IA,52041,7,,,, +US-IA-52042,US,IA,52042,7,,,, +US-IA-52043,US,IA,52043,7,,,, +US-IA-52044,US,IA,52044,7,,,, +US-IA-52045,US,IA,52045,7,,,, +US-IA-52046,US,IA,52046,7,,,, +US-IA-52047,US,IA,52047,7,,,, +US-IA-52048,US,IA,52048,7,,,, +US-IA-52049,US,IA,52049,7,,,, +US-IA-52050,US,IA,52050,7,,,, +US-IA-52052,US,IA,52052,7,,,, +US-IA-52053,US,IA,52053,7,,,, +US-IA-52054,US,IA,52054,7,,,, +US-IA-52056,US,IA,52056,7,,,, +US-IA-52057,US,IA,52057,7,,,, +US-IA-52060,US,IA,52060,7,,,, +US-IA-52064,US,IA,52064,7,,,, +US-IA-52065,US,IA,52065,7,,,, +US-IA-52066,US,IA,52066,7,,,, +US-IA-52068,US,IA,52068,7,,,, +US-IA-52069,US,IA,52069,7,,,, +US-IA-52070,US,IA,52070,7,,,, +US-IA-52071,US,IA,52071,7,,,, +US-IA-52072,US,IA,52072,7,,,, +US-IA-52073,US,IA,52073,7,,,, +US-IA-52074,US,IA,52074,7,,,, +US-IA-52075,US,IA,52075,7,,,, +US-IA-52076,US,IA,52076,7,,,, +US-IA-52077,US,IA,52077,7,,,, +US-IA-52078,US,IA,52078,7,,,, +US-IA-52079,US,IA,52079,7,,,, +US-IA-52099,US,IA,52099,7,,,, +US-IA-52101,US,IA,52101,7,,,, +US-IA-52132,US,IA,52132,7,,,, +US-IA-52133,US,IA,52133,7,,,, +US-IA-52134,US,IA,52134,7,,,, +US-IA-52135,US,IA,52135,7,,,, +US-IA-52136,US,IA,52136,7,,,, +US-IA-52140,US,IA,52140,7,,,, +US-IA-52141,US,IA,52141,7,,,, +US-IA-52142,US,IA,52142,7,,,, +US-IA-52144,US,IA,52144,7,,,, +US-IA-52146,US,IA,52146,7,,,, +US-IA-52147,US,IA,52147,7,,,, +US-IA-52149,US,IA,52149,7,,,, +US-IA-52151,US,IA,52151,7,,,, +US-IA-52154,US,IA,52154,7,,,, +US-IA-52155,US,IA,52155,7,,,, +US-IA-52156,US,IA,52156,7,,,, +US-IA-52157,US,IA,52157,7,,,, +US-IA-52158,US,IA,52158,7,,,, +US-IA-52159,US,IA,52159,7,,,, +US-IA-52160,US,IA,52160,7,,,, +US-IA-52161,US,IA,52161,7,,,, +US-IA-52162,US,IA,52162,7,,,, +US-IA-52163,US,IA,52163,7,,,, +US-IA-52164,US,IA,52164,7,,,, +US-IA-52165,US,IA,52165,7,,,, +US-IA-52166,US,IA,52166,7,,,, +US-IA-52168,US,IA,52168,7,,,, +US-IA-52169,US,IA,52169,7,,,, +US-IA-52170,US,IA,52170,7,,,, +US-IA-52171,US,IA,52171,7,,,, +US-IA-52172,US,IA,52172,7,,,, +US-IA-52175,US,IA,52175,7,,,, +US-IA-52201,US,IA,52201,7,,,, +US-IA-52202,US,IA,52202,7,,,, +US-IA-52203,US,IA,52203,7,,,, +US-IA-52204,US,IA,52204,7,,,, +US-IA-52205,US,IA,52205,7,,,, +US-IA-52206,US,IA,52206,7,,,, +US-IA-52207,US,IA,52207,7,,,, +US-IA-52208,US,IA,52208,7,,,, +US-IA-52209,US,IA,52209,7,,,, +US-IA-52210,US,IA,52210,7,,,, +US-IA-52211,US,IA,52211,7,,,, +US-IA-52212,US,IA,52212,7,,,, +US-IA-52213,US,IA,52213,7,,,, +US-IA-52214,US,IA,52214,7,,,, +US-IA-52215,US,IA,52215,7,,,, +US-IA-52216,US,IA,52216,7,,,, +US-IA-52217,US,IA,52217,7,,,, +US-IA-52218,US,IA,52218,7,,,, +US-IA-52219,US,IA,52219,7,,,, +US-IA-52220,US,IA,52220,7,,,, +US-IA-52221,US,IA,52221,7,,,, +US-IA-52222,US,IA,52222,7,,,, +US-IA-52223,US,IA,52223,7,,,, +US-IA-52224,US,IA,52224,7,,,, +US-IA-52225,US,IA,52225,7,,,, +US-IA-52227,US,IA,52227,7,,,, +US-IA-52228,US,IA,52228,7,,,, +US-IA-52229,US,IA,52229,7,,,, +US-IA-52231,US,IA,52231,6,,,, +US-IA-52232,US,IA,52232,7,,,, +US-IA-52233,US,IA,52233,7,,,, +US-IA-52235,US,IA,52235,6,,,, +US-IA-52236,US,IA,52236,7,,,, +US-IA-52237,US,IA,52237,7,,,, +US-IA-52240,US,IA,52240,6,,,, +US-IA-52241,US,IA,52241,6,,,, +US-IA-52242,US,IA,52242,6,,,, +US-IA-52243,US,IA,52243,6,,,, +US-IA-52244,US,IA,52244,6,,,, +US-IA-52245,US,IA,52245,6,,,, +US-IA-52246,US,IA,52246,6,,,, +US-IA-52247,US,IA,52247,7,,,, +US-IA-52248,US,IA,52248,7,,,, +US-IA-52249,US,IA,52249,7,,,, +US-IA-52251,US,IA,52251,7,,,, +US-IA-52252,US,IA,52252,7,,,, +US-IA-52253,US,IA,52253,7,,,, +US-IA-52254,US,IA,52254,7,,,, +US-IA-52255,US,IA,52255,7,,,, +US-IA-52257,US,IA,52257,7,,,, +US-IA-52301,US,IA,52301,7,,,, +US-IA-52302,US,IA,52302,7,,,, +US-IA-52305,US,IA,52305,7,,,, +US-IA-52306,US,IA,52306,7,,,, +US-IA-52307,US,IA,52307,7,,,, +US-IA-52308,US,IA,52308,7,,,, +US-IA-52309,US,IA,52309,7,,,, +US-IA-52310,US,IA,52310,7,,,, +US-IA-52312,US,IA,52312,7,,,, +US-IA-52313,US,IA,52313,7,,,, +US-IA-52314,US,IA,52314,7,,,, +US-IA-52315,US,IA,52315,7,,,, +US-IA-52316,US,IA,52316,7,,,, +US-IA-52317,US,IA,52317,6,,,, +US-IA-52318,US,IA,52318,7,,,, +US-IA-52320,US,IA,52320,7,,,, +US-IA-52321,US,IA,52321,7,,,, +US-IA-52322,US,IA,52322,6,,,, +US-IA-52323,US,IA,52323,7,,,, +US-IA-52324,US,IA,52324,7,,,, +US-IA-52325,US,IA,52325,7,,,, +US-IA-52326,US,IA,52326,7,,,, +US-IA-52327,US,IA,52327,7,,,, +US-IA-52328,US,IA,52328,7,,,, +US-IA-52329,US,IA,52329,7,,,, +US-IA-52330,US,IA,52330,7,,,, +US-IA-52332,US,IA,52332,7,,,, +US-IA-52333,US,IA,52333,6,,,, +US-IA-52334,US,IA,52334,7,,,, +US-IA-52335,US,IA,52335,6,,,, +US-IA-52336,US,IA,52336,7,,,, +US-IA-52337,US,IA,52337,7,,,, +US-IA-52338,US,IA,52338,6,,,, +US-IA-52339,US,IA,52339,7,,,, +US-IA-52340,US,IA,52340,6,,,, +US-IA-52341,US,IA,52341,7,,,, +US-IA-52342,US,IA,52342,7,,,, +US-IA-52344,US,IA,52344,7,,,, +US-IA-52345,US,IA,52345,7,,,, +US-IA-52346,US,IA,52346,7,,,, +US-IA-52347,US,IA,52347,7,,,, +US-IA-52348,US,IA,52348,7,,,, +US-IA-52349,US,IA,52349,7,,,, +US-IA-52351,US,IA,52351,6,,,, +US-IA-52352,US,IA,52352,7,,,, +US-IA-52353,US,IA,52353,7,,,, +US-IA-52354,US,IA,52354,7,,,, +US-IA-52355,US,IA,52355,6,,,, +US-IA-52356,US,IA,52356,7,,,, +US-IA-52358,US,IA,52358,7,,,, +US-IA-52359,US,IA,52359,7,,,, +US-IA-52361,US,IA,52361,7,,,, +US-IA-52362,US,IA,52362,7,,,, +US-IA-52401,US,IA,52401,7,,,, +US-IA-52402,US,IA,52402,7,,,, +US-IA-52403,US,IA,52403,7,,,, +US-IA-52404,US,IA,52404,7,,,, +US-IA-52405,US,IA,52405,7,,,, +US-IA-52406,US,IA,52406,7,,,, +US-IA-52407,US,IA,52407,7,,,, +US-IA-52408,US,IA,52408,7,,,, +US-IA-52409,US,IA,52409,7,,,, +US-IA-52410,US,IA,52410,7,,,, +US-IA-52411,US,IA,52411,7,,,, +US-IA-52497,US,IA,52497,7,,,, +US-IA-52498,US,IA,52498,7,,,, +US-IA-52499,US,IA,52499,7,,,, +US-IA-52501,US,IA,52501,7,,,, +US-IA-52530,US,IA,52530,7,,,, +US-IA-52531,US,IA,52531,7,,,, +US-IA-52533,US,IA,52533,7,,,, +US-IA-52534,US,IA,52534,7,,,, +US-IA-52535,US,IA,52535,6,,,, +US-IA-52536,US,IA,52536,7,,,, +US-IA-52537,US,IA,52537,7,,,, +US-IA-52540,US,IA,52540,7,,,, +US-IA-52542,US,IA,52542,6,,,, +US-IA-52543,US,IA,52543,7,,,, +US-IA-52544,US,IA,52544,7,,,, +US-IA-52548,US,IA,52548,7,,,, +US-IA-52549,US,IA,52549,7,,,, +US-IA-52550,US,IA,52550,6,,,, +US-IA-52551,US,IA,52551,6,,,, +US-IA-52552,US,IA,52552,7,,,, +US-IA-52553,US,IA,52553,7,,,, +US-IA-52554,US,IA,52554,7,,,, +US-IA-52555,US,IA,52555,7,,,, +US-IA-52556,US,IA,52556,7,,,, +US-IA-52557,US,IA,52557,7,,,, +US-IA-52560,US,IA,52560,7,,,, +US-IA-52561,US,IA,52561,7,,,, +US-IA-52562,US,IA,52562,7,,,, +US-IA-52563,US,IA,52563,7,,,, +US-IA-52565,US,IA,52565,6,,,, +US-IA-52566,US,IA,52566,7,,,, +US-IA-52567,US,IA,52567,7,,,, +US-IA-52568,US,IA,52568,7,,,, +US-IA-52569,US,IA,52569,7,,,, +US-IA-52570,US,IA,52570,6,,,, +US-IA-52571,US,IA,52571,7,,,, +US-IA-52572,US,IA,52572,7,,,, +US-IA-52573,US,IA,52573,6,,,, +US-IA-52574,US,IA,52574,7,,,, +US-IA-52576,US,IA,52576,6,,,, +US-IA-52577,US,IA,52577,7,,,, +US-IA-52580,US,IA,52580,7,,,, +US-IA-52581,US,IA,52581,7,,,, +US-IA-52583,US,IA,52583,7,,,, +US-IA-52584,US,IA,52584,7,,,, +US-IA-52585,US,IA,52585,6,,,, +US-IA-52586,US,IA,52586,7,,,, +US-IA-52588,US,IA,52588,6,,,, +US-IA-52590,US,IA,52590,7,,,, +US-IA-52591,US,IA,52591,7,,,, +US-IA-52593,US,IA,52593,7,,,, +US-IA-52594,US,IA,52594,7,,,, +US-IA-52595,US,IA,52595,7,,,, +US-IA-52601,US,IA,52601,7,,,, +US-IA-52619,US,IA,52619,7,,,, +US-IA-52620,US,IA,52620,6,,,, +US-IA-52621,US,IA,52621,7,,,, +US-IA-52623,US,IA,52623,7,,,, +US-IA-52624,US,IA,52624,7,,,, +US-IA-52625,US,IA,52625,7,,,, +US-IA-52626,US,IA,52626,6,,,, +US-IA-52627,US,IA,52627,7,,,, +US-IA-52630,US,IA,52630,7,,,, +US-IA-52631,US,IA,52631,7,,,, +US-IA-52632,US,IA,52632,7,,,, +US-IA-52635,US,IA,52635,7,,,, +US-IA-52637,US,IA,52637,7,,,, +US-IA-52638,US,IA,52638,7,,,, +US-IA-52639,US,IA,52639,7,,,, +US-IA-52640,US,IA,52640,7,,,, +US-IA-52641,US,IA,52641,7,,,, +US-IA-52642,US,IA,52642,7,,,, +US-IA-52644,US,IA,52644,7,,,, +US-IA-52645,US,IA,52645,7,,,, +US-IA-52646,US,IA,52646,7,,,, +US-IA-52647,US,IA,52647,7,,,, +US-IA-52648,US,IA,52648,7,,,, +US-IA-52649,US,IA,52649,7,,,, +US-IA-52650,US,IA,52650,7,,,, +US-IA-52651,US,IA,52651,6,,,, +US-IA-52652,US,IA,52652,7,,,, +US-IA-52653,US,IA,52653,7,,,, +US-IA-52654,US,IA,52654,7,,,, +US-IA-52655,US,IA,52655,7,,,, +US-IA-52656,US,IA,52656,7,,,, +US-IA-52657,US,IA,52657,7,,,, +US-IA-52658,US,IA,52658,7,,,, +US-IA-52659,US,IA,52659,7,,,, +US-IA-52660,US,IA,52660,7,,,, +US-IA-52701,US,IA,52701,7,,,, +US-IA-52720,US,IA,52720,7,,,, +US-IA-52721,US,IA,52721,7,,,, +US-IA-52722,US,IA,52722,7,,,, +US-IA-52726,US,IA,52726,7,,,, +US-IA-52727,US,IA,52727,7,,,, +US-IA-52728,US,IA,52728,7,,,, +US-IA-52729,US,IA,52729,7,,,, +US-IA-52730,US,IA,52730,7,,,, +US-IA-52731,US,IA,52731,7,,,, +US-IA-52732,US,IA,52732,7,,,, +US-IA-52733,US,IA,52733,7,,,, +US-IA-52734,US,IA,52734,7,,,, +US-IA-52736,US,IA,52736,7,,,, +US-IA-52737,US,IA,52737,7,,,, +US-IA-52738,US,IA,52738,7,,,, +US-IA-52739,US,IA,52739,7,,,, +US-IA-52742,US,IA,52742,7,,,, +US-IA-52745,US,IA,52745,7,,,, +US-IA-52746,US,IA,52746,7,,,, +US-IA-52747,US,IA,52747,7,,,, +US-IA-52748,US,IA,52748,7,,,, +US-IA-52749,US,IA,52749,7,,,, +US-IA-52750,US,IA,52750,7,,,, +US-IA-52751,US,IA,52751,7,,,, +US-IA-52752,US,IA,52752,7,,,, +US-IA-52753,US,IA,52753,7,,,, +US-IA-52754,US,IA,52754,7,,,, +US-IA-52755,US,IA,52755,6,,,, +US-IA-52756,US,IA,52756,7,,,, +US-IA-52757,US,IA,52757,7,,,, +US-IA-52758,US,IA,52758,7,,,, +US-IA-52759,US,IA,52759,7,,,, +US-IA-52760,US,IA,52760,7,,,, +US-IA-52761,US,IA,52761,7,,,, +US-IA-52765,US,IA,52765,7,,,, +US-IA-52766,US,IA,52766,7,,,, +US-IA-52767,US,IA,52767,7,,,, +US-IA-52768,US,IA,52768,7,,,, +US-IA-52769,US,IA,52769,7,,,, +US-IA-52771,US,IA,52771,7,,,, +US-IA-52772,US,IA,52772,7,,,, +US-IA-52773,US,IA,52773,7,,,, +US-IA-52774,US,IA,52774,7,,,, +US-IA-52776,US,IA,52776,7,,,, +US-IA-52777,US,IA,52777,7,,,, +US-IA-52778,US,IA,52778,7,,,, +US-IA-52801,US,IA,52801,7,,,, +US-IA-52802,US,IA,52802,7,,,, +US-IA-52803,US,IA,52803,7,,,, +US-IA-52804,US,IA,52804,7,,,, +US-IA-52805,US,IA,52805,7,,,, +US-IA-52806,US,IA,52806,7,,,, +US-IA-52807,US,IA,52807,7,,,, +US-IA-52808,US,IA,52808,7,,,, +US-IA-52809,US,IA,52809,7,,,, +US-ID-83201,US,ID,83201,6,,,, +US-ID-83202,US,ID,83202,6,,,, +US-ID-83203,US,ID,83203,6,,,, +US-ID-83204,US,ID,83204,6,,,, +US-ID-83205,US,ID,83205,6,,,, +US-ID-83206,US,ID,83206,6,,,, +US-ID-83209,US,ID,83209,6,,,, +US-ID-83210,US,ID,83210,6,,,, +US-ID-83211,US,ID,83211,6,,,, +US-ID-83212,US,ID,83212,6,,,, +US-ID-83213,US,ID,83213,6,,,, +US-ID-83214,US,ID,83214,6,,,, +US-ID-83215,US,ID,83215,6,,,, +US-ID-83217,US,ID,83217,6,,,, +US-ID-83218,US,ID,83218,6,,,, +US-ID-83220,US,ID,83220,6,,,, +US-ID-83221,US,ID,83221,6,,,, +US-ID-83223,US,ID,83223,6,,,, +US-ID-83226,US,ID,83226,6,,,, +US-ID-83227,US,ID,83227,6,,,, +US-ID-83228,US,ID,83228,6,,,, +US-ID-83232,US,ID,83232,6,,,, +US-ID-83233,US,ID,83233,6,,,, +US-ID-83234,US,ID,83234,6,,,, +US-ID-83235,US,ID,83235,6,,,, +US-ID-83236,US,ID,83236,6,,,, +US-ID-83237,US,ID,83237,6,,,, +US-ID-83238,US,ID,83238,6,,,, +US-ID-83239,US,ID,83239,6,,,, +US-ID-83241,US,ID,83241,6,,,, +US-ID-83243,US,ID,83243,6,,,, +US-ID-83244,US,ID,83244,6,,,, +US-ID-83245,US,ID,83245,6,,,, +US-ID-83246,US,ID,83246,6,,,, +US-ID-83250,US,ID,83250,6,,,, +US-ID-83251,US,ID,83251,6,,,, +US-ID-83252,US,ID,83252,6,,,, +US-ID-83253,US,ID,83253,6,,,, +US-ID-83254,US,ID,83254,6,,,, +US-ID-83255,US,ID,83255,6,,,, +US-ID-83256,US,ID,83256,6,,,, +US-ID-83261,US,ID,83261,6,,,, +US-ID-83262,US,ID,83262,6,,,, +US-ID-83263,US,ID,83263,6,,,, +US-ID-83271,US,ID,83271,6,,,, +US-ID-83272,US,ID,83272,6,,,, +US-ID-83274,US,ID,83274,6,,,, +US-ID-83276,US,ID,83276,6,,,, +US-ID-83277,US,ID,83277,6,,,, +US-ID-83278,US,ID,83278,8.5,,,, +US-ID-83281,US,ID,83281,6,,,, +US-ID-83283,US,ID,83283,6,,,, +US-ID-83285,US,ID,83285,6,,,, +US-ID-83286,US,ID,83286,6,,,, +US-ID-83287,US,ID,83287,6,,,, +US-ID-83301,US,ID,83301,6,,,, +US-ID-83302,US,ID,83302,6,,,, +US-ID-83303,US,ID,83303,6,,,, +US-ID-83311,US,ID,83311,6,,,, +US-ID-83312,US,ID,83312,6,,,, +US-ID-83313,US,ID,83313,6,,,, +US-ID-83314,US,ID,83314,6,,,, +US-ID-83316,US,ID,83316,6,,,, +US-ID-83318,US,ID,83318,6,,,, +US-ID-83320,US,ID,83320,6,,,, +US-ID-83321,US,ID,83321,6,,,, +US-ID-83322,US,ID,83322,6,,,, +US-ID-83323,US,ID,83323,6,,,, +US-ID-83324,US,ID,83324,6,,,, +US-ID-83325,US,ID,83325,6,,,, +US-ID-83327,US,ID,83327,6,,,, +US-ID-83328,US,ID,83328,6,,,, +US-ID-83330,US,ID,83330,6,,,, +US-ID-83332,US,ID,83332,6,,,, +US-ID-83333,US,ID,83333,6,,,, +US-ID-83334,US,ID,83334,6,,,, +US-ID-83335,US,ID,83335,6,,,, +US-ID-83336,US,ID,83336,6,,,, +US-ID-83337,US,ID,83337,6,,,, +US-ID-83338,US,ID,83338,6,,,, +US-ID-83340,US,ID,83340,7,,,, +US-ID-83341,US,ID,83341,6,,,, +US-ID-83342,US,ID,83342,6,,,, +US-ID-83343,US,ID,83343,6,,,, +US-ID-83344,US,ID,83344,6,,,, +US-ID-83346,US,ID,83346,6,,,, +US-ID-83347,US,ID,83347,6,,,, +US-ID-83348,US,ID,83348,6,,,, +US-ID-83349,US,ID,83349,6,,,, +US-ID-83350,US,ID,83350,6,,,, +US-ID-83352,US,ID,83352,6,,,, +US-ID-83353,US,ID,83353,8,,,, +US-ID-83354,US,ID,83354,8,,,, +US-ID-83355,US,ID,83355,6,,,, +US-ID-83401,US,ID,83401,6,,,, +US-ID-83402,US,ID,83402,6,,,, +US-ID-83403,US,ID,83403,6,,,, +US-ID-83404,US,ID,83404,6,,,, +US-ID-83405,US,ID,83405,6,,,, +US-ID-83406,US,ID,83406,6,,,, +US-ID-83415,US,ID,83415,6,,,, +US-ID-83420,US,ID,83420,6,,,, +US-ID-83421,US,ID,83421,6,,,, +US-ID-83422,US,ID,83422,6,,,, +US-ID-83423,US,ID,83423,6,,,, +US-ID-83424,US,ID,83424,6,,,, +US-ID-83425,US,ID,83425,6,,,, +US-ID-83427,US,ID,83427,6,,,, +US-ID-83428,US,ID,83428,6,,,, +US-ID-83429,US,ID,83429,6,,,, +US-ID-83431,US,ID,83431,6,,,, +US-ID-83433,US,ID,83433,6,,,, +US-ID-83434,US,ID,83434,6,,,, +US-ID-83435,US,ID,83435,6,,,, +US-ID-83436,US,ID,83436,6,,,, +US-ID-83438,US,ID,83438,6,,,, +US-ID-83440,US,ID,83440,6,,,, +US-ID-83441,US,ID,83441,6,,,, +US-ID-83442,US,ID,83442,6,,,, +US-ID-83443,US,ID,83443,6,,,, +US-ID-83444,US,ID,83444,6,,,, +US-ID-83445,US,ID,83445,6,,,, +US-ID-83446,US,ID,83446,6,,,, +US-ID-83448,US,ID,83448,6,,,, +US-ID-83449,US,ID,83449,6,,,, +US-ID-83450,US,ID,83450,6,,,, +US-ID-83451,US,ID,83451,6,,,, +US-ID-83452,US,ID,83452,6,,,, +US-ID-83454,US,ID,83454,6,,,, +US-ID-83455,US,ID,83455,6,,,, +US-ID-83460,US,ID,83460,6,,,, +US-ID-83462,US,ID,83462,6,,,, +US-ID-83463,US,ID,83463,6,,,, +US-ID-83464,US,ID,83464,6,,,, +US-ID-83465,US,ID,83465,6,,,, +US-ID-83466,US,ID,83466,6,,,, +US-ID-83467,US,ID,83467,6,,,, +US-ID-83468,US,ID,83468,6,,,, +US-ID-83469,US,ID,83469,6,,,, +US-ID-83501,US,ID,83501,6.5,,,, +US-ID-83520,US,ID,83520,6,,,, +US-ID-83522,US,ID,83522,6,,,, +US-ID-83523,US,ID,83523,6,,,, +US-ID-83524,US,ID,83524,6.5,,,, +US-ID-83525,US,ID,83525,6,,,, +US-ID-83526,US,ID,83526,6,,,, +US-ID-83530,US,ID,83530,6,,,, +US-ID-83531,US,ID,83531,6,,,, +US-ID-83533,US,ID,83533,6,,,, +US-ID-83535,US,ID,83535,6.5,,,, +US-ID-83536,US,ID,83536,6,,,, +US-ID-83537,US,ID,83537,6,,,, +US-ID-83539,US,ID,83539,6,,,, +US-ID-83540,US,ID,83540,6.5,,,, +US-ID-83541,US,ID,83541,6.5,,,, +US-ID-83542,US,ID,83542,6,,,, +US-ID-83543,US,ID,83543,6,,,, +US-ID-83544,US,ID,83544,6,,,, +US-ID-83545,US,ID,83545,6.5,,,, +US-ID-83546,US,ID,83546,6,,,, +US-ID-83547,US,ID,83547,6,,,, +US-ID-83548,US,ID,83548,6.5,,,, +US-ID-83549,US,ID,83549,6,,,, +US-ID-83552,US,ID,83552,6,,,, +US-ID-83553,US,ID,83553,6,,,, +US-ID-83554,US,ID,83554,6,,,, +US-ID-83555,US,ID,83555,6,,,, +US-ID-83601,US,ID,83601,6,,,, +US-ID-83602,US,ID,83602,6,,,, +US-ID-83604,US,ID,83604,6,,,, +US-ID-83605,US,ID,83605,6,,,, +US-ID-83606,US,ID,83606,6,,,, +US-ID-83607,US,ID,83607,6,,,, +US-ID-83610,US,ID,83610,6,,,, +US-ID-83611,US,ID,83611,6,,,, +US-ID-83612,US,ID,83612,6,,,, +US-ID-83615,US,ID,83615,6,,,, +US-ID-83616,US,ID,83616,6,,,, +US-ID-83617,US,ID,83617,6,,,, +US-ID-83619,US,ID,83619,6,,,, +US-ID-83622,US,ID,83622,6,,,, +US-ID-83623,US,ID,83623,6,,,, +US-ID-83624,US,ID,83624,6,,,, +US-ID-83626,US,ID,83626,6,,,, +US-ID-83627,US,ID,83627,6,,,, +US-ID-83628,US,ID,83628,6,,,, +US-ID-83629,US,ID,83629,6,,,, +US-ID-83630,US,ID,83630,6,,,, +US-ID-83631,US,ID,83631,6,,,, +US-ID-83632,US,ID,83632,6,,,, +US-ID-83633,US,ID,83633,6,,,, +US-ID-83634,US,ID,83634,6,,,, +US-ID-83635,US,ID,83635,6,,,, +US-ID-83636,US,ID,83636,6,,,, +US-ID-83637,US,ID,83637,6,,,, +US-ID-83638,US,ID,83638,6,,,, +US-ID-83639,US,ID,83639,6,,,, +US-ID-83641,US,ID,83641,6,,,, +US-ID-83642,US,ID,83642,6,,,, +US-ID-83643,US,ID,83643,6,,,, +US-ID-83644,US,ID,83644,6,,,, +US-ID-83645,US,ID,83645,6,,,, +US-ID-83646,US,ID,83646,6,,,, +US-ID-83647,US,ID,83647,6,,,, +US-ID-83648,US,ID,83648,6,,,, +US-ID-83650,US,ID,83650,6,,,, +US-ID-83651,US,ID,83651,6,,,, +US-ID-83652,US,ID,83652,6,,,, +US-ID-83653,US,ID,83653,6,,,, +US-ID-83654,US,ID,83654,6,,,, +US-ID-83655,US,ID,83655,6,,,, +US-ID-83656,US,ID,83656,6,,,, +US-ID-83657,US,ID,83657,6,,,, +US-ID-83660,US,ID,83660,6,,,, +US-ID-83661,US,ID,83661,6,,,, +US-ID-83666,US,ID,83666,6,,,, +US-ID-83669,US,ID,83669,6,,,, +US-ID-83670,US,ID,83670,6,,,, +US-ID-83671,US,ID,83671,6,,,, +US-ID-83672,US,ID,83672,6,,,, +US-ID-83676,US,ID,83676,6,,,, +US-ID-83677,US,ID,83677,6,,,, +US-ID-83680,US,ID,83680,6,,,, +US-ID-83686,US,ID,83686,6,,,, +US-ID-83687,US,ID,83687,6,,,, +US-ID-83701,US,ID,83701,6,,,, +US-ID-83702,US,ID,83702,6,,,, +US-ID-83703,US,ID,83703,6,,,, +US-ID-83704,US,ID,83704,6,,,, +US-ID-83705,US,ID,83705,6,,,, +US-ID-83706,US,ID,83706,6,,,, +US-ID-83707,US,ID,83707,6,,,, +US-ID-83708,US,ID,83708,6,,,, +US-ID-83709,US,ID,83709,6,,,, +US-ID-83711,US,ID,83711,6,,,, +US-ID-83712,US,ID,83712,6,,,, +US-ID-83713,US,ID,83713,6,,,, +US-ID-83714,US,ID,83714,6,,,, +US-ID-83715,US,ID,83715,6,,,, +US-ID-83716,US,ID,83716,6,,,, +US-ID-83717,US,ID,83717,6,,,, +US-ID-83719,US,ID,83719,6,,,, +US-ID-83720,US,ID,83720,6,,,, +US-ID-83722,US,ID,83722,6,,,, +US-ID-83724,US,ID,83724,6,,,, +US-ID-83725,US,ID,83725,6,,,, +US-ID-83726,US,ID,83726,6,,,, +US-ID-83728,US,ID,83728,6,,,, +US-ID-83729,US,ID,83729,6,,,, +US-ID-83731,US,ID,83731,6,,,, +US-ID-83732,US,ID,83732,6,,,, +US-ID-83735,US,ID,83735,6,,,, +US-ID-83756,US,ID,83756,6,,,, +US-ID-83799,US,ID,83799,6,,,, +US-ID-83801,US,ID,83801,6,,,, +US-ID-83802,US,ID,83802,6,,,, +US-ID-83803,US,ID,83803,6,,,, +US-ID-83804,US,ID,83804,6,,,, +US-ID-83805,US,ID,83805,6,,,, +US-ID-83806,US,ID,83806,6,,,, +US-ID-83808,US,ID,83808,6,,,, +US-ID-83809,US,ID,83809,6,,,, +US-ID-83810,US,ID,83810,6,,,, +US-ID-83811,US,ID,83811,6,,,, +US-ID-83812,US,ID,83812,6,,,, +US-ID-83813,US,ID,83813,6,,,, +US-ID-83814,US,ID,83814,6,,,, +US-ID-83815,US,ID,83815,6,,,, +US-ID-83816,US,ID,83816,6,,,, +US-ID-83821,US,ID,83821,6,,,, +US-ID-83822,US,ID,83822,6,,,, +US-ID-83823,US,ID,83823,6,,,, +US-ID-83824,US,ID,83824,6,,,, +US-ID-83825,US,ID,83825,6,,,, +US-ID-83826,US,ID,83826,6,,,, +US-ID-83827,US,ID,83827,6,,,, +US-ID-83830,US,ID,83830,6,,,, +US-ID-83832,US,ID,83832,6,,,, +US-ID-83833,US,ID,83833,6,,,, +US-ID-83834,US,ID,83834,6,,,, +US-ID-83835,US,ID,83835,6,,,, +US-ID-83836,US,ID,83836,6,,,, +US-ID-83837,US,ID,83837,6,,,, +US-ID-83839,US,ID,83839,6,,,, +US-ID-83840,US,ID,83840,6,,,, +US-ID-83841,US,ID,83841,6,,,, +US-ID-83842,US,ID,83842,6,,,, +US-ID-83843,US,ID,83843,6,,,, +US-ID-83844,US,ID,83844,6,,,, +US-ID-83845,US,ID,83845,6,,,, +US-ID-83846,US,ID,83846,6,,,, +US-ID-83847,US,ID,83847,6,,,, +US-ID-83848,US,ID,83848,6,,,, +US-ID-83849,US,ID,83849,6,,,, +US-ID-83850,US,ID,83850,6,,,, +US-ID-83851,US,ID,83851,6,,,, +US-ID-83852,US,ID,83852,6,,,, +US-ID-83853,US,ID,83853,6,,,, +US-ID-83854,US,ID,83854,6,,,, +US-ID-83855,US,ID,83855,6,,,, +US-ID-83856,US,ID,83856,6,,,, +US-ID-83857,US,ID,83857,6,,,, +US-ID-83858,US,ID,83858,6,,,, +US-ID-83860,US,ID,83860,6,,,, +US-ID-83861,US,ID,83861,6,,,, +US-ID-83864,US,ID,83864,6,,,, +US-ID-83865,US,ID,83865,6,,,, +US-ID-83866,US,ID,83866,6,,,, +US-ID-83867,US,ID,83867,6,,,, +US-ID-83868,US,ID,83868,6,,,, +US-ID-83869,US,ID,83869,6,,,, +US-ID-83870,US,ID,83870,6,,,, +US-ID-83871,US,ID,83871,6,,,, +US-ID-83872,US,ID,83872,6,,,, +US-ID-83873,US,ID,83873,6,,,, +US-ID-83874,US,ID,83874,6,,,, +US-ID-83876,US,ID,83876,6,,,, +US-ID-83877,US,ID,83877,6,,,, +US-IL-60002,US,IL,60002,7,,,, +US-IL-60004,US,IL,60004,9,,,, +US-IL-60005,US,IL,60005,9,,,, +US-IL-60006,US,IL,60006,9,,,, +US-IL-60007,US,IL,60007,9,,,, +US-IL-60008,US,IL,60008,9,,,, +US-IL-60009,US,IL,60009,9,,,, +US-IL-60010,US,IL,60010,7,,,, +US-IL-60011,US,IL,60011,8,,,, +US-IL-60012,US,IL,60012,7,,,, +US-IL-60013,US,IL,60013,7,,,, +US-IL-60014,US,IL,60014,7.75,,,, +US-IL-60015,US,IL,60015,8,,,, +US-IL-60016,US,IL,60016,9,,,, +US-IL-60017,US,IL,60017,9,,,, +US-IL-60018,US,IL,60018,9,,,, +US-IL-60019,US,IL,60019,9,,,, +US-IL-60020,US,IL,60020,7,,,, +US-IL-60021,US,IL,60021,7,,,, +US-IL-60022,US,IL,60022,8,,,, +US-IL-60025,US,IL,60025,8.75,,,, +US-IL-60026,US,IL,60026,8.75,,,, +US-IL-60029,US,IL,60029,8,,,, +US-IL-60030,US,IL,60030,7,,,, +US-IL-60031,US,IL,60031,7.5,,,, +US-IL-60033,US,IL,60033,7,,,, +US-IL-60034,US,IL,60034,7,,,, +US-IL-60035,US,IL,60035,8,,,, +US-IL-60037,US,IL,60037,7.5,,,, +US-IL-60038,US,IL,60038,9,,,, +US-IL-60039,US,IL,60039,7.75,,,, +US-IL-60040,US,IL,60040,8.5,,,, +US-IL-60041,US,IL,60041,7,,,, +US-IL-60042,US,IL,60042,7,,,, +US-IL-60043,US,IL,60043,8,,,, +US-IL-60044,US,IL,60044,8,,,, +US-IL-60045,US,IL,60045,7.5,,,, +US-IL-60046,US,IL,60046,7,,,, +US-IL-60047,US,IL,60047,7.5,,,, +US-IL-60048,US,IL,60048,7,,,, +US-IL-60050,US,IL,60050,7.5,,,, +US-IL-60051,US,IL,60051,7,,,, +US-IL-60053,US,IL,60053,9,,,, +US-IL-60055,US,IL,60055,9,,,, +US-IL-60056,US,IL,60056,9,,,, +US-IL-60060,US,IL,60060,8,,,, +US-IL-60061,US,IL,60061,7,,,, +US-IL-60062,US,IL,60062,8.75,,,, +US-IL-60064,US,IL,60064,7,,,, +US-IL-60065,US,IL,60065,8.75,,,, +US-IL-60067,US,IL,60067,9,,,, +US-IL-60068,US,IL,60068,9,,,, +US-IL-60069,US,IL,60069,7.5,,,, +US-IL-60070,US,IL,60070,8.5,,,, +US-IL-60071,US,IL,60071,7,,,, +US-IL-60072,US,IL,60072,7,,,, +US-IL-60073,US,IL,60073,7.5,,,, +US-IL-60074,US,IL,60074,9,,,, +US-IL-60075,US,IL,60075,7,,,, +US-IL-60076,US,IL,60076,9,,,, +US-IL-60077,US,IL,60077,9,,,, +US-IL-60078,US,IL,60078,9,,,, +US-IL-60079,US,IL,60079,8,,,, +US-IL-60081,US,IL,60081,7,,,, +US-IL-60082,US,IL,60082,8.75,,,, +US-IL-60083,US,IL,60083,7,,,, +US-IL-60084,US,IL,60084,7,,,, +US-IL-60085,US,IL,60085,8,,,, +US-IL-60086,US,IL,60086,7,,,, +US-IL-60087,US,IL,60087,8,,,, +US-IL-60088,US,IL,60088,7,,,, +US-IL-60089,US,IL,60089,8,,,, +US-IL-60090,US,IL,60090,9,,,, +US-IL-60091,US,IL,60091,8.25,,,, +US-IL-60093,US,IL,60093,8,,,, +US-IL-60094,US,IL,60094,9,,,, +US-IL-60095,US,IL,60095,9,,,, +US-IL-60096,US,IL,60096,7,,,, +US-IL-60097,US,IL,60097,7,,,, +US-IL-60098,US,IL,60098,7,,,, +US-IL-60099,US,IL,60099,7,,,, +US-IL-60101,US,IL,60101,8.25,,,, +US-IL-60102,US,IL,60102,7.75,,,, +US-IL-60103,US,IL,60103,8,,,, +US-IL-60104,US,IL,60104,9.5,,,, +US-IL-60105,US,IL,60105,8.25,,,, +US-IL-60106,US,IL,60106,8.25,,,, +US-IL-60107,US,IL,60107,9,,,, +US-IL-60108,US,IL,60108,7.75,,,, +US-IL-60109,US,IL,60109,7,,,, +US-IL-60110,US,IL,60110,8.5,,,, +US-IL-60111,US,IL,60111,6.25,,,, +US-IL-60112,US,IL,60112,7.25,,,, +US-IL-60113,US,IL,60113,6.25,,,, +US-IL-60115,US,IL,60115,8,,,, +US-IL-60116,US,IL,60116,8,,,, +US-IL-60117,US,IL,60117,7.75,,,, +US-IL-60118,US,IL,60118,8.5,,,, +US-IL-60119,US,IL,60119,7,,,, +US-IL-60120,US,IL,60120,8.25,,,, +US-IL-60121,US,IL,60121,8.25,,,, +US-IL-60122,US,IL,60122,8,,,, +US-IL-60123,US,IL,60123,8.25,,,, +US-IL-60124,US,IL,60124,7,,,, +US-IL-60126,US,IL,60126,8,,,, +US-IL-60128,US,IL,60128,8,,,, +US-IL-60129,US,IL,60129,6.25,,,, +US-IL-60130,US,IL,60130,8.5,,,, +US-IL-60131,US,IL,60131,8,,,, +US-IL-60132,US,IL,60132,8,,,, +US-IL-60133,US,IL,60133,8.75,,,, +US-IL-60134,US,IL,60134,7.5,,,, +US-IL-60135,US,IL,60135,6.25,,,, +US-IL-60136,US,IL,60136,8,,,, +US-IL-60137,US,IL,60137,8.25,,,, +US-IL-60138,US,IL,60138,8.25,,,, +US-IL-60139,US,IL,60139,8.25,,,, +US-IL-60140,US,IL,60140,7,,,, +US-IL-60141,US,IL,60141,8,,,, +US-IL-60142,US,IL,60142,7,,,, +US-IL-60143,US,IL,60143,7.75,,,, +US-IL-60144,US,IL,60144,7,,,, +US-IL-60145,US,IL,60145,6.25,,,, +US-IL-60146,US,IL,60146,6.25,,,, +US-IL-60147,US,IL,60147,7,,,, +US-IL-60148,US,IL,60148,8.25,,,, +US-IL-60150,US,IL,60150,6.25,,,, +US-IL-60151,US,IL,60151,7,,,, +US-IL-60152,US,IL,60152,7,,,, +US-IL-60153,US,IL,60153,9,,,, +US-IL-60154,US,IL,60154,9,,,, +US-IL-60155,US,IL,60155,9,,,, +US-IL-60156,US,IL,60156,7.75,,,, +US-IL-60157,US,IL,60157,7.25,,,, +US-IL-60159,US,IL,60159,9,,,, +US-IL-60160,US,IL,60160,9.25,,,, +US-IL-60161,US,IL,60161,9.25,,,, +US-IL-60162,US,IL,60162,9,,,, +US-IL-60163,US,IL,60163,9,,,, +US-IL-60164,US,IL,60164,9,,,, +US-IL-60165,US,IL,60165,9.25,,,, +US-IL-60168,US,IL,60168,9,,,, +US-IL-60169,US,IL,60169,9,,,, +US-IL-60170,US,IL,60170,8.25,,,, +US-IL-60171,US,IL,60171,10,,,, +US-IL-60172,US,IL,60172,7.25,,,, +US-IL-60173,US,IL,60173,9,,,, +US-IL-60174,US,IL,60174,8,,,, +US-IL-60175,US,IL,60175,7,,,, +US-IL-60176,US,IL,60176,8.75,,,, +US-IL-60177,US,IL,60177,7.5,,,, +US-IL-60178,US,IL,60178,8,,,, +US-IL-60179,US,IL,60179,8,,,, +US-IL-60180,US,IL,60180,7,,,, +US-IL-60181,US,IL,60181,7.75,,,, +US-IL-60183,US,IL,60183,7,,,, +US-IL-60184,US,IL,60184,7.25,,,, +US-IL-60185,US,IL,60185,7.75,,,, +US-IL-60186,US,IL,60186,7.75,,,, +US-IL-60187,US,IL,60187,8.25,,,, +US-IL-60188,US,IL,60188,8,,,, +US-IL-60189,US,IL,60189,8.25,,,, +US-IL-60190,US,IL,60190,7.25,,,, +US-IL-60191,US,IL,60191,8.25,,,, +US-IL-60192,US,IL,60192,9,,,, +US-IL-60193,US,IL,60193,9,,,, +US-IL-60194,US,IL,60194,9,,,, +US-IL-60195,US,IL,60195,9,,,, +US-IL-60196,US,IL,60196,9,,,, +US-IL-60197,US,IL,60197,8,,,, +US-IL-60199,US,IL,60199,8,,,, +US-IL-60201,US,IL,60201,9,,,, +US-IL-60202,US,IL,60202,9,,,, +US-IL-60203,US,IL,60203,9,,,, +US-IL-60204,US,IL,60204,9,,,, +US-IL-60208,US,IL,60208,9,,,, +US-IL-60209,US,IL,60209,9,,,, +US-IL-60290,US,IL,60290,9.25,,,, +US-IL-60301,US,IL,60301,9,,,, +US-IL-60302,US,IL,60302,9,,,, +US-IL-60303,US,IL,60303,9,,,, +US-IL-60304,US,IL,60304,9,,,, +US-IL-60305,US,IL,60305,9,,,, +US-IL-60399,US,IL,60399,8.25,,,, +US-IL-60401,US,IL,60401,7,,,, +US-IL-60402,US,IL,60402,9,,,, +US-IL-60403,US,IL,60403,8,,,, +US-IL-60404,US,IL,60404,8,,,, +US-IL-60406,US,IL,60406,8,,,, +US-IL-60407,US,IL,60407,6.25,,,, +US-IL-60408,US,IL,60408,7,,,, +US-IL-60409,US,IL,60409,9,,,, +US-IL-60410,US,IL,60410,8,,,, +US-IL-60411,US,IL,60411,9,,,, +US-IL-60412,US,IL,60412,9,,,, +US-IL-60415,US,IL,60415,9,,,, +US-IL-60416,US,IL,60416,6.25,,,, +US-IL-60417,US,IL,60417,7,,,, +US-IL-60419,US,IL,60419,8.5,,,, +US-IL-60420,US,IL,60420,6.25,,,, +US-IL-60421,US,IL,60421,7,,,, +US-IL-60422,US,IL,60422,8,,,, +US-IL-60423,US,IL,60423,7,,,, +US-IL-60424,US,IL,60424,6.25,,,, +US-IL-60425,US,IL,60425,8,,,, +US-IL-60426,US,IL,60426,9,,,, +US-IL-60428,US,IL,60428,9,,,, +US-IL-60429,US,IL,60429,9,,,, +US-IL-60430,US,IL,60430,8,,,, +US-IL-60431,US,IL,60431,8.75,,,, +US-IL-60432,US,IL,60432,8.75,,,, +US-IL-60433,US,IL,60433,7,,,, +US-IL-60434,US,IL,60434,8.75,,,, +US-IL-60435,US,IL,60435,8.75,,,, +US-IL-60436,US,IL,60436,8.75,,,, +US-IL-60437,US,IL,60437,6.25,,,, +US-IL-60438,US,IL,60438,8.5,,,, +US-IL-60439,US,IL,60439,8,,,, +US-IL-60440,US,IL,60440,8.5,,,, +US-IL-60441,US,IL,60441,8,,,, +US-IL-60442,US,IL,60442,8,,,, +US-IL-60443,US,IL,60443,8,,,, +US-IL-60444,US,IL,60444,6.25,,,, +US-IL-60445,US,IL,60445,8,,,, +US-IL-60446,US,IL,60446,8.5,,,, +US-IL-60447,US,IL,60447,6.25,,,, +US-IL-60448,US,IL,60448,7.5,,,, +US-IL-60449,US,IL,60449,7,,,, +US-IL-60450,US,IL,60450,6.25,,,, +US-IL-60451,US,IL,60451,8.5,,,, +US-IL-60452,US,IL,60452,9,,,, +US-IL-60453,US,IL,60453,8.75,,,, +US-IL-60454,US,IL,60454,8.75,,,, +US-IL-60455,US,IL,60455,9,,,, +US-IL-60456,US,IL,60456,8,,,, +US-IL-60457,US,IL,60457,8,,,, +US-IL-60458,US,IL,60458,8,,,, +US-IL-60459,US,IL,60459,8.75,,,, +US-IL-60460,US,IL,60460,6.25,,,, +US-IL-60461,US,IL,60461,8,,,, +US-IL-60462,US,IL,60462,8.75,,,, +US-IL-60463,US,IL,60463,8,,,, +US-IL-60464,US,IL,60464,8.5,,,, +US-IL-60465,US,IL,60465,8,,,, +US-IL-60466,US,IL,60466,8,,,, +US-IL-60467,US,IL,60467,8.75,,,, +US-IL-60468,US,IL,60468,7,,,, +US-IL-60469,US,IL,60469,8.5,,,, +US-IL-60470,US,IL,60470,6.5,,,, +US-IL-60471,US,IL,60471,8.5,,,, +US-IL-60472,US,IL,60472,8,,,, +US-IL-60473,US,IL,60473,8.5,,,, +US-IL-60474,US,IL,60474,6.25,,,, +US-IL-60475,US,IL,60475,8,,,, +US-IL-60476,US,IL,60476,8,,,, +US-IL-60477,US,IL,60477,8,,,, +US-IL-60478,US,IL,60478,9.25,,,, +US-IL-60479,US,IL,60479,6.25,,,, +US-IL-60480,US,IL,60480,9,,,, +US-IL-60481,US,IL,60481,7,,,, +US-IL-60482,US,IL,60482,9,,,, +US-IL-60484,US,IL,60484,8,,,, +US-IL-60487,US,IL,60487,8,,,, +US-IL-60490,US,IL,60490,8.5,,,, +US-IL-60491,US,IL,60491,8,,,, +US-IL-60499,US,IL,60499,8.75,,,, +US-IL-60501,US,IL,60501,8,,,, +US-IL-60502,US,IL,60502,8.25,,,, +US-IL-60503,US,IL,60503,8.25,,,, +US-IL-60504,US,IL,60504,8.25,,,, +US-IL-60505,US,IL,60505,8.25,,,, +US-IL-60506,US,IL,60506,8.25,,,, +US-IL-60507,US,IL,60507,8.25,,,, +US-IL-60510,US,IL,60510,7.5,,,, +US-IL-60511,US,IL,60511,7,,,, +US-IL-60512,US,IL,60512,7.25,,,, +US-IL-60513,US,IL,60513,9,,,, +US-IL-60514,US,IL,60514,7.25,,,, +US-IL-60515,US,IL,60515,8.25,,,, +US-IL-60516,US,IL,60516,8.25,,,, +US-IL-60517,US,IL,60517,7.75,,,, +US-IL-60518,US,IL,60518,6.5,,,, +US-IL-60519,US,IL,60519,7.25,,,, +US-IL-60520,US,IL,60520,6.25,,,, +US-IL-60521,US,IL,60521,8.25,,,, +US-IL-60522,US,IL,60522,7.75,,,, +US-IL-60523,US,IL,60523,7.75,,,, +US-IL-60525,US,IL,60525,8.25,,,, +US-IL-60526,US,IL,60526,8,,,, +US-IL-60527,US,IL,60527,7.25,,,, +US-IL-60530,US,IL,60530,6.25,,,, +US-IL-60531,US,IL,60531,6.5,,,, +US-IL-60532,US,IL,60532,7.25,,,, +US-IL-60534,US,IL,60534,8,,,, +US-IL-60536,US,IL,60536,7.25,,,, +US-IL-60537,US,IL,60537,7.25,,,, +US-IL-60538,US,IL,60538,7,,,, +US-IL-60539,US,IL,60539,7,,,, +US-IL-60540,US,IL,60540,7.25,,,, +US-IL-60541,US,IL,60541,7.25,,,, +US-IL-60542,US,IL,60542,7.5,,,, +US-IL-60543,US,IL,60543,7.75,,,, +US-IL-60544,US,IL,60544,8.5,,,, +US-IL-60545,US,IL,60545,7.25,,,, +US-IL-60546,US,IL,60546,9,,,, +US-IL-60548,US,IL,60548,6.25,,,, +US-IL-60549,US,IL,60549,6.5,,,, +US-IL-60550,US,IL,60550,6.25,,,, +US-IL-60551,US,IL,60551,6.5,,,, +US-IL-60552,US,IL,60552,6.25,,,, +US-IL-60553,US,IL,60553,6.25,,,, +US-IL-60554,US,IL,60554,8,,,, +US-IL-60555,US,IL,60555,8.5,,,, +US-IL-60556,US,IL,60556,6.25,,,, +US-IL-60557,US,IL,60557,6.5,,,, +US-IL-60558,US,IL,60558,8,,,, +US-IL-60559,US,IL,60559,7.25,,,, +US-IL-60560,US,IL,60560,8.25,,,, +US-IL-60561,US,IL,60561,8.25,,,, +US-IL-60563,US,IL,60563,7.25,,,, +US-IL-60564,US,IL,60564,7.25,,,, +US-IL-60565,US,IL,60565,7.25,,,, +US-IL-60566,US,IL,60566,7.25,,,, +US-IL-60567,US,IL,60567,7.25,,,, +US-IL-60568,US,IL,60568,8.25,,,, +US-IL-60572,US,IL,60572,8.25,,,, +US-IL-60585,US,IL,60585,8.5,,,, +US-IL-60586,US,IL,60586,8.75,,,, +US-IL-60598,US,IL,60598,8.25,,,, +US-IL-60599,US,IL,60599,8.25,,,, +US-IL-60601,US,IL,60601,9.25,,,, +US-IL-60602,US,IL,60602,9.25,,,, +US-IL-60603,US,IL,60603,9.25,,,, +US-IL-60604,US,IL,60604,9.25,,,, +US-IL-60605,US,IL,60605,9.25,,,, +US-IL-60606,US,IL,60606,9.25,,,, +US-IL-60607,US,IL,60607,9.25,,,, +US-IL-60608,US,IL,60608,9.25,,,, +US-IL-60609,US,IL,60609,9.25,,,, +US-IL-60610,US,IL,60610,9.25,,,, +US-IL-60611,US,IL,60611,9.25,,,, +US-IL-60612,US,IL,60612,9.25,,,, +US-IL-60613,US,IL,60613,9.25,,,, +US-IL-60614,US,IL,60614,9.25,,,, +US-IL-60615,US,IL,60615,9.25,,,, +US-IL-60616,US,IL,60616,9.25,,,, +US-IL-60617,US,IL,60617,9.25,,,, +US-IL-60618,US,IL,60618,9.25,,,, +US-IL-60619,US,IL,60619,9.25,,,, +US-IL-60620,US,IL,60620,9.25,,,, +US-IL-60621,US,IL,60621,9.25,,,, +US-IL-60622,US,IL,60622,9.25,,,, +US-IL-60623,US,IL,60623,9.25,,,, +US-IL-60624,US,IL,60624,9.25,,,, +US-IL-60625,US,IL,60625,9.25,,,, +US-IL-60626,US,IL,60626,9.25,,,, +US-IL-60628,US,IL,60628,9.25,,,, +US-IL-60629,US,IL,60629,9.25,,,, +US-IL-60630,US,IL,60630,9.25,,,, +US-IL-60631,US,IL,60631,9.25,,,, +US-IL-60632,US,IL,60632,9.25,,,, +US-IL-60633,US,IL,60633,9.25,,,, +US-IL-60634,US,IL,60634,9.25,,,, +US-IL-60636,US,IL,60636,9.25,,,, +US-IL-60637,US,IL,60637,9.25,,,, +US-IL-60638,US,IL,60638,9.25,,,, +US-IL-60639,US,IL,60639,9.25,,,, +US-IL-60640,US,IL,60640,9.25,,,, +US-IL-60641,US,IL,60641,9.25,,,, +US-IL-60642,US,IL,60642,9.25,,,, +US-IL-60643,US,IL,60643,9.25,,,, +US-IL-60644,US,IL,60644,9.25,,,, +US-IL-60645,US,IL,60645,9.25,,,, +US-IL-60646,US,IL,60646,9.25,,,, +US-IL-60647,US,IL,60647,9.25,,,, +US-IL-60649,US,IL,60649,9.25,,,, +US-IL-60651,US,IL,60651,9.25,,,, +US-IL-60652,US,IL,60652,9.25,,,, +US-IL-60653,US,IL,60653,9.25,,,, +US-IL-60654,US,IL,60654,9.25,,,, +US-IL-60655,US,IL,60655,9.25,,,, +US-IL-60656,US,IL,60656,9.25,,,, +US-IL-60657,US,IL,60657,9.25,,,, +US-IL-60659,US,IL,60659,9.25,,,, +US-IL-60660,US,IL,60660,9.25,,,, +US-IL-60661,US,IL,60661,9.25,,,, +US-IL-60664,US,IL,60664,9.25,,,, +US-IL-60666,US,IL,60666,9.25,,,, +US-IL-60668,US,IL,60668,9.25,,,, +US-IL-60669,US,IL,60669,9.25,,,, +US-IL-60670,US,IL,60670,9.25,,,, +US-IL-60673,US,IL,60673,9.25,,,, +US-IL-60674,US,IL,60674,9.25,,,, +US-IL-60675,US,IL,60675,9.25,,,, +US-IL-60677,US,IL,60677,9.25,,,, +US-IL-60678,US,IL,60678,9.25,,,, +US-IL-60680,US,IL,60680,9.25,,,, +US-IL-60681,US,IL,60681,9.25,,,, +US-IL-60682,US,IL,60682,9.25,,,, +US-IL-60685,US,IL,60685,9.25,,,, +US-IL-60686,US,IL,60686,9.25,,,, +US-IL-60687,US,IL,60687,9.25,,,, +US-IL-60688,US,IL,60688,9.25,,,, +US-IL-60689,US,IL,60689,9.25,,,, +US-IL-60690,US,IL,60690,9.25,,,, +US-IL-60691,US,IL,60691,9.25,,,, +US-IL-60693,US,IL,60693,9.25,,,, +US-IL-60694,US,IL,60694,9.25,,,, +US-IL-60695,US,IL,60695,9.25,,,, +US-IL-60696,US,IL,60696,9.25,,,, +US-IL-60697,US,IL,60697,9.25,,,, +US-IL-60699,US,IL,60699,9.25,,,, +US-IL-60701,US,IL,60701,8,,,, +US-IL-60706,US,IL,60706,9.25,,,, +US-IL-60707,US,IL,60707,9,,,, +US-IL-60712,US,IL,60712,9,,,, +US-IL-60714,US,IL,60714,9.25,,,, +US-IL-60803,US,IL,60803,8.75,,,, +US-IL-60804,US,IL,60804,9.5,,,, +US-IL-60805,US,IL,60805,8.75,,,, +US-IL-60827,US,IL,60827,9,,,, +US-IL-60901,US,IL,60901,6.25,,,, +US-IL-60910,US,IL,60910,6.25,,,, +US-IL-60911,US,IL,60911,6.25,,,, +US-IL-60912,US,IL,60912,6.25,,,, +US-IL-60913,US,IL,60913,6.25,,,, +US-IL-60914,US,IL,60914,6.25,,,, +US-IL-60915,US,IL,60915,6.25,,,, +US-IL-60917,US,IL,60917,6.25,,,, +US-IL-60918,US,IL,60918,6.25,,,, +US-IL-60919,US,IL,60919,6.25,,,, +US-IL-60920,US,IL,60920,6.25,,,, +US-IL-60921,US,IL,60921,6.25,,,, +US-IL-60922,US,IL,60922,6.25,,,, +US-IL-60924,US,IL,60924,6.25,,,, +US-IL-60926,US,IL,60926,6.25,,,, +US-IL-60927,US,IL,60927,6.25,,,, +US-IL-60928,US,IL,60928,6.25,,,, +US-IL-60929,US,IL,60929,6.25,,,, +US-IL-60930,US,IL,60930,6.25,,,, +US-IL-60931,US,IL,60931,6.25,,,, +US-IL-60932,US,IL,60932,6.5,,,, +US-IL-60933,US,IL,60933,6.25,,,, +US-IL-60934,US,IL,60934,6.25,,,, +US-IL-60935,US,IL,60935,6.25,,,, +US-IL-60936,US,IL,60936,6.25,,,, +US-IL-60938,US,IL,60938,6.25,,,, +US-IL-60939,US,IL,60939,6.25,,,, +US-IL-60940,US,IL,60940,6.25,,,, +US-IL-60941,US,IL,60941,6.25,,,, +US-IL-60942,US,IL,60942,6.5,,,, +US-IL-60944,US,IL,60944,9.25,,,, +US-IL-60945,US,IL,60945,6.25,,,, +US-IL-60946,US,IL,60946,6.25,,,, +US-IL-60948,US,IL,60948,6.25,,,, +US-IL-60949,US,IL,60949,7.5,,,, +US-IL-60950,US,IL,60950,6.25,,,, +US-IL-60951,US,IL,60951,6.25,,,, +US-IL-60952,US,IL,60952,6.25,,,, +US-IL-60953,US,IL,60953,6.25,,,, +US-IL-60954,US,IL,60954,6.25,,,, +US-IL-60955,US,IL,60955,6.25,,,, +US-IL-60956,US,IL,60956,6.25,,,, +US-IL-60957,US,IL,60957,6.25,,,, +US-IL-60958,US,IL,60958,6.25,,,, +US-IL-60959,US,IL,60959,6.25,,,, +US-IL-60960,US,IL,60960,6.25,,,, +US-IL-60961,US,IL,60961,6.25,,,, +US-IL-60962,US,IL,60962,6.25,,,, +US-IL-60963,US,IL,60963,6.5,,,, +US-IL-60964,US,IL,60964,6.25,,,, +US-IL-60966,US,IL,60966,6.25,,,, +US-IL-60967,US,IL,60967,6.25,,,, +US-IL-60968,US,IL,60968,6.25,,,, +US-IL-60969,US,IL,60969,6.25,,,, +US-IL-60970,US,IL,60970,7,,,, +US-IL-60973,US,IL,60973,6.25,,,, +US-IL-60974,US,IL,60974,6.25,,,, +US-IL-61001,US,IL,61001,6.75,,,, +US-IL-61006,US,IL,61006,6.25,,,, +US-IL-61007,US,IL,61007,6.25,,,, +US-IL-61008,US,IL,61008,6.75,,,, +US-IL-61010,US,IL,61010,7.25,,,, +US-IL-61011,US,IL,61011,6.75,,,, +US-IL-61012,US,IL,61012,6.75,,,, +US-IL-61013,US,IL,61013,6.75,,,, +US-IL-61014,US,IL,61014,6.5,,,, +US-IL-61015,US,IL,61015,6.25,,,, +US-IL-61016,US,IL,61016,7.25,,,, +US-IL-61018,US,IL,61018,6.75,,,, +US-IL-61019,US,IL,61019,6.75,,,, +US-IL-61020,US,IL,61020,6.25,,,, +US-IL-61021,US,IL,61021,6.75,,,, +US-IL-61024,US,IL,61024,7.25,,,, +US-IL-61025,US,IL,61025,7.25,,,, +US-IL-61027,US,IL,61027,6.75,,,, +US-IL-61028,US,IL,61028,6.75,,,, +US-IL-61030,US,IL,61030,6.25,,,, +US-IL-61031,US,IL,61031,6.25,,,, +US-IL-61032,US,IL,61032,8,,,, +US-IL-61036,US,IL,61036,6.75,,,, +US-IL-61037,US,IL,61037,6.25,,,, +US-IL-61038,US,IL,61038,6.75,,,, +US-IL-61039,US,IL,61039,6.75,,,, +US-IL-61041,US,IL,61041,6.75,,,, +US-IL-61042,US,IL,61042,6.25,,,, +US-IL-61043,US,IL,61043,6.25,,,, +US-IL-61044,US,IL,61044,6.75,,,, +US-IL-61046,US,IL,61046,6.5,,,, +US-IL-61047,US,IL,61047,6.25,,,, +US-IL-61048,US,IL,61048,6.75,,,, +US-IL-61049,US,IL,61049,6.25,,,, +US-IL-61050,US,IL,61050,6.75,,,, +US-IL-61051,US,IL,61051,6.5,,,, +US-IL-61052,US,IL,61052,6.25,,,, +US-IL-61053,US,IL,61053,6.5,,,, +US-IL-61054,US,IL,61054,6.25,,,, +US-IL-61057,US,IL,61057,6.25,,,, +US-IL-61059,US,IL,61059,6.75,,,, +US-IL-61060,US,IL,61060,6.75,,,, +US-IL-61061,US,IL,61061,7.25,,,, +US-IL-61062,US,IL,61062,6.75,,,, +US-IL-61063,US,IL,61063,7.25,,,, +US-IL-61064,US,IL,61064,6.25,,,, +US-IL-61065,US,IL,61065,6.75,,,, +US-IL-61067,US,IL,61067,6.75,,,, +US-IL-61068,US,IL,61068,7,,,, +US-IL-61070,US,IL,61070,6.75,,,, +US-IL-61071,US,IL,61071,6.75,,,, +US-IL-61072,US,IL,61072,7.25,,,, +US-IL-61073,US,IL,61073,7.25,,,, +US-IL-61074,US,IL,61074,6.5,,,, +US-IL-61075,US,IL,61075,6.75,,,, +US-IL-61077,US,IL,61077,7.25,,,, +US-IL-61078,US,IL,61078,6.5,,,, +US-IL-61079,US,IL,61079,7.25,,,, +US-IL-61080,US,IL,61080,7.25,,,, +US-IL-61081,US,IL,61081,6.75,,,, +US-IL-61084,US,IL,61084,6.25,,,, +US-IL-61085,US,IL,61085,6.75,,,, +US-IL-61087,US,IL,61087,6.75,,,, +US-IL-61088,US,IL,61088,7.25,,,, +US-IL-61089,US,IL,61089,6.75,,,, +US-IL-61091,US,IL,61091,6.25,,,, +US-IL-61101,US,IL,61101,8.25,,,, +US-IL-61102,US,IL,61102,8.25,,,, +US-IL-61103,US,IL,61103,8.25,,,, +US-IL-61104,US,IL,61104,8.25,,,, +US-IL-61105,US,IL,61105,8.25,,,, +US-IL-61106,US,IL,61106,8.25,,,, +US-IL-61107,US,IL,61107,8.25,,,, +US-IL-61108,US,IL,61108,8.25,,,, +US-IL-61109,US,IL,61109,8.25,,,, +US-IL-61110,US,IL,61110,8.25,,,, +US-IL-61111,US,IL,61111,7.25,,,, +US-IL-61112,US,IL,61112,8.25,,,, +US-IL-61114,US,IL,61114,8.25,,,, +US-IL-61115,US,IL,61115,8.25,,,, +US-IL-61125,US,IL,61125,8.25,,,, +US-IL-61126,US,IL,61126,8.25,,,, +US-IL-61130,US,IL,61130,7.25,,,, +US-IL-61131,US,IL,61131,7.25,,,, +US-IL-61132,US,IL,61132,7.25,,,, +US-IL-61201,US,IL,61201,7.5,,,, +US-IL-61204,US,IL,61204,7.5,,,, +US-IL-61230,US,IL,61230,6.25,,,, +US-IL-61231,US,IL,61231,6.25,,,, +US-IL-61232,US,IL,61232,6.25,,,, +US-IL-61233,US,IL,61233,6.25,,,, +US-IL-61234,US,IL,61234,6.25,,,, +US-IL-61235,US,IL,61235,6.25,,,, +US-IL-61236,US,IL,61236,6.75,,,, +US-IL-61237,US,IL,61237,6.25,,,, +US-IL-61238,US,IL,61238,6.25,,,, +US-IL-61239,US,IL,61239,6.75,,,, +US-IL-61240,US,IL,61240,6.25,,,, +US-IL-61241,US,IL,61241,6.75,,,, +US-IL-61242,US,IL,61242,6.25,,,, +US-IL-61243,US,IL,61243,6.25,,,, +US-IL-61244,US,IL,61244,6.75,,,, +US-IL-61250,US,IL,61250,6.25,,,, +US-IL-61251,US,IL,61251,6.25,,,, +US-IL-61252,US,IL,61252,7,,,, +US-IL-61254,US,IL,61254,6.75,,,, +US-IL-61256,US,IL,61256,6.75,,,, +US-IL-61257,US,IL,61257,6.25,,,, +US-IL-61258,US,IL,61258,6.25,,,, +US-IL-61259,US,IL,61259,6.25,,,, +US-IL-61260,US,IL,61260,6.25,,,, +US-IL-61261,US,IL,61261,6.25,,,, +US-IL-61262,US,IL,61262,6.25,,,, +US-IL-61263,US,IL,61263,6.25,,,, +US-IL-61264,US,IL,61264,6.25,,,, +US-IL-61265,US,IL,61265,7.5,,,, +US-IL-61266,US,IL,61266,7.5,,,, +US-IL-61270,US,IL,61270,6.25,,,, +US-IL-61272,US,IL,61272,6.25,,,, +US-IL-61273,US,IL,61273,6.25,,,, +US-IL-61274,US,IL,61274,6.25,,,, +US-IL-61275,US,IL,61275,6.25,,,, +US-IL-61276,US,IL,61276,6.25,,,, +US-IL-61277,US,IL,61277,6.25,,,, +US-IL-61278,US,IL,61278,6.25,,,, +US-IL-61279,US,IL,61279,6.25,,,, +US-IL-61281,US,IL,61281,6.25,,,, +US-IL-61282,US,IL,61282,6.75,,,, +US-IL-61283,US,IL,61283,6.75,,,, +US-IL-61284,US,IL,61284,6.25,,,, +US-IL-61285,US,IL,61285,6.5,,,, +US-IL-61299,US,IL,61299,7.5,,,, +US-IL-61301,US,IL,61301,7,,,, +US-IL-61310,US,IL,61310,6.25,,,, +US-IL-61311,US,IL,61311,6.25,,,, +US-IL-61312,US,IL,61312,6.75,,,, +US-IL-61313,US,IL,61313,6.25,,,, +US-IL-61314,US,IL,61314,6.75,,,, +US-IL-61315,US,IL,61315,6.75,,,, +US-IL-61316,US,IL,61316,6.5,,,, +US-IL-61317,US,IL,61317,6.75,,,, +US-IL-61318,US,IL,61318,6.25,,,, +US-IL-61319,US,IL,61319,6.25,,,, +US-IL-61320,US,IL,61320,6.75,,,, +US-IL-61321,US,IL,61321,6.5,,,, +US-IL-61322,US,IL,61322,6.75,,,, +US-IL-61323,US,IL,61323,6.75,,,, +US-IL-61324,US,IL,61324,6.25,,,, +US-IL-61325,US,IL,61325,6.5,,,, +US-IL-61326,US,IL,61326,6.25,,,, +US-IL-61327,US,IL,61327,6.25,,,, +US-IL-61328,US,IL,61328,6.75,,,, +US-IL-61329,US,IL,61329,6.75,,,, +US-IL-61330,US,IL,61330,6.75,,,, +US-IL-61331,US,IL,61331,6.25,,,, +US-IL-61332,US,IL,61332,6.5,,,, +US-IL-61333,US,IL,61333,6.25,,,, +US-IL-61334,US,IL,61334,6.5,,,, +US-IL-61335,US,IL,61335,6.25,,,, +US-IL-61336,US,IL,61336,6.25,,,, +US-IL-61337,US,IL,61337,6.75,,,, +US-IL-61338,US,IL,61338,6.75,,,, +US-IL-61340,US,IL,61340,6.25,,,, +US-IL-61341,US,IL,61341,6.5,,,, +US-IL-61342,US,IL,61342,6.5,,,, +US-IL-61344,US,IL,61344,6.75,,,, +US-IL-61345,US,IL,61345,6.75,,,, +US-IL-61346,US,IL,61346,6.75,,,, +US-IL-61348,US,IL,61348,6.5,,,, +US-IL-61349,US,IL,61349,6.75,,,, +US-IL-61350,US,IL,61350,7,,,, +US-IL-61353,US,IL,61353,6.25,,,, +US-IL-61354,US,IL,61354,7.5,,,, +US-IL-61356,US,IL,61356,7.25,,,, +US-IL-61358,US,IL,61358,6.5,,,, +US-IL-61359,US,IL,61359,6.75,,,, +US-IL-61360,US,IL,61360,6.5,,,, +US-IL-61361,US,IL,61361,6.75,,,, +US-IL-61362,US,IL,61362,6.75,,,, +US-IL-61363,US,IL,61363,6.25,,,, +US-IL-61364,US,IL,61364,7.5,,,, +US-IL-61367,US,IL,61367,6.25,,,, +US-IL-61368,US,IL,61368,6.75,,,, +US-IL-61369,US,IL,61369,6.25,,,, +US-IL-61370,US,IL,61370,6.5,,,, +US-IL-61371,US,IL,61371,6.5,,,, +US-IL-61372,US,IL,61372,6.5,,,, +US-IL-61373,US,IL,61373,6.5,,,, +US-IL-61374,US,IL,61374,6.75,,,, +US-IL-61375,US,IL,61375,6.25,,,, +US-IL-61376,US,IL,61376,6.75,,,, +US-IL-61377,US,IL,61377,6.25,,,, +US-IL-61378,US,IL,61378,6.25,,,, +US-IL-61379,US,IL,61379,6.75,,,, +US-IL-61401,US,IL,61401,8.5,,,, +US-IL-61402,US,IL,61402,8.5,,,, +US-IL-61410,US,IL,61410,7.5,,,, +US-IL-61411,US,IL,61411,6.75,,,, +US-IL-61412,US,IL,61412,7.25,,,, +US-IL-61413,US,IL,61413,6.25,,,, +US-IL-61414,US,IL,61414,7.5,,,, +US-IL-61415,US,IL,61415,6.75,,,, +US-IL-61416,US,IL,61416,6.75,,,, +US-IL-61417,US,IL,61417,7.25,,,, +US-IL-61418,US,IL,61418,7.25,,,, +US-IL-61419,US,IL,61419,6.25,,,, +US-IL-61420,US,IL,61420,6.75,,,, +US-IL-61421,US,IL,61421,6.75,,,, +US-IL-61422,US,IL,61422,7.25,,,, +US-IL-61423,US,IL,61423,7.25,,,, +US-IL-61424,US,IL,61424,6.25,,,, +US-IL-61425,US,IL,61425,7.25,,,, +US-IL-61426,US,IL,61426,6.75,,,, +US-IL-61427,US,IL,61427,6.75,,,, +US-IL-61428,US,IL,61428,7.5,,,, +US-IL-61430,US,IL,61430,7.5,,,, +US-IL-61431,US,IL,61431,6.75,,,, +US-IL-61432,US,IL,61432,6.75,,,, +US-IL-61433,US,IL,61433,6.75,,,, +US-IL-61434,US,IL,61434,6.25,,,, +US-IL-61435,US,IL,61435,7.25,,,, +US-IL-61436,US,IL,61436,7.5,,,, +US-IL-61437,US,IL,61437,7.25,,,, +US-IL-61438,US,IL,61438,6.75,,,, +US-IL-61439,US,IL,61439,7.5,,,, +US-IL-61440,US,IL,61440,6.75,,,, +US-IL-61441,US,IL,61441,6.75,,,, +US-IL-61442,US,IL,61442,6.25,,,, +US-IL-61443,US,IL,61443,6.75,,,, +US-IL-61447,US,IL,61447,7.25,,,, +US-IL-61448,US,IL,61448,7.5,,,, +US-IL-61449,US,IL,61449,6.75,,,, +US-IL-61450,US,IL,61450,6.25,,,, +US-IL-61451,US,IL,61451,6.75,,,, +US-IL-61452,US,IL,61452,7.25,,,, +US-IL-61453,US,IL,61453,7.25,,,, +US-IL-61454,US,IL,61454,7.25,,,, +US-IL-61455,US,IL,61455,7.75,,,, +US-IL-61458,US,IL,61458,7.5,,,, +US-IL-61459,US,IL,61459,6.75,,,, +US-IL-61460,US,IL,61460,7.25,,,, +US-IL-61462,US,IL,61462,9.25,,,, +US-IL-61465,US,IL,61465,6.25,,,, +US-IL-61466,US,IL,61466,6.25,,,, +US-IL-61467,US,IL,61467,7.5,,,, +US-IL-61468,US,IL,61468,6.25,,,, +US-IL-61469,US,IL,61469,7.25,,,, +US-IL-61470,US,IL,61470,6.75,,,, +US-IL-61471,US,IL,61471,7.25,,,, +US-IL-61472,US,IL,61472,7.5,,,, +US-IL-61473,US,IL,61473,7.25,,,, +US-IL-61474,US,IL,61474,7.5,,,, +US-IL-61475,US,IL,61475,6.75,,,, +US-IL-61476,US,IL,61476,6.25,,,, +US-IL-61477,US,IL,61477,6.75,,,, +US-IL-61478,US,IL,61478,7.25,,,, +US-IL-61479,US,IL,61479,6.75,,,, +US-IL-61480,US,IL,61480,7.25,,,, +US-IL-61482,US,IL,61482,6.75,,,, +US-IL-61483,US,IL,61483,6.75,,,, +US-IL-61484,US,IL,61484,6.75,,,, +US-IL-61485,US,IL,61485,7.5,,,, +US-IL-61486,US,IL,61486,6.25,,,, +US-IL-61488,US,IL,61488,7.5,,,, +US-IL-61489,US,IL,61489,7.5,,,, +US-IL-61490,US,IL,61490,6.25,,,, +US-IL-61491,US,IL,61491,6.75,,,, +US-IL-61501,US,IL,61501,6.75,,,, +US-IL-61516,US,IL,61516,7.25,,,, +US-IL-61517,US,IL,61517,6.75,,,, +US-IL-61519,US,IL,61519,6.75,,,, +US-IL-61520,US,IL,61520,7.25,,,, +US-IL-61523,US,IL,61523,7.25,,,, +US-IL-61524,US,IL,61524,6.75,,,, +US-IL-61525,US,IL,61525,6.75,,,, +US-IL-61526,US,IL,61526,6.75,,,, +US-IL-61528,US,IL,61528,6.75,,,, +US-IL-61529,US,IL,61529,6.75,,,, +US-IL-61530,US,IL,61530,7.25,,,, +US-IL-61531,US,IL,61531,6.75,,,, +US-IL-61532,US,IL,61532,6.25,,,, +US-IL-61533,US,IL,61533,6.75,,,, +US-IL-61534,US,IL,61534,6.75,,,, +US-IL-61535,US,IL,61535,6.75,,,, +US-IL-61536,US,IL,61536,6.75,,,, +US-IL-61537,US,IL,61537,6.25,,,, +US-IL-61539,US,IL,61539,6.75,,,, +US-IL-61540,US,IL,61540,6.25,,,, +US-IL-61541,US,IL,61541,6.25,,,, +US-IL-61542,US,IL,61542,6.75,,,, +US-IL-61543,US,IL,61543,6.75,,,, +US-IL-61544,US,IL,61544,6.75,,,, +US-IL-61545,US,IL,61545,7.25,,,, +US-IL-61546,US,IL,61546,6.75,,,, +US-IL-61547,US,IL,61547,6.75,,,, +US-IL-61548,US,IL,61548,7.25,,,, +US-IL-61550,US,IL,61550,6.75,,,, +US-IL-61552,US,IL,61552,6.75,,,, +US-IL-61553,US,IL,61553,6.75,,,, +US-IL-61554,US,IL,61554,8,,,, +US-IL-61555,US,IL,61555,8,,,, +US-IL-61558,US,IL,61558,8,,,, +US-IL-61559,US,IL,61559,6.75,,,, +US-IL-61560,US,IL,61560,6.25,,,, +US-IL-61561,US,IL,61561,7.25,,,, +US-IL-61562,US,IL,61562,6.75,,,, +US-IL-61563,US,IL,61563,6.75,,,, +US-IL-61564,US,IL,61564,7,,,, +US-IL-61565,US,IL,61565,6.25,,,, +US-IL-61567,US,IL,61567,6.25,,,, +US-IL-61568,US,IL,61568,6.75,,,, +US-IL-61569,US,IL,61569,6.75,,,, +US-IL-61570,US,IL,61570,7.25,,,, +US-IL-61571,US,IL,61571,8,,,, +US-IL-61572,US,IL,61572,7.5,,,, +US-IL-61601,US,IL,61601,8.25,,,, +US-IL-61602,US,IL,61602,8.25,,,, +US-IL-61603,US,IL,61603,8.25,,,, +US-IL-61604,US,IL,61604,8.25,,,, +US-IL-61605,US,IL,61605,8.25,,,, +US-IL-61606,US,IL,61606,8.25,,,, +US-IL-61607,US,IL,61607,7.25,,,, +US-IL-61610,US,IL,61610,7.75,,,, +US-IL-61611,US,IL,61611,8,,,, +US-IL-61612,US,IL,61612,8.25,,,, +US-IL-61613,US,IL,61613,8.25,,,, +US-IL-61614,US,IL,61614,8.25,,,, +US-IL-61615,US,IL,61615,8.25,,,, +US-IL-61616,US,IL,61616,8.25,,,, +US-IL-61625,US,IL,61625,8.25,,,, +US-IL-61629,US,IL,61629,8.25,,,, +US-IL-61630,US,IL,61630,8.25,,,, +US-IL-61633,US,IL,61633,8.25,,,, +US-IL-61634,US,IL,61634,8.25,,,, +US-IL-61635,US,IL,61635,8,,,, +US-IL-61636,US,IL,61636,8.25,,,, +US-IL-61637,US,IL,61637,8.25,,,, +US-IL-61638,US,IL,61638,8.25,,,, +US-IL-61639,US,IL,61639,8.25,,,, +US-IL-61641,US,IL,61641,7.25,,,, +US-IL-61643,US,IL,61643,8.25,,,, +US-IL-61650,US,IL,61650,8.25,,,, +US-IL-61651,US,IL,61651,8.25,,,, +US-IL-61652,US,IL,61652,8.25,,,, +US-IL-61653,US,IL,61653,8.25,,,, +US-IL-61654,US,IL,61654,8.25,,,, +US-IL-61655,US,IL,61655,8.25,,,, +US-IL-61656,US,IL,61656,8.25,,,, +US-IL-61701,US,IL,61701,7.75,,,, +US-IL-61702,US,IL,61702,7.75,,,, +US-IL-61704,US,IL,61704,7.75,,,, +US-IL-61705,US,IL,61705,6.25,,,, +US-IL-61709,US,IL,61709,7.75,,,, +US-IL-61710,US,IL,61710,7.75,,,, +US-IL-61720,US,IL,61720,6.25,,,, +US-IL-61721,US,IL,61721,6.75,,,, +US-IL-61722,US,IL,61722,6.25,,,, +US-IL-61723,US,IL,61723,7.75,,,, +US-IL-61724,US,IL,61724,6.25,,,, +US-IL-61725,US,IL,61725,6.75,,,, +US-IL-61726,US,IL,61726,6.25,,,, +US-IL-61727,US,IL,61727,6.75,,,, +US-IL-61728,US,IL,61728,6.25,,,, +US-IL-61729,US,IL,61729,7.25,,,, +US-IL-61730,US,IL,61730,6.25,,,, +US-IL-61731,US,IL,61731,6.25,,,, +US-IL-61732,US,IL,61732,6.25,,,, +US-IL-61733,US,IL,61733,6.75,,,, +US-IL-61734,US,IL,61734,6.75,,,, +US-IL-61735,US,IL,61735,6.25,,,, +US-IL-61736,US,IL,61736,6.25,,,, +US-IL-61737,US,IL,61737,6.25,,,, +US-IL-61738,US,IL,61738,7.25,,,, +US-IL-61739,US,IL,61739,6.25,,,, +US-IL-61740,US,IL,61740,6.25,,,, +US-IL-61741,US,IL,61741,6.25,,,, +US-IL-61742,US,IL,61742,7.25,,,, +US-IL-61743,US,IL,61743,6.25,,,, +US-IL-61744,US,IL,61744,6.25,,,, +US-IL-61745,US,IL,61745,6.25,,,, +US-IL-61747,US,IL,61747,6.75,,,, +US-IL-61748,US,IL,61748,6.25,,,, +US-IL-61749,US,IL,61749,6.25,,,, +US-IL-61750,US,IL,61750,6.25,,,, +US-IL-61751,US,IL,61751,7.75,,,, +US-IL-61752,US,IL,61752,6.75,,,, +US-IL-61753,US,IL,61753,6.75,,,, +US-IL-61754,US,IL,61754,6.75,,,, +US-IL-61755,US,IL,61755,6.75,,,, +US-IL-61756,US,IL,61756,7.5,,,, +US-IL-61758,US,IL,61758,6.25,,,, +US-IL-61759,US,IL,61759,6.75,,,, +US-IL-61760,US,IL,61760,7.25,,,, +US-IL-61761,US,IL,61761,7.75,,,, +US-IL-61764,US,IL,61764,6.25,,,, +US-IL-61769,US,IL,61769,6.25,,,, +US-IL-61770,US,IL,61770,6.25,,,, +US-IL-61771,US,IL,61771,7.25,,,, +US-IL-61772,US,IL,61772,6.25,,,, +US-IL-61773,US,IL,61773,6.25,,,, +US-IL-61774,US,IL,61774,6.25,,,, +US-IL-61775,US,IL,61775,6.25,,,, +US-IL-61776,US,IL,61776,6.25,,,, +US-IL-61777,US,IL,61777,6.25,,,, +US-IL-61778,US,IL,61778,6.25,,,, +US-IL-61790,US,IL,61790,7.75,,,, +US-IL-61791,US,IL,61791,7.75,,,, +US-IL-61799,US,IL,61799,7.75,,,, +US-IL-61801,US,IL,61801,8.75,,,, +US-IL-61802,US,IL,61802,8.75,,,, +US-IL-61803,US,IL,61803,8.75,,,, +US-IL-61810,US,IL,61810,6.5,,,, +US-IL-61811,US,IL,61811,6.5,,,, +US-IL-61812,US,IL,61812,6.5,,,, +US-IL-61813,US,IL,61813,6.25,,,, +US-IL-61814,US,IL,61814,6.5,,,, +US-IL-61815,US,IL,61815,7.5,,,, +US-IL-61816,US,IL,61816,7.5,,,, +US-IL-61817,US,IL,61817,6.5,,,, +US-IL-61818,US,IL,61818,6.25,,,, +US-IL-61820,US,IL,61820,8.75,,,, +US-IL-61821,US,IL,61821,8.75,,,, +US-IL-61822,US,IL,61822,8.75,,,, +US-IL-61824,US,IL,61824,8.75,,,, +US-IL-61825,US,IL,61825,8.75,,,, +US-IL-61826,US,IL,61826,8.75,,,, +US-IL-61830,US,IL,61830,6.25,,,, +US-IL-61831,US,IL,61831,6.5,,,, +US-IL-61832,US,IL,61832,8.75,,,, +US-IL-61833,US,IL,61833,7.5,,,, +US-IL-61834,US,IL,61834,6.5,,,, +US-IL-61839,US,IL,61839,6.25,,,, +US-IL-61840,US,IL,61840,7.5,,,, +US-IL-61841,US,IL,61841,6.5,,,, +US-IL-61842,US,IL,61842,6.25,,,, +US-IL-61843,US,IL,61843,7.5,,,, +US-IL-61844,US,IL,61844,6.5,,,, +US-IL-61845,US,IL,61845,7.5,,,, +US-IL-61846,US,IL,61846,6.5,,,, +US-IL-61847,US,IL,61847,7.5,,,, +US-IL-61848,US,IL,61848,6.5,,,, +US-IL-61849,US,IL,61849,7.5,,,, +US-IL-61850,US,IL,61850,6.5,,,, +US-IL-61851,US,IL,61851,7.5,,,, +US-IL-61852,US,IL,61852,7.5,,,, +US-IL-61853,US,IL,61853,7.5,,,, +US-IL-61854,US,IL,61854,6.25,,,, +US-IL-61855,US,IL,61855,6.25,,,, +US-IL-61856,US,IL,61856,6.25,,,, +US-IL-61857,US,IL,61857,6.5,,,, +US-IL-61858,US,IL,61858,6.5,,,, +US-IL-61859,US,IL,61859,8.5,,,, +US-IL-61862,US,IL,61862,7.5,,,, +US-IL-61863,US,IL,61863,7.5,,,, +US-IL-61864,US,IL,61864,7.5,,,, +US-IL-61865,US,IL,61865,6.5,,,, +US-IL-61866,US,IL,61866,8.75,,,, +US-IL-61870,US,IL,61870,6.5,,,, +US-IL-61871,US,IL,61871,7.5,,,, +US-IL-61872,US,IL,61872,7.5,,,, +US-IL-61873,US,IL,61873,8,,,, +US-IL-61874,US,IL,61874,8,,,, +US-IL-61875,US,IL,61875,7.5,,,, +US-IL-61876,US,IL,61876,6.5,,,, +US-IL-61877,US,IL,61877,7.5,,,, +US-IL-61878,US,IL,61878,7.5,,,, +US-IL-61880,US,IL,61880,7.5,,,, +US-IL-61882,US,IL,61882,6.25,,,, +US-IL-61883,US,IL,61883,6.5,,,, +US-IL-61884,US,IL,61884,6.25,,,, +US-IL-61910,US,IL,61910,6.75,,,, +US-IL-61911,US,IL,61911,6.25,,,, +US-IL-61912,US,IL,61912,6.25,,,, +US-IL-61913,US,IL,61913,6.25,,,, +US-IL-61914,US,IL,61914,6.75,,,, +US-IL-61917,US,IL,61917,6.25,,,, +US-IL-61919,US,IL,61919,6.25,,,, +US-IL-61920,US,IL,61920,6.75,,,, +US-IL-61924,US,IL,61924,6.25,,,, +US-IL-61925,US,IL,61925,7.5,,,, +US-IL-61928,US,IL,61928,6.75,,,, +US-IL-61929,US,IL,61929,6.25,,,, +US-IL-61930,US,IL,61930,6.25,,,, +US-IL-61931,US,IL,61931,6.25,,,, +US-IL-61932,US,IL,61932,6.25,,,, +US-IL-61933,US,IL,61933,6.25,,,, +US-IL-61936,US,IL,61936,6.25,,,, +US-IL-61937,US,IL,61937,6.75,,,, +US-IL-61938,US,IL,61938,6.75,,,, +US-IL-61940,US,IL,61940,6.25,,,, +US-IL-61941,US,IL,61941,6.25,,,, +US-IL-61942,US,IL,61942,6.25,,,, +US-IL-61943,US,IL,61943,6.25,,,, +US-IL-61944,US,IL,61944,6.75,,,, +US-IL-61949,US,IL,61949,6.25,,,, +US-IL-61951,US,IL,61951,6.75,,,, +US-IL-61953,US,IL,61953,7.25,,,, +US-IL-61955,US,IL,61955,6.25,,,, +US-IL-61956,US,IL,61956,7.25,,,, +US-IL-61957,US,IL,61957,6.25,,,, +US-IL-62001,US,IL,62001,6.6,,,, +US-IL-62002,US,IL,62002,7.85,,,, +US-IL-62006,US,IL,62006,7,,,, +US-IL-62009,US,IL,62009,6.25,,,, +US-IL-62010,US,IL,62010,6.85,,,, +US-IL-62011,US,IL,62011,6.25,,,, +US-IL-62012,US,IL,62012,7,,,, +US-IL-62013,US,IL,62013,7,,,, +US-IL-62014,US,IL,62014,6.25,,,, +US-IL-62015,US,IL,62015,6.25,,,, +US-IL-62016,US,IL,62016,6.25,,,, +US-IL-62017,US,IL,62017,6.25,,,, +US-IL-62018,US,IL,62018,6.85,,,, +US-IL-62019,US,IL,62019,6.25,,,, +US-IL-62021,US,IL,62021,6.85,,,, +US-IL-62022,US,IL,62022,7,,,, +US-IL-62023,US,IL,62023,6.25,,,, +US-IL-62024,US,IL,62024,6.85,,,, +US-IL-62025,US,IL,62025,6.85,,,, +US-IL-62026,US,IL,62026,6.85,,,, +US-IL-62027,US,IL,62027,6.25,,,, +US-IL-62028,US,IL,62028,7,,,, +US-IL-62030,US,IL,62030,7,,,, +US-IL-62031,US,IL,62031,7,,,, +US-IL-62032,US,IL,62032,6.25,,,, +US-IL-62033,US,IL,62033,6.25,,,, +US-IL-62034,US,IL,62034,6.85,,,, +US-IL-62035,US,IL,62035,6.85,,,, +US-IL-62036,US,IL,62036,7,,,, +US-IL-62037,US,IL,62037,7,,,, +US-IL-62040,US,IL,62040,8.35,,,, +US-IL-62044,US,IL,62044,6.25,,,, +US-IL-62045,US,IL,62045,7,,,, +US-IL-62046,US,IL,62046,6.6,,,, +US-IL-62047,US,IL,62047,7,,,, +US-IL-62048,US,IL,62048,6.85,,,, +US-IL-62049,US,IL,62049,6.25,,,, +US-IL-62050,US,IL,62050,6.25,,,, +US-IL-62051,US,IL,62051,6.25,,,, +US-IL-62052,US,IL,62052,7.5,,,, +US-IL-62053,US,IL,62053,7,,,, +US-IL-62054,US,IL,62054,6.25,,,, +US-IL-62056,US,IL,62056,7.25,,,, +US-IL-62058,US,IL,62058,6.6,,,, +US-IL-62059,US,IL,62059,7.35,,,, +US-IL-62060,US,IL,62060,6.85,,,, +US-IL-62061,US,IL,62061,6.6,,,, +US-IL-62062,US,IL,62062,6.85,,,, +US-IL-62063,US,IL,62063,6.25,,,, +US-IL-62067,US,IL,62067,6.85,,,, +US-IL-62069,US,IL,62069,6.25,,,, +US-IL-62071,US,IL,62071,7.35,,,, +US-IL-62074,US,IL,62074,6.6,,,, +US-IL-62075,US,IL,62075,6.25,,,, +US-IL-62076,US,IL,62076,6.25,,,, +US-IL-62077,US,IL,62077,6.25,,,, +US-IL-62078,US,IL,62078,6.25,,,, +US-IL-62079,US,IL,62079,6.25,,,, +US-IL-62080,US,IL,62080,6.25,,,, +US-IL-62081,US,IL,62081,6.25,,,, +US-IL-62082,US,IL,62082,6.25,,,, +US-IL-62083,US,IL,62083,6.25,,,, +US-IL-62084,US,IL,62084,6.85,,,, +US-IL-62085,US,IL,62085,6.25,,,, +US-IL-62086,US,IL,62086,6.25,,,, +US-IL-62087,US,IL,62087,6.85,,,, +US-IL-62088,US,IL,62088,6.25,,,, +US-IL-62089,US,IL,62089,6.25,,,, +US-IL-62090,US,IL,62090,6.85,,,, +US-IL-62091,US,IL,62091,6.25,,,, +US-IL-62092,US,IL,62092,6.25,,,, +US-IL-62093,US,IL,62093,6.25,,,, +US-IL-62094,US,IL,62094,6.25,,,, +US-IL-62095,US,IL,62095,6.85,,,, +US-IL-62097,US,IL,62097,6.6,,,, +US-IL-62098,US,IL,62098,6.25,,,, +US-IL-62201,US,IL,62201,8.85,,,, +US-IL-62202,US,IL,62202,8.85,,,, +US-IL-62203,US,IL,62203,8.85,,,, +US-IL-62204,US,IL,62204,8.85,,,, +US-IL-62205,US,IL,62205,8.85,,,, +US-IL-62206,US,IL,62206,8.1,,,, +US-IL-62207,US,IL,62207,7.35,,,, +US-IL-62208,US,IL,62208,8.35,,,, +US-IL-62214,US,IL,62214,6.25,,,, +US-IL-62215,US,IL,62215,6.25,,,, +US-IL-62216,US,IL,62216,6.25,,,, +US-IL-62217,US,IL,62217,6.25,,,, +US-IL-62218,US,IL,62218,6.25,,,, +US-IL-62219,US,IL,62219,6.25,,,, +US-IL-62220,US,IL,62220,8.1,,,, +US-IL-62221,US,IL,62221,7.35,,,, +US-IL-62222,US,IL,62222,8.1,,,, +US-IL-62223,US,IL,62223,7.35,,,, +US-IL-62225,US,IL,62225,7.35,,,, +US-IL-62226,US,IL,62226,8.1,,,, +US-IL-62230,US,IL,62230,6.25,,,, +US-IL-62231,US,IL,62231,6.25,,,, +US-IL-62232,US,IL,62232,7.35,,,, +US-IL-62233,US,IL,62233,6.25,,,, +US-IL-62234,US,IL,62234,8.1,,,, +US-IL-62236,US,IL,62236,6.5,,,, +US-IL-62237,US,IL,62237,6.25,,,, +US-IL-62238,US,IL,62238,6.75,,,, +US-IL-62239,US,IL,62239,7.35,,,, +US-IL-62240,US,IL,62240,7.35,,,, +US-IL-62241,US,IL,62241,6.25,,,, +US-IL-62242,US,IL,62242,6.25,,,, +US-IL-62243,US,IL,62243,6.6,,,, +US-IL-62244,US,IL,62244,6.5,,,, +US-IL-62245,US,IL,62245,6.25,,,, +US-IL-62246,US,IL,62246,6.75,,,, +US-IL-62247,US,IL,62247,6.75,,,, +US-IL-62248,US,IL,62248,6.5,,,, +US-IL-62249,US,IL,62249,7.85,,,, +US-IL-62250,US,IL,62250,6.25,,,, +US-IL-62252,US,IL,62252,6.25,,,, +US-IL-62253,US,IL,62253,6.75,,,, +US-IL-62254,US,IL,62254,7.35,,,, +US-IL-62255,US,IL,62255,7.35,,,, +US-IL-62256,US,IL,62256,6.5,,,, +US-IL-62257,US,IL,62257,6.6,,,, +US-IL-62258,US,IL,62258,7.6,,,, +US-IL-62259,US,IL,62259,6.25,,,, +US-IL-62260,US,IL,62260,6.6,,,, +US-IL-62261,US,IL,62261,6.25,,,, +US-IL-62262,US,IL,62262,6.25,,,, +US-IL-62263,US,IL,62263,6.25,,,, +US-IL-62264,US,IL,62264,7.35,,,, +US-IL-62265,US,IL,62265,6.5,,,, +US-IL-62266,US,IL,62266,6.25,,,, +US-IL-62268,US,IL,62268,6.25,,,, +US-IL-62269,US,IL,62269,7.85,,,, +US-IL-62271,US,IL,62271,6.25,,,, +US-IL-62272,US,IL,62272,6.25,,,, +US-IL-62273,US,IL,62273,6.25,,,, +US-IL-62274,US,IL,62274,6.75,,,, +US-IL-62275,US,IL,62275,6.25,,,, +US-IL-62277,US,IL,62277,6.5,,,, +US-IL-62278,US,IL,62278,6.25,,,, +US-IL-62279,US,IL,62279,6.5,,,, +US-IL-62280,US,IL,62280,6.25,,,, +US-IL-62281,US,IL,62281,6.85,,,, +US-IL-62282,US,IL,62282,6.6,,,, +US-IL-62284,US,IL,62284,6.25,,,, +US-IL-62285,US,IL,62285,7.35,,,, +US-IL-62286,US,IL,62286,6.75,,,, +US-IL-62288,US,IL,62288,6.25,,,, +US-IL-62289,US,IL,62289,7.35,,,, +US-IL-62292,US,IL,62292,6.25,,,, +US-IL-62293,US,IL,62293,6.25,,,, +US-IL-62294,US,IL,62294,6.85,,,, +US-IL-62295,US,IL,62295,6.5,,,, +US-IL-62297,US,IL,62297,6.25,,,, +US-IL-62298,US,IL,62298,6.5,,,, +US-IL-62301,US,IL,62301,7.75,,,, +US-IL-62305,US,IL,62305,6.25,,,, +US-IL-62306,US,IL,62306,6.25,,,, +US-IL-62311,US,IL,62311,6.25,,,, +US-IL-62312,US,IL,62312,6.75,,,, +US-IL-62313,US,IL,62313,6.25,,,, +US-IL-62314,US,IL,62314,6.75,,,, +US-IL-62316,US,IL,62316,6.25,,,, +US-IL-62319,US,IL,62319,7.25,,,, +US-IL-62320,US,IL,62320,6.25,,,, +US-IL-62321,US,IL,62321,6.75,,,, +US-IL-62323,US,IL,62323,6.75,,,, +US-IL-62324,US,IL,62324,6.25,,,, +US-IL-62325,US,IL,62325,6.25,,,, +US-IL-62326,US,IL,62326,6.75,,,, +US-IL-62329,US,IL,62329,6.25,,,, +US-IL-62330,US,IL,62330,6.25,,,, +US-IL-62334,US,IL,62334,6.25,,,, +US-IL-62336,US,IL,62336,6.25,,,, +US-IL-62338,US,IL,62338,6.25,,,, +US-IL-62339,US,IL,62339,6.25,,,, +US-IL-62340,US,IL,62340,6.75,,,, +US-IL-62341,US,IL,62341,6.25,,,, +US-IL-62343,US,IL,62343,6.75,,,, +US-IL-62345,US,IL,62345,6.75,,,, +US-IL-62346,US,IL,62346,6.25,,,, +US-IL-62347,US,IL,62347,6.25,,,, +US-IL-62348,US,IL,62348,6.25,,,, +US-IL-62349,US,IL,62349,6.25,,,, +US-IL-62351,US,IL,62351,6.25,,,, +US-IL-62352,US,IL,62352,6.75,,,, +US-IL-62353,US,IL,62353,6.5,,,, +US-IL-62354,US,IL,62354,7,,,, +US-IL-62355,US,IL,62355,6.75,,,, +US-IL-62356,US,IL,62356,6.75,,,, +US-IL-62357,US,IL,62357,6.75,,,, +US-IL-62358,US,IL,62358,6.25,,,, +US-IL-62359,US,IL,62359,6.25,,,, +US-IL-62360,US,IL,62360,6.25,,,, +US-IL-62361,US,IL,62361,6.75,,,, +US-IL-62362,US,IL,62362,6.75,,,, +US-IL-62363,US,IL,62363,6.75,,,, +US-IL-62365,US,IL,62365,6.25,,,, +US-IL-62366,US,IL,62366,6.75,,,, +US-IL-62367,US,IL,62367,6.25,,,, +US-IL-62370,US,IL,62370,6.75,,,, +US-IL-62373,US,IL,62373,6.25,,,, +US-IL-62374,US,IL,62374,6.75,,,, +US-IL-62375,US,IL,62375,6.5,,,, +US-IL-62376,US,IL,62376,6.25,,,, +US-IL-62378,US,IL,62378,6.5,,,, +US-IL-62379,US,IL,62379,6.25,,,, +US-IL-62380,US,IL,62380,6.25,,,, +US-IL-62401,US,IL,62401,6.5,,,, +US-IL-62410,US,IL,62410,6.25,,,, +US-IL-62411,US,IL,62411,6.5,,,, +US-IL-62413,US,IL,62413,6.25,,,, +US-IL-62414,US,IL,62414,6.5,,,, +US-IL-62417,US,IL,62417,7.25,,,, +US-IL-62418,US,IL,62418,6.25,,,, +US-IL-62419,US,IL,62419,6.75,,,, +US-IL-62420,US,IL,62420,7.25,,,, +US-IL-62421,US,IL,62421,6.75,,,, +US-IL-62422,US,IL,62422,6.25,,,, +US-IL-62423,US,IL,62423,7.25,,,, +US-IL-62424,US,IL,62424,6.5,,,, +US-IL-62425,US,IL,62425,6.75,,,, +US-IL-62426,US,IL,62426,6.5,,,, +US-IL-62427,US,IL,62427,6.25,,,, +US-IL-62428,US,IL,62428,6.75,,,, +US-IL-62431,US,IL,62431,6.25,,,, +US-IL-62432,US,IL,62432,6.25,,,, +US-IL-62433,US,IL,62433,6.25,,,, +US-IL-62434,US,IL,62434,6.75,,,, +US-IL-62435,US,IL,62435,6.25,,,, +US-IL-62436,US,IL,62436,6.25,,,, +US-IL-62439,US,IL,62439,7.25,,,, +US-IL-62440,US,IL,62440,6.25,,,, +US-IL-62441,US,IL,62441,7.25,,,, +US-IL-62442,US,IL,62442,7.25,,,, +US-IL-62443,US,IL,62443,6.5,,,, +US-IL-62445,US,IL,62445,6.5,,,, +US-IL-62446,US,IL,62446,7,,,, +US-IL-62447,US,IL,62447,6.25,,,, +US-IL-62448,US,IL,62448,6.25,,,, +US-IL-62449,US,IL,62449,6.25,,,, +US-IL-62450,US,IL,62450,6.75,,,, +US-IL-62451,US,IL,62451,6.25,,,, +US-IL-62452,US,IL,62452,6.75,,,, +US-IL-62454,US,IL,62454,6.25,,,, +US-IL-62458,US,IL,62458,6.25,,,, +US-IL-62459,US,IL,62459,6.25,,,, +US-IL-62460,US,IL,62460,7.25,,,, +US-IL-62461,US,IL,62461,6.5,,,, +US-IL-62462,US,IL,62462,6.25,,,, +US-IL-62463,US,IL,62463,6.25,,,, +US-IL-62464,US,IL,62464,6.25,,,, +US-IL-62465,US,IL,62465,6.25,,,, +US-IL-62466,US,IL,62466,7.25,,,, +US-IL-62467,US,IL,62467,6.5,,,, +US-IL-62468,US,IL,62468,6.25,,,, +US-IL-62469,US,IL,62469,6.25,,,, +US-IL-62471,US,IL,62471,6.75,,,, +US-IL-62473,US,IL,62473,6.5,,,, +US-IL-62474,US,IL,62474,7.25,,,, +US-IL-62475,US,IL,62475,6.25,,,, +US-IL-62476,US,IL,62476,6.25,,,, +US-IL-62477,US,IL,62477,7.25,,,, +US-IL-62478,US,IL,62478,6.25,,,, +US-IL-62479,US,IL,62479,6.25,,,, +US-IL-62480,US,IL,62480,6.25,,,, +US-IL-62481,US,IL,62481,6.25,,,, +US-IL-62501,US,IL,62501,7.5,,,, +US-IL-62510,US,IL,62510,6.25,,,, +US-IL-62512,US,IL,62512,7.75,,,, +US-IL-62513,US,IL,62513,7.5,,,, +US-IL-62514,US,IL,62514,7.5,,,, +US-IL-62515,US,IL,62515,6.25,,,, +US-IL-62517,US,IL,62517,6.25,,,, +US-IL-62518,US,IL,62518,7.75,,,, +US-IL-62519,US,IL,62519,7.75,,,, +US-IL-62520,US,IL,62520,6.25,,,, +US-IL-62521,US,IL,62521,9,,,, +US-IL-62522,US,IL,62522,9,,,, +US-IL-62523,US,IL,62523,9,,,, +US-IL-62524,US,IL,62524,9,,,, +US-IL-62525,US,IL,62525,9,,,, +US-IL-62526,US,IL,62526,9,,,, +US-IL-62530,US,IL,62530,6.25,,,, +US-IL-62531,US,IL,62531,6.25,,,, +US-IL-62532,US,IL,62532,7.5,,,, +US-IL-62533,US,IL,62533,7.25,,,, +US-IL-62534,US,IL,62534,6.25,,,, +US-IL-62535,US,IL,62535,8.5,,,, +US-IL-62536,US,IL,62536,6.25,,,, +US-IL-62537,US,IL,62537,7.5,,,, +US-IL-62538,US,IL,62538,6.25,,,, +US-IL-62539,US,IL,62539,6.25,,,, +US-IL-62540,US,IL,62540,6.25,,,, +US-IL-62541,US,IL,62541,7.75,,,, +US-IL-62543,US,IL,62543,7.75,,,, +US-IL-62544,US,IL,62544,7.5,,,, +US-IL-62545,US,IL,62545,6.25,,,, +US-IL-62546,US,IL,62546,6.25,,,, +US-IL-62547,US,IL,62547,6.25,,,, +US-IL-62548,US,IL,62548,7.75,,,, +US-IL-62549,US,IL,62549,7.5,,,, +US-IL-62550,US,IL,62550,6.25,,,, +US-IL-62551,US,IL,62551,7.5,,,, +US-IL-62553,US,IL,62553,6.25,,,, +US-IL-62554,US,IL,62554,7.5,,,, +US-IL-62555,US,IL,62555,6.25,,,, +US-IL-62556,US,IL,62556,6.25,,,, +US-IL-62557,US,IL,62557,6.25,,,, +US-IL-62558,US,IL,62558,6.25,,,, +US-IL-62560,US,IL,62560,6.25,,,, +US-IL-62561,US,IL,62561,6.25,,,, +US-IL-62563,US,IL,62563,6.25,,,, +US-IL-62565,US,IL,62565,7.25,,,, +US-IL-62567,US,IL,62567,6.25,,,, +US-IL-62568,US,IL,62568,7,,,, +US-IL-62570,US,IL,62570,6.25,,,, +US-IL-62571,US,IL,62571,6.25,,,, +US-IL-62572,US,IL,62572,6.25,,,, +US-IL-62573,US,IL,62573,7.5,,,, +US-IL-62601,US,IL,62601,6.25,,,, +US-IL-62610,US,IL,62610,6.25,,,, +US-IL-62611,US,IL,62611,8.25,,,, +US-IL-62612,US,IL,62612,8.25,,,, +US-IL-62613,US,IL,62613,7.25,,,, +US-IL-62615,US,IL,62615,6.25,,,, +US-IL-62617,US,IL,62617,6.25,,,, +US-IL-62618,US,IL,62618,8.25,,,, +US-IL-62621,US,IL,62621,6.25,,,, +US-IL-62622,US,IL,62622,8.25,,,, +US-IL-62624,US,IL,62624,7.25,,,, +US-IL-62625,US,IL,62625,6.25,,,, +US-IL-62626,US,IL,62626,6.25,,,, +US-IL-62627,US,IL,62627,8.25,,,, +US-IL-62628,US,IL,62628,6.25,,,, +US-IL-62629,US,IL,62629,6.25,,,, +US-IL-62630,US,IL,62630,6.25,,,, +US-IL-62631,US,IL,62631,6.25,,,, +US-IL-62633,US,IL,62633,6.25,,,, +US-IL-62634,US,IL,62634,7.75,,,, +US-IL-62635,US,IL,62635,7.75,,,, +US-IL-62638,US,IL,62638,6.25,,,, +US-IL-62639,US,IL,62639,7.25,,,, +US-IL-62640,US,IL,62640,6.25,,,, +US-IL-62642,US,IL,62642,7.25,,,, +US-IL-62643,US,IL,62643,7.75,,,, +US-IL-62644,US,IL,62644,6.75,,,, +US-IL-62649,US,IL,62649,6.25,,,, +US-IL-62650,US,IL,62650,7,,,, +US-IL-62651,US,IL,62651,7,,,, +US-IL-62655,US,IL,62655,6.25,,,, +US-IL-62656,US,IL,62656,8.25,,,, +US-IL-62659,US,IL,62659,7.25,,,, +US-IL-62661,US,IL,62661,6.25,,,, +US-IL-62662,US,IL,62662,6.25,,,, +US-IL-62663,US,IL,62663,6.25,,,, +US-IL-62664,US,IL,62664,6.25,,,, +US-IL-62665,US,IL,62665,6.25,,,, +US-IL-62666,US,IL,62666,7.75,,,, +US-IL-62667,US,IL,62667,6.25,,,, +US-IL-62668,US,IL,62668,6.25,,,, +US-IL-62670,US,IL,62670,6.25,,,, +US-IL-62671,US,IL,62671,7.75,,,, +US-IL-62672,US,IL,62672,6.25,,,, +US-IL-62673,US,IL,62673,7.25,,,, +US-IL-62674,US,IL,62674,6.25,,,, +US-IL-62675,US,IL,62675,7.25,,,, +US-IL-62677,US,IL,62677,6.25,,,, +US-IL-62681,US,IL,62681,7.25,,,, +US-IL-62682,US,IL,62682,6.25,,,, +US-IL-62683,US,IL,62683,6.25,,,, +US-IL-62684,US,IL,62684,6.75,,,, +US-IL-62685,US,IL,62685,6.25,,,, +US-IL-62688,US,IL,62688,7.25,,,, +US-IL-62689,US,IL,62689,6.25,,,, +US-IL-62690,US,IL,62690,6.25,,,, +US-IL-62691,US,IL,62691,8.25,,,, +US-IL-62692,US,IL,62692,6.25,,,, +US-IL-62693,US,IL,62693,6.25,,,, +US-IL-62694,US,IL,62694,6.25,,,, +US-IL-62695,US,IL,62695,6.25,,,, +US-IL-62701,US,IL,62701,8,,,, +US-IL-62702,US,IL,62702,8,,,, +US-IL-62703,US,IL,62703,8,,,, +US-IL-62704,US,IL,62704,8,,,, +US-IL-62705,US,IL,62705,8,,,, +US-IL-62706,US,IL,62706,8,,,, +US-IL-62707,US,IL,62707,6.25,,,, +US-IL-62708,US,IL,62708,8,,,, +US-IL-62711,US,IL,62711,8,,,, +US-IL-62712,US,IL,62712,8,,,, +US-IL-62715,US,IL,62715,8,,,, +US-IL-62716,US,IL,62716,6.25,,,, +US-IL-62719,US,IL,62719,8,,,, +US-IL-62721,US,IL,62721,8,,,, +US-IL-62722,US,IL,62722,8,,,, +US-IL-62723,US,IL,62723,8,,,, +US-IL-62726,US,IL,62726,8,,,, +US-IL-62736,US,IL,62736,8,,,, +US-IL-62739,US,IL,62739,8,,,, +US-IL-62756,US,IL,62756,8,,,, +US-IL-62757,US,IL,62757,8,,,, +US-IL-62761,US,IL,62761,8,,,, +US-IL-62762,US,IL,62762,8,,,, +US-IL-62763,US,IL,62763,8,,,, +US-IL-62764,US,IL,62764,8,,,, +US-IL-62765,US,IL,62765,8,,,, +US-IL-62766,US,IL,62766,8,,,, +US-IL-62767,US,IL,62767,8,,,, +US-IL-62769,US,IL,62769,8,,,, +US-IL-62776,US,IL,62776,8,,,, +US-IL-62777,US,IL,62777,8,,,, +US-IL-62781,US,IL,62781,8,,,, +US-IL-62786,US,IL,62786,8,,,, +US-IL-62791,US,IL,62791,8,,,, +US-IL-62794,US,IL,62794,8,,,, +US-IL-62796,US,IL,62796,8,,,, +US-IL-62801,US,IL,62801,6.5,,,, +US-IL-62803,US,IL,62803,6.25,,,, +US-IL-62806,US,IL,62806,6.25,,,, +US-IL-62807,US,IL,62807,6.5,,,, +US-IL-62808,US,IL,62808,6.25,,,, +US-IL-62809,US,IL,62809,7,,,, +US-IL-62810,US,IL,62810,6.5,,,, +US-IL-62811,US,IL,62811,6.25,,,, +US-IL-62812,US,IL,62812,8.5,,,, +US-IL-62814,US,IL,62814,6.5,,,, +US-IL-62815,US,IL,62815,6.25,,,, +US-IL-62816,US,IL,62816,6.5,,,, +US-IL-62817,US,IL,62817,6.25,,,, +US-IL-62818,US,IL,62818,6.25,,,, +US-IL-62819,US,IL,62819,7.25,,,, +US-IL-62820,US,IL,62820,6.25,,,, +US-IL-62821,US,IL,62821,7,,,, +US-IL-62822,US,IL,62822,8.25,,,, +US-IL-62823,US,IL,62823,7,,,, +US-IL-62824,US,IL,62824,6.75,,,, +US-IL-62825,US,IL,62825,7.25,,,, +US-IL-62827,US,IL,62827,6.25,,,, +US-IL-62828,US,IL,62828,6.25,,,, +US-IL-62829,US,IL,62829,6.25,,,, +US-IL-62830,US,IL,62830,6.5,,,, +US-IL-62831,US,IL,62831,6.25,,,, +US-IL-62832,US,IL,62832,8.25,,,, +US-IL-62833,US,IL,62833,6.25,,,, +US-IL-62834,US,IL,62834,6.25,,,, +US-IL-62835,US,IL,62835,6.25,,,, +US-IL-62836,US,IL,62836,7.25,,,, +US-IL-62837,US,IL,62837,7,,,, +US-IL-62838,US,IL,62838,6.25,,,, +US-IL-62839,US,IL,62839,7.25,,,, +US-IL-62840,US,IL,62840,8.25,,,, +US-IL-62841,US,IL,62841,7.25,,,, +US-IL-62842,US,IL,62842,7,,,, +US-IL-62843,US,IL,62843,6.25,,,, +US-IL-62844,US,IL,62844,6.25,,,, +US-IL-62846,US,IL,62846,6.5,,,, +US-IL-62848,US,IL,62848,6.25,,,, +US-IL-62849,US,IL,62849,6.5,,,, +US-IL-62850,US,IL,62850,7,,,, +US-IL-62851,US,IL,62851,7,,,, +US-IL-62852,US,IL,62852,6.25,,,, +US-IL-62853,US,IL,62853,6.5,,,, +US-IL-62854,US,IL,62854,6.5,,,, +US-IL-62855,US,IL,62855,6.25,,,, +US-IL-62856,US,IL,62856,7.25,,,, +US-IL-62858,US,IL,62858,6.75,,,, +US-IL-62859,US,IL,62859,6.25,,,, +US-IL-62860,US,IL,62860,7.25,,,, +US-IL-62861,US,IL,62861,6.25,,,, +US-IL-62862,US,IL,62862,6.25,,,, +US-IL-62863,US,IL,62863,6.25,,,, +US-IL-62864,US,IL,62864,8,,,, +US-IL-62865,US,IL,62865,7.25,,,, +US-IL-62866,US,IL,62866,6.5,,,, +US-IL-62867,US,IL,62867,6.25,,,, +US-IL-62868,US,IL,62868,6.75,,,, +US-IL-62869,US,IL,62869,6.25,,,, +US-IL-62870,US,IL,62870,6.5,,,, +US-IL-62871,US,IL,62871,6.25,,,, +US-IL-62872,US,IL,62872,6.5,,,, +US-IL-62874,US,IL,62874,8.25,,,, +US-IL-62875,US,IL,62875,6.5,,,, +US-IL-62876,US,IL,62876,6.25,,,, +US-IL-62877,US,IL,62877,6.25,,,, +US-IL-62878,US,IL,62878,7,,,, +US-IL-62879,US,IL,62879,6.75,,,, +US-IL-62880,US,IL,62880,6.25,,,, +US-IL-62881,US,IL,62881,7.5,,,, +US-IL-62882,US,IL,62882,6.5,,,, +US-IL-62883,US,IL,62883,6.5,,,, +US-IL-62884,US,IL,62884,9,,,, +US-IL-62885,US,IL,62885,6.25,,,, +US-IL-62886,US,IL,62886,7,,,, +US-IL-62887,US,IL,62887,6.25,,,, +US-IL-62888,US,IL,62888,6.75,,,, +US-IL-62889,US,IL,62889,6.5,,,, +US-IL-62890,US,IL,62890,7.25,,,, +US-IL-62891,US,IL,62891,7.25,,,, +US-IL-62892,US,IL,62892,6.5,,,, +US-IL-62893,US,IL,62893,6.5,,,, +US-IL-62894,US,IL,62894,6.5,,,, +US-IL-62895,US,IL,62895,7,,,, +US-IL-62896,US,IL,62896,8.25,,,, +US-IL-62897,US,IL,62897,7.25,,,, +US-IL-62898,US,IL,62898,6.5,,,, +US-IL-62899,US,IL,62899,6.75,,,, +US-IL-62901,US,IL,62901,8.25,,,, +US-IL-62902,US,IL,62902,6.25,,,, +US-IL-62903,US,IL,62903,6.25,,,, +US-IL-62905,US,IL,62905,7.5,,,, +US-IL-62906,US,IL,62906,7.5,,,, +US-IL-62907,US,IL,62907,6.25,,,, +US-IL-62908,US,IL,62908,6.25,,,, +US-IL-62909,US,IL,62909,6.75,,,, +US-IL-62910,US,IL,62910,6.25,,,, +US-IL-62912,US,IL,62912,6.75,,,, +US-IL-62914,US,IL,62914,6.25,,,, +US-IL-62915,US,IL,62915,8.75,,,, +US-IL-62916,US,IL,62916,6.25,,,, +US-IL-62917,US,IL,62917,8,,,, +US-IL-62918,US,IL,62918,8.75,,,, +US-IL-62919,US,IL,62919,6.25,,,, +US-IL-62920,US,IL,62920,7.5,,,, +US-IL-62921,US,IL,62921,7.25,,,, +US-IL-62922,US,IL,62922,7.25,,,, +US-IL-62923,US,IL,62923,6.75,,,, +US-IL-62924,US,IL,62924,6.25,,,, +US-IL-62926,US,IL,62926,7.5,,,, +US-IL-62927,US,IL,62927,6.25,,,, +US-IL-62928,US,IL,62928,6.25,,,, +US-IL-62930,US,IL,62930,8,,,, +US-IL-62931,US,IL,62931,6.25,,,, +US-IL-62932,US,IL,62932,6.25,,,, +US-IL-62933,US,IL,62933,7.25,,,, +US-IL-62934,US,IL,62934,6.25,,,, +US-IL-62935,US,IL,62935,8,,,, +US-IL-62938,US,IL,62938,6.25,,,, +US-IL-62939,US,IL,62939,6.75,,,, +US-IL-62940,US,IL,62940,6.25,,,, +US-IL-62941,US,IL,62941,6.25,,,, +US-IL-62942,US,IL,62942,6.25,,,, +US-IL-62943,US,IL,62943,6.75,,,, +US-IL-62946,US,IL,62946,8,,,, +US-IL-62947,US,IL,62947,6.25,,,, +US-IL-62948,US,IL,62948,8.5,,,, +US-IL-62949,US,IL,62949,8.25,,,, +US-IL-62950,US,IL,62950,6.25,,,, +US-IL-62951,US,IL,62951,8.75,,,, +US-IL-62952,US,IL,62952,7.5,,,, +US-IL-62953,US,IL,62953,6.25,,,, +US-IL-62954,US,IL,62954,6.25,,,, +US-IL-62955,US,IL,62955,6.25,,,, +US-IL-62956,US,IL,62956,6.25,,,, +US-IL-62957,US,IL,62957,6.25,,,, +US-IL-62958,US,IL,62958,6.25,,,, +US-IL-62959,US,IL,62959,8.5,,,, +US-IL-62960,US,IL,62960,6.25,,,, +US-IL-62961,US,IL,62961,7.5,,,, +US-IL-62962,US,IL,62962,6.25,,,, +US-IL-62963,US,IL,62963,6.25,,,, +US-IL-62964,US,IL,62964,6.25,,,, +US-IL-62965,US,IL,62965,8,,,, +US-IL-62966,US,IL,62966,6.25,,,, +US-IL-62967,US,IL,62967,6.75,,,, +US-IL-62969,US,IL,62969,6.25,,,, +US-IL-62970,US,IL,62970,6.25,,,, +US-IL-62971,US,IL,62971,6.25,,,, +US-IL-62972,US,IL,62972,6.75,,,, +US-IL-62973,US,IL,62973,6.25,,,, +US-IL-62974,US,IL,62974,7.25,,,, +US-IL-62975,US,IL,62975,6.25,,,, +US-IL-62976,US,IL,62976,6.25,,,, +US-IL-62977,US,IL,62977,8,,,, +US-IL-62979,US,IL,62979,6.25,,,, +US-IL-62982,US,IL,62982,6.25,,,, +US-IL-62983,US,IL,62983,7.25,,,, +US-IL-62984,US,IL,62984,6.25,,,, +US-IL-62985,US,IL,62985,6.75,,,, +US-IL-62987,US,IL,62987,8,,,, +US-IL-62988,US,IL,62988,6.25,,,, +US-IL-62990,US,IL,62990,6.25,,,, +US-IL-62992,US,IL,62992,6.25,,,, +US-IL-62994,US,IL,62994,6.25,,,, +US-IL-62995,US,IL,62995,6.75,,,, +US-IL-62996,US,IL,62996,6.25,,,, +US-IL-62997,US,IL,62997,6.75,,,, +US-IL-62998,US,IL,62998,7.5,,,, +US-IL-62999,US,IL,62999,7.25,,,, +US-IN-46001,US,IN,46001,7,,,, +US-IN-46011,US,IN,46011,7,,,, +US-IN-46012,US,IN,46012,7,,,, +US-IN-46013,US,IN,46013,7,,,, +US-IN-46014,US,IN,46014,7,,,, +US-IN-46015,US,IN,46015,7,,,, +US-IN-46016,US,IN,46016,7,,,, +US-IN-46017,US,IN,46017,7,,,, +US-IN-46018,US,IN,46018,7,,,, +US-IN-46030,US,IN,46030,7,,,, +US-IN-46031,US,IN,46031,7,,,, +US-IN-46032,US,IN,46032,7,,,, +US-IN-46033,US,IN,46033,7,,,, +US-IN-46034,US,IN,46034,7,,,, +US-IN-46035,US,IN,46035,7,,,, +US-IN-46036,US,IN,46036,7,,,, +US-IN-46037,US,IN,46037,7,,,, +US-IN-46038,US,IN,46038,7,,,, +US-IN-46039,US,IN,46039,7,,,, +US-IN-46040,US,IN,46040,7,,,, +US-IN-46041,US,IN,46041,7,,,, +US-IN-46044,US,IN,46044,7,,,, +US-IN-46045,US,IN,46045,7,,,, +US-IN-46047,US,IN,46047,7,,,, +US-IN-46048,US,IN,46048,7,,,, +US-IN-46049,US,IN,46049,7,,,, +US-IN-46050,US,IN,46050,7,,,, +US-IN-46051,US,IN,46051,7,,,, +US-IN-46052,US,IN,46052,7,,,, +US-IN-46055,US,IN,46055,7,,,, +US-IN-46056,US,IN,46056,7,,,, +US-IN-46057,US,IN,46057,7,,,, +US-IN-46058,US,IN,46058,7,,,, +US-IN-46060,US,IN,46060,7,,,, +US-IN-46061,US,IN,46061,7,,,, +US-IN-46062,US,IN,46062,7,,,, +US-IN-46063,US,IN,46063,7,,,, +US-IN-46064,US,IN,46064,7,,,, +US-IN-46065,US,IN,46065,7,,,, +US-IN-46067,US,IN,46067,7,,,, +US-IN-46068,US,IN,46068,7,,,, +US-IN-46069,US,IN,46069,7,,,, +US-IN-46070,US,IN,46070,7,,,, +US-IN-46071,US,IN,46071,7,,,, +US-IN-46072,US,IN,46072,7,,,, +US-IN-46074,US,IN,46074,7,,,, +US-IN-46075,US,IN,46075,7,,,, +US-IN-46076,US,IN,46076,7,,,, +US-IN-46077,US,IN,46077,7,,,, +US-IN-46082,US,IN,46082,7,,,, +US-IN-46085,US,IN,46085,7,,,, +US-IN-46102,US,IN,46102,7,,,, +US-IN-46103,US,IN,46103,7,,,, +US-IN-46104,US,IN,46104,7,,,, +US-IN-46105,US,IN,46105,7,,,, +US-IN-46106,US,IN,46106,7,,,, +US-IN-46107,US,IN,46107,7,,,, +US-IN-46110,US,IN,46110,7,,,, +US-IN-46111,US,IN,46111,7,,,, +US-IN-46112,US,IN,46112,7,,,, +US-IN-46113,US,IN,46113,7,,,, +US-IN-46115,US,IN,46115,7,,,, +US-IN-46117,US,IN,46117,7,,,, +US-IN-46118,US,IN,46118,7,,,, +US-IN-46120,US,IN,46120,7,,,, +US-IN-46121,US,IN,46121,7,,,, +US-IN-46122,US,IN,46122,7,,,, +US-IN-46123,US,IN,46123,7,,,, +US-IN-46124,US,IN,46124,7,,,, +US-IN-46125,US,IN,46125,7,,,, +US-IN-46126,US,IN,46126,7,,,, +US-IN-46127,US,IN,46127,7,,,, +US-IN-46128,US,IN,46128,7,,,, +US-IN-46129,US,IN,46129,7,,,, +US-IN-46130,US,IN,46130,7,,,, +US-IN-46131,US,IN,46131,7,,,, +US-IN-46133,US,IN,46133,7,,,, +US-IN-46135,US,IN,46135,7,,,, +US-IN-46140,US,IN,46140,7,,,, +US-IN-46142,US,IN,46142,7,,,, +US-IN-46143,US,IN,46143,7,,,, +US-IN-46144,US,IN,46144,7,,,, +US-IN-46146,US,IN,46146,7,,,, +US-IN-46147,US,IN,46147,7,,,, +US-IN-46148,US,IN,46148,7,,,, +US-IN-46149,US,IN,46149,7,,,, +US-IN-46150,US,IN,46150,7,,,, +US-IN-46151,US,IN,46151,7,,,, +US-IN-46154,US,IN,46154,7,,,, +US-IN-46155,US,IN,46155,7,,,, +US-IN-46156,US,IN,46156,7,,,, +US-IN-46157,US,IN,46157,7,,,, +US-IN-46158,US,IN,46158,7,,,, +US-IN-46160,US,IN,46160,7,,,, +US-IN-46161,US,IN,46161,7,,,, +US-IN-46162,US,IN,46162,7,,,, +US-IN-46163,US,IN,46163,7,,,, +US-IN-46164,US,IN,46164,7,,,, +US-IN-46165,US,IN,46165,7,,,, +US-IN-46166,US,IN,46166,7,,,, +US-IN-46167,US,IN,46167,7,,,, +US-IN-46168,US,IN,46168,7,,,, +US-IN-46170,US,IN,46170,7,,,, +US-IN-46171,US,IN,46171,7,,,, +US-IN-46172,US,IN,46172,7,,,, +US-IN-46173,US,IN,46173,7,,,, +US-IN-46175,US,IN,46175,7,,,, +US-IN-46176,US,IN,46176,7,,,, +US-IN-46180,US,IN,46180,7,,,, +US-IN-46181,US,IN,46181,7,,,, +US-IN-46182,US,IN,46182,7,,,, +US-IN-46183,US,IN,46183,7,,,, +US-IN-46184,US,IN,46184,7,,,, +US-IN-46186,US,IN,46186,7,,,, +US-IN-46197,US,IN,46197,7,,,, +US-IN-46201,US,IN,46201,7,,,, +US-IN-46202,US,IN,46202,7,,,, +US-IN-46203,US,IN,46203,7,,,, +US-IN-46204,US,IN,46204,7,,,, +US-IN-46205,US,IN,46205,7,,,, +US-IN-46206,US,IN,46206,7,,,, +US-IN-46207,US,IN,46207,7,,,, +US-IN-46208,US,IN,46208,7,,,, +US-IN-46209,US,IN,46209,7,,,, +US-IN-46211,US,IN,46211,7,,,, +US-IN-46213,US,IN,46213,7,,,, +US-IN-46214,US,IN,46214,7,,,, +US-IN-46216,US,IN,46216,7,,,, +US-IN-46217,US,IN,46217,7,,,, +US-IN-46218,US,IN,46218,7,,,, +US-IN-46219,US,IN,46219,7,,,, +US-IN-46220,US,IN,46220,7,,,, +US-IN-46221,US,IN,46221,7,,,, +US-IN-46222,US,IN,46222,7,,,, +US-IN-46224,US,IN,46224,7,,,, +US-IN-46225,US,IN,46225,7,,,, +US-IN-46226,US,IN,46226,7,,,, +US-IN-46227,US,IN,46227,7,,,, +US-IN-46228,US,IN,46228,7,,,, +US-IN-46229,US,IN,46229,7,,,, +US-IN-46230,US,IN,46230,7,,,, +US-IN-46231,US,IN,46231,7,,,, +US-IN-46234,US,IN,46234,7,,,, +US-IN-46235,US,IN,46235,7,,,, +US-IN-46236,US,IN,46236,7,,,, +US-IN-46237,US,IN,46237,7,,,, +US-IN-46239,US,IN,46239,7,,,, +US-IN-46240,US,IN,46240,7,,,, +US-IN-46241,US,IN,46241,7,,,, +US-IN-46242,US,IN,46242,7,,,, +US-IN-46244,US,IN,46244,7,,,, +US-IN-46247,US,IN,46247,7,,,, +US-IN-46249,US,IN,46249,7,,,, +US-IN-46250,US,IN,46250,7,,,, +US-IN-46251,US,IN,46251,7,,,, +US-IN-46253,US,IN,46253,7,,,, +US-IN-46254,US,IN,46254,7,,,, +US-IN-46255,US,IN,46255,7,,,, +US-IN-46256,US,IN,46256,7,,,, +US-IN-46259,US,IN,46259,7,,,, +US-IN-46260,US,IN,46260,7,,,, +US-IN-46262,US,IN,46262,7,,,, +US-IN-46266,US,IN,46266,7,,,, +US-IN-46268,US,IN,46268,7,,,, +US-IN-46274,US,IN,46274,7,,,, +US-IN-46275,US,IN,46275,7,,,, +US-IN-46277,US,IN,46277,7,,,, +US-IN-46278,US,IN,46278,7,,,, +US-IN-46280,US,IN,46280,7,,,, +US-IN-46282,US,IN,46282,7,,,, +US-IN-46283,US,IN,46283,7,,,, +US-IN-46285,US,IN,46285,7,,,, +US-IN-46290,US,IN,46290,7,,,, +US-IN-46291,US,IN,46291,7,,,, +US-IN-46295,US,IN,46295,7,,,, +US-IN-46296,US,IN,46296,7,,,, +US-IN-46298,US,IN,46298,7,,,, +US-IN-46301,US,IN,46301,7,,,, +US-IN-46302,US,IN,46302,7,,,, +US-IN-46303,US,IN,46303,7,,,, +US-IN-46304,US,IN,46304,7,,,, +US-IN-46307,US,IN,46307,7,,,, +US-IN-46308,US,IN,46308,7,,,, +US-IN-46310,US,IN,46310,7,,,, +US-IN-46311,US,IN,46311,7,,,, +US-IN-46312,US,IN,46312,7,,,, +US-IN-46319,US,IN,46319,7,,,, +US-IN-46320,US,IN,46320,7,,,, +US-IN-46321,US,IN,46321,7,,,, +US-IN-46322,US,IN,46322,7,,,, +US-IN-46323,US,IN,46323,7,,,, +US-IN-46324,US,IN,46324,7,,,, +US-IN-46325,US,IN,46325,7,,,, +US-IN-46327,US,IN,46327,7,,,, +US-IN-46340,US,IN,46340,7,,,, +US-IN-46341,US,IN,46341,7,,,, +US-IN-46342,US,IN,46342,7,,,, +US-IN-46345,US,IN,46345,7,,,, +US-IN-46346,US,IN,46346,7,,,, +US-IN-46347,US,IN,46347,7,,,, +US-IN-46348,US,IN,46348,7,,,, +US-IN-46349,US,IN,46349,7,,,, +US-IN-46350,US,IN,46350,7,,,, +US-IN-46352,US,IN,46352,7,,,, +US-IN-46355,US,IN,46355,7,,,, +US-IN-46356,US,IN,46356,7,,,, +US-IN-46360,US,IN,46360,7,,,, +US-IN-46361,US,IN,46361,7,,,, +US-IN-46365,US,IN,46365,7,,,, +US-IN-46366,US,IN,46366,7,,,, +US-IN-46368,US,IN,46368,7,,,, +US-IN-46371,US,IN,46371,7,,,, +US-IN-46372,US,IN,46372,7,,,, +US-IN-46373,US,IN,46373,7,,,, +US-IN-46374,US,IN,46374,7,,,, +US-IN-46375,US,IN,46375,7,,,, +US-IN-46376,US,IN,46376,7,,,, +US-IN-46377,US,IN,46377,7,,,, +US-IN-46379,US,IN,46379,7,,,, +US-IN-46380,US,IN,46380,7,,,, +US-IN-46381,US,IN,46381,7,,,, +US-IN-46382,US,IN,46382,7,,,, +US-IN-46383,US,IN,46383,7,,,, +US-IN-46384,US,IN,46384,7,,,, +US-IN-46385,US,IN,46385,7,,,, +US-IN-46390,US,IN,46390,7,,,, +US-IN-46391,US,IN,46391,7,,,, +US-IN-46392,US,IN,46392,7,,,, +US-IN-46393,US,IN,46393,7,,,, +US-IN-46394,US,IN,46394,7,,,, +US-IN-46401,US,IN,46401,7,,,, +US-IN-46402,US,IN,46402,7,,,, +US-IN-46403,US,IN,46403,7,,,, +US-IN-46404,US,IN,46404,7,,,, +US-IN-46405,US,IN,46405,7,,,, +US-IN-46406,US,IN,46406,7,,,, +US-IN-46407,US,IN,46407,7,,,, +US-IN-46408,US,IN,46408,7,,,, +US-IN-46409,US,IN,46409,7,,,, +US-IN-46410,US,IN,46410,7,,,, +US-IN-46411,US,IN,46411,7,,,, +US-IN-46501,US,IN,46501,7,,,, +US-IN-46502,US,IN,46502,7,,,, +US-IN-46504,US,IN,46504,7,,,, +US-IN-46506,US,IN,46506,7,,,, +US-IN-46507,US,IN,46507,7,,,, +US-IN-46508,US,IN,46508,7,,,, +US-IN-46510,US,IN,46510,7,,,, +US-IN-46511,US,IN,46511,7,,,, +US-IN-46513,US,IN,46513,7,,,, +US-IN-46514,US,IN,46514,7,,,, +US-IN-46515,US,IN,46515,7,,,, +US-IN-46516,US,IN,46516,7,,,, +US-IN-46517,US,IN,46517,7,,,, +US-IN-46524,US,IN,46524,7,,,, +US-IN-46526,US,IN,46526,7,,,, +US-IN-46527,US,IN,46527,7,,,, +US-IN-46528,US,IN,46528,7,,,, +US-IN-46530,US,IN,46530,7,,,, +US-IN-46531,US,IN,46531,7,,,, +US-IN-46532,US,IN,46532,7,,,, +US-IN-46534,US,IN,46534,7,,,, +US-IN-46536,US,IN,46536,7,,,, +US-IN-46537,US,IN,46537,7,,,, +US-IN-46538,US,IN,46538,7,,,, +US-IN-46539,US,IN,46539,7,,,, +US-IN-46540,US,IN,46540,7,,,, +US-IN-46542,US,IN,46542,7,,,, +US-IN-46543,US,IN,46543,7,,,, +US-IN-46544,US,IN,46544,7,,,, +US-IN-46545,US,IN,46545,7,,,, +US-IN-46546,US,IN,46546,7,,,, +US-IN-46550,US,IN,46550,7,,,, +US-IN-46552,US,IN,46552,7,,,, +US-IN-46553,US,IN,46553,7,,,, +US-IN-46554,US,IN,46554,7,,,, +US-IN-46555,US,IN,46555,7,,,, +US-IN-46556,US,IN,46556,7,,,, +US-IN-46561,US,IN,46561,7,,,, +US-IN-46562,US,IN,46562,7,,,, +US-IN-46563,US,IN,46563,7,,,, +US-IN-46565,US,IN,46565,7,,,, +US-IN-46567,US,IN,46567,7,,,, +US-IN-46570,US,IN,46570,7,,,, +US-IN-46571,US,IN,46571,7,,,, +US-IN-46572,US,IN,46572,7,,,, +US-IN-46573,US,IN,46573,7,,,, +US-IN-46574,US,IN,46574,7,,,, +US-IN-46580,US,IN,46580,7,,,, +US-IN-46581,US,IN,46581,7,,,, +US-IN-46582,US,IN,46582,7,,,, +US-IN-46590,US,IN,46590,7,,,, +US-IN-46595,US,IN,46595,7,,,, +US-IN-46601,US,IN,46601,7,,,, +US-IN-46613,US,IN,46613,7,,,, +US-IN-46614,US,IN,46614,7,,,, +US-IN-46615,US,IN,46615,7,,,, +US-IN-46616,US,IN,46616,7,,,, +US-IN-46617,US,IN,46617,7,,,, +US-IN-46619,US,IN,46619,7,,,, +US-IN-46624,US,IN,46624,7,,,, +US-IN-46626,US,IN,46626,7,,,, +US-IN-46628,US,IN,46628,7,,,, +US-IN-46634,US,IN,46634,7,,,, +US-IN-46635,US,IN,46635,7,,,, +US-IN-46637,US,IN,46637,7,,,, +US-IN-46660,US,IN,46660,7,,,, +US-IN-46680,US,IN,46680,7,,,, +US-IN-46699,US,IN,46699,7,,,, +US-IN-46701,US,IN,46701,7,,,, +US-IN-46702,US,IN,46702,7,,,, +US-IN-46703,US,IN,46703,7,,,, +US-IN-46704,US,IN,46704,7,,,, +US-IN-46705,US,IN,46705,7,,,, +US-IN-46706,US,IN,46706,7,,,, +US-IN-46710,US,IN,46710,7,,,, +US-IN-46711,US,IN,46711,7,,,, +US-IN-46713,US,IN,46713,7,,,, +US-IN-46714,US,IN,46714,7,,,, +US-IN-46721,US,IN,46721,7,,,, +US-IN-46723,US,IN,46723,7,,,, +US-IN-46725,US,IN,46725,7,,,, +US-IN-46730,US,IN,46730,7,,,, +US-IN-46731,US,IN,46731,7,,,, +US-IN-46732,US,IN,46732,7,,,, +US-IN-46733,US,IN,46733,7,,,, +US-IN-46737,US,IN,46737,7,,,, +US-IN-46738,US,IN,46738,7,,,, +US-IN-46740,US,IN,46740,7,,,, +US-IN-46741,US,IN,46741,7,,,, +US-IN-46742,US,IN,46742,7,,,, +US-IN-46743,US,IN,46743,7,,,, +US-IN-46745,US,IN,46745,7,,,, +US-IN-46746,US,IN,46746,7,,,, +US-IN-46747,US,IN,46747,7,,,, +US-IN-46748,US,IN,46748,7,,,, +US-IN-46750,US,IN,46750,7,,,, +US-IN-46755,US,IN,46755,7,,,, +US-IN-46759,US,IN,46759,7,,,, +US-IN-46760,US,IN,46760,7,,,, +US-IN-46761,US,IN,46761,7,,,, +US-IN-46763,US,IN,46763,7,,,, +US-IN-46764,US,IN,46764,7,,,, +US-IN-46765,US,IN,46765,7,,,, +US-IN-46766,US,IN,46766,7,,,, +US-IN-46767,US,IN,46767,7,,,, +US-IN-46769,US,IN,46769,7,,,, +US-IN-46770,US,IN,46770,7,,,, +US-IN-46771,US,IN,46771,7,,,, +US-IN-46772,US,IN,46772,7,,,, +US-IN-46773,US,IN,46773,7,,,, +US-IN-46774,US,IN,46774,7,,,, +US-IN-46776,US,IN,46776,7,,,, +US-IN-46777,US,IN,46777,7,,,, +US-IN-46778,US,IN,46778,7,,,, +US-IN-46779,US,IN,46779,7,,,, +US-IN-46780,US,IN,46780,7,,,, +US-IN-46781,US,IN,46781,7,,,, +US-IN-46782,US,IN,46782,7,,,, +US-IN-46783,US,IN,46783,7,,,, +US-IN-46784,US,IN,46784,7,,,, +US-IN-46785,US,IN,46785,7,,,, +US-IN-46786,US,IN,46786,7,,,, +US-IN-46787,US,IN,46787,7,,,, +US-IN-46788,US,IN,46788,7,,,, +US-IN-46789,US,IN,46789,7,,,, +US-IN-46791,US,IN,46791,7,,,, +US-IN-46792,US,IN,46792,7,,,, +US-IN-46793,US,IN,46793,7,,,, +US-IN-46794,US,IN,46794,7,,,, +US-IN-46795,US,IN,46795,7,,,, +US-IN-46796,US,IN,46796,7,,,, +US-IN-46797,US,IN,46797,7,,,, +US-IN-46798,US,IN,46798,7,,,, +US-IN-46799,US,IN,46799,7,,,, +US-IN-46801,US,IN,46801,7,,,, +US-IN-46802,US,IN,46802,7,,,, +US-IN-46803,US,IN,46803,7,,,, +US-IN-46804,US,IN,46804,7,,,, +US-IN-46805,US,IN,46805,7,,,, +US-IN-46806,US,IN,46806,7,,,, +US-IN-46807,US,IN,46807,7,,,, +US-IN-46808,US,IN,46808,7,,,, +US-IN-46809,US,IN,46809,7,,,, +US-IN-46814,US,IN,46814,7,,,, +US-IN-46815,US,IN,46815,7,,,, +US-IN-46816,US,IN,46816,7,,,, +US-IN-46818,US,IN,46818,7,,,, +US-IN-46819,US,IN,46819,7,,,, +US-IN-46825,US,IN,46825,7,,,, +US-IN-46835,US,IN,46835,7,,,, +US-IN-46845,US,IN,46845,7,,,, +US-IN-46850,US,IN,46850,7,,,, +US-IN-46851,US,IN,46851,7,,,, +US-IN-46852,US,IN,46852,7,,,, +US-IN-46853,US,IN,46853,7,,,, +US-IN-46854,US,IN,46854,7,,,, +US-IN-46855,US,IN,46855,7,,,, +US-IN-46856,US,IN,46856,7,,,, +US-IN-46857,US,IN,46857,7,,,, +US-IN-46858,US,IN,46858,7,,,, +US-IN-46859,US,IN,46859,7,,,, +US-IN-46860,US,IN,46860,7,,,, +US-IN-46861,US,IN,46861,7,,,, +US-IN-46862,US,IN,46862,7,,,, +US-IN-46863,US,IN,46863,7,,,, +US-IN-46864,US,IN,46864,7,,,, +US-IN-46865,US,IN,46865,7,,,, +US-IN-46866,US,IN,46866,7,,,, +US-IN-46867,US,IN,46867,7,,,, +US-IN-46868,US,IN,46868,7,,,, +US-IN-46869,US,IN,46869,7,,,, +US-IN-46885,US,IN,46885,7,,,, +US-IN-46895,US,IN,46895,7,,,, +US-IN-46896,US,IN,46896,7,,,, +US-IN-46897,US,IN,46897,7,,,, +US-IN-46898,US,IN,46898,7,,,, +US-IN-46899,US,IN,46899,7,,,, +US-IN-46901,US,IN,46901,7,,,, +US-IN-46902,US,IN,46902,7,,,, +US-IN-46903,US,IN,46903,7,,,, +US-IN-46904,US,IN,46904,7,,,, +US-IN-46910,US,IN,46910,7,,,, +US-IN-46911,US,IN,46911,7,,,, +US-IN-46912,US,IN,46912,7,,,, +US-IN-46913,US,IN,46913,7,,,, +US-IN-46914,US,IN,46914,7,,,, +US-IN-46915,US,IN,46915,7,,,, +US-IN-46916,US,IN,46916,7,,,, +US-IN-46917,US,IN,46917,7,,,, +US-IN-46919,US,IN,46919,7,,,, +US-IN-46920,US,IN,46920,7,,,, +US-IN-46921,US,IN,46921,7,,,, +US-IN-46922,US,IN,46922,7,,,, +US-IN-46923,US,IN,46923,7,,,, +US-IN-46926,US,IN,46926,7,,,, +US-IN-46928,US,IN,46928,7,,,, +US-IN-46929,US,IN,46929,7,,,, +US-IN-46930,US,IN,46930,7,,,, +US-IN-46931,US,IN,46931,7,,,, +US-IN-46932,US,IN,46932,7,,,, +US-IN-46933,US,IN,46933,7,,,, +US-IN-46935,US,IN,46935,7,,,, +US-IN-46936,US,IN,46936,7,,,, +US-IN-46937,US,IN,46937,7,,,, +US-IN-46938,US,IN,46938,7,,,, +US-IN-46939,US,IN,46939,7,,,, +US-IN-46940,US,IN,46940,7,,,, +US-IN-46941,US,IN,46941,7,,,, +US-IN-46942,US,IN,46942,7,,,, +US-IN-46943,US,IN,46943,7,,,, +US-IN-46945,US,IN,46945,7,,,, +US-IN-46946,US,IN,46946,7,,,, +US-IN-46947,US,IN,46947,7,,,, +US-IN-46950,US,IN,46950,7,,,, +US-IN-46951,US,IN,46951,7,,,, +US-IN-46952,US,IN,46952,7,,,, +US-IN-46953,US,IN,46953,7,,,, +US-IN-46957,US,IN,46957,7,,,, +US-IN-46958,US,IN,46958,7,,,, +US-IN-46959,US,IN,46959,7,,,, +US-IN-46960,US,IN,46960,7,,,, +US-IN-46961,US,IN,46961,7,,,, +US-IN-46962,US,IN,46962,7,,,, +US-IN-46965,US,IN,46965,7,,,, +US-IN-46967,US,IN,46967,7,,,, +US-IN-46968,US,IN,46968,7,,,, +US-IN-46970,US,IN,46970,7,,,, +US-IN-46971,US,IN,46971,7,,,, +US-IN-46974,US,IN,46974,7,,,, +US-IN-46975,US,IN,46975,7,,,, +US-IN-46977,US,IN,46977,7,,,, +US-IN-46978,US,IN,46978,7,,,, +US-IN-46979,US,IN,46979,7,,,, +US-IN-46980,US,IN,46980,7,,,, +US-IN-46982,US,IN,46982,7,,,, +US-IN-46984,US,IN,46984,7,,,, +US-IN-46985,US,IN,46985,7,,,, +US-IN-46986,US,IN,46986,7,,,, +US-IN-46987,US,IN,46987,7,,,, +US-IN-46988,US,IN,46988,7,,,, +US-IN-46989,US,IN,46989,7,,,, +US-IN-46990,US,IN,46990,7,,,, +US-IN-46991,US,IN,46991,7,,,, +US-IN-46992,US,IN,46992,7,,,, +US-IN-46994,US,IN,46994,7,,,, +US-IN-46995,US,IN,46995,7,,,, +US-IN-46996,US,IN,46996,7,,,, +US-IN-46998,US,IN,46998,7,,,, +US-IN-47001,US,IN,47001,7,,,, +US-IN-47003,US,IN,47003,7,,,, +US-IN-47006,US,IN,47006,7,,,, +US-IN-47010,US,IN,47010,7,,,, +US-IN-47011,US,IN,47011,7,,,, +US-IN-47012,US,IN,47012,7,,,, +US-IN-47016,US,IN,47016,7,,,, +US-IN-47017,US,IN,47017,7,,,, +US-IN-47018,US,IN,47018,7,,,, +US-IN-47019,US,IN,47019,7,,,, +US-IN-47020,US,IN,47020,7,,,, +US-IN-47021,US,IN,47021,7,,,, +US-IN-47022,US,IN,47022,7,,,, +US-IN-47023,US,IN,47023,7,,,, +US-IN-47024,US,IN,47024,7,,,, +US-IN-47025,US,IN,47025,7,,,, +US-IN-47030,US,IN,47030,7,,,, +US-IN-47031,US,IN,47031,7,,,, +US-IN-47032,US,IN,47032,7,,,, +US-IN-47033,US,IN,47033,7,,,, +US-IN-47034,US,IN,47034,7,,,, +US-IN-47035,US,IN,47035,7,,,, +US-IN-47036,US,IN,47036,7,,,, +US-IN-47037,US,IN,47037,7,,,, +US-IN-47038,US,IN,47038,7,,,, +US-IN-47039,US,IN,47039,7,,,, +US-IN-47040,US,IN,47040,7,,,, +US-IN-47041,US,IN,47041,7,,,, +US-IN-47042,US,IN,47042,7,,,, +US-IN-47043,US,IN,47043,7,,,, +US-IN-47060,US,IN,47060,7,,,, +US-IN-47102,US,IN,47102,7,,,, +US-IN-47104,US,IN,47104,7,,,, +US-IN-47106,US,IN,47106,7,,,, +US-IN-47107,US,IN,47107,7,,,, +US-IN-47108,US,IN,47108,7,,,, +US-IN-47110,US,IN,47110,7,,,, +US-IN-47111,US,IN,47111,7,,,, +US-IN-47112,US,IN,47112,7,,,, +US-IN-47114,US,IN,47114,7,,,, +US-IN-47115,US,IN,47115,7,,,, +US-IN-47116,US,IN,47116,7,,,, +US-IN-47117,US,IN,47117,7,,,, +US-IN-47118,US,IN,47118,7,,,, +US-IN-47119,US,IN,47119,7,,,, +US-IN-47120,US,IN,47120,7,,,, +US-IN-47122,US,IN,47122,7,,,, +US-IN-47123,US,IN,47123,7,,,, +US-IN-47124,US,IN,47124,7,,,, +US-IN-47125,US,IN,47125,7,,,, +US-IN-47126,US,IN,47126,7,,,, +US-IN-47129,US,IN,47129,7,,,, +US-IN-47130,US,IN,47130,7,,,, +US-IN-47131,US,IN,47131,7,,,, +US-IN-47132,US,IN,47132,7,,,, +US-IN-47133,US,IN,47133,7,,,, +US-IN-47134,US,IN,47134,7,,,, +US-IN-47135,US,IN,47135,7,,,, +US-IN-47136,US,IN,47136,7,,,, +US-IN-47137,US,IN,47137,7,,,, +US-IN-47138,US,IN,47138,7,,,, +US-IN-47140,US,IN,47140,7,,,, +US-IN-47141,US,IN,47141,7,,,, +US-IN-47142,US,IN,47142,7,,,, +US-IN-47143,US,IN,47143,7,,,, +US-IN-47144,US,IN,47144,7,,,, +US-IN-47145,US,IN,47145,7,,,, +US-IN-47146,US,IN,47146,7,,,, +US-IN-47147,US,IN,47147,7,,,, +US-IN-47150,US,IN,47150,7,,,, +US-IN-47151,US,IN,47151,7,,,, +US-IN-47160,US,IN,47160,7,,,, +US-IN-47161,US,IN,47161,7,,,, +US-IN-47162,US,IN,47162,7,,,, +US-IN-47163,US,IN,47163,7,,,, +US-IN-47164,US,IN,47164,7,,,, +US-IN-47165,US,IN,47165,7,,,, +US-IN-47166,US,IN,47166,7,,,, +US-IN-47167,US,IN,47167,7,,,, +US-IN-47170,US,IN,47170,7,,,, +US-IN-47172,US,IN,47172,7,,,, +US-IN-47174,US,IN,47174,7,,,, +US-IN-47175,US,IN,47175,7,,,, +US-IN-47177,US,IN,47177,7,,,, +US-IN-47190,US,IN,47190,7,,,, +US-IN-47199,US,IN,47199,7,,,, +US-IN-47201,US,IN,47201,7,,,, +US-IN-47202,US,IN,47202,7,,,, +US-IN-47203,US,IN,47203,7,,,, +US-IN-47220,US,IN,47220,7,,,, +US-IN-47223,US,IN,47223,7,,,, +US-IN-47224,US,IN,47224,7,,,, +US-IN-47225,US,IN,47225,7,,,, +US-IN-47226,US,IN,47226,7,,,, +US-IN-47227,US,IN,47227,7,,,, +US-IN-47228,US,IN,47228,7,,,, +US-IN-47229,US,IN,47229,7,,,, +US-IN-47230,US,IN,47230,7,,,, +US-IN-47231,US,IN,47231,7,,,, +US-IN-47232,US,IN,47232,7,,,, +US-IN-47234,US,IN,47234,7,,,, +US-IN-47235,US,IN,47235,7,,,, +US-IN-47236,US,IN,47236,7,,,, +US-IN-47240,US,IN,47240,7,,,, +US-IN-47243,US,IN,47243,7,,,, +US-IN-47244,US,IN,47244,7,,,, +US-IN-47245,US,IN,47245,7,,,, +US-IN-47246,US,IN,47246,7,,,, +US-IN-47247,US,IN,47247,7,,,, +US-IN-47249,US,IN,47249,7,,,, +US-IN-47250,US,IN,47250,7,,,, +US-IN-47260,US,IN,47260,7,,,, +US-IN-47261,US,IN,47261,7,,,, +US-IN-47263,US,IN,47263,7,,,, +US-IN-47264,US,IN,47264,7,,,, +US-IN-47265,US,IN,47265,7,,,, +US-IN-47270,US,IN,47270,7,,,, +US-IN-47272,US,IN,47272,7,,,, +US-IN-47273,US,IN,47273,7,,,, +US-IN-47274,US,IN,47274,7,,,, +US-IN-47280,US,IN,47280,7,,,, +US-IN-47281,US,IN,47281,7,,,, +US-IN-47282,US,IN,47282,7,,,, +US-IN-47283,US,IN,47283,7,,,, +US-IN-47302,US,IN,47302,7,,,, +US-IN-47303,US,IN,47303,7,,,, +US-IN-47304,US,IN,47304,7,,,, +US-IN-47305,US,IN,47305,7,,,, +US-IN-47306,US,IN,47306,7,,,, +US-IN-47307,US,IN,47307,7,,,, +US-IN-47308,US,IN,47308,7,,,, +US-IN-47320,US,IN,47320,7,,,, +US-IN-47322,US,IN,47322,7,,,, +US-IN-47324,US,IN,47324,7,,,, +US-IN-47325,US,IN,47325,7,,,, +US-IN-47326,US,IN,47326,7,,,, +US-IN-47327,US,IN,47327,7,,,, +US-IN-47330,US,IN,47330,7,,,, +US-IN-47331,US,IN,47331,7,,,, +US-IN-47334,US,IN,47334,7,,,, +US-IN-47335,US,IN,47335,7,,,, +US-IN-47336,US,IN,47336,7,,,, +US-IN-47337,US,IN,47337,7,,,, +US-IN-47338,US,IN,47338,7,,,, +US-IN-47339,US,IN,47339,7,,,, +US-IN-47340,US,IN,47340,7,,,, +US-IN-47341,US,IN,47341,7,,,, +US-IN-47342,US,IN,47342,7,,,, +US-IN-47344,US,IN,47344,7,,,, +US-IN-47345,US,IN,47345,7,,,, +US-IN-47346,US,IN,47346,7,,,, +US-IN-47348,US,IN,47348,7,,,, +US-IN-47351,US,IN,47351,7,,,, +US-IN-47352,US,IN,47352,7,,,, +US-IN-47353,US,IN,47353,7,,,, +US-IN-47354,US,IN,47354,7,,,, +US-IN-47355,US,IN,47355,7,,,, +US-IN-47356,US,IN,47356,7,,,, +US-IN-47357,US,IN,47357,7,,,, +US-IN-47358,US,IN,47358,7,,,, +US-IN-47359,US,IN,47359,7,,,, +US-IN-47360,US,IN,47360,7,,,, +US-IN-47361,US,IN,47361,7,,,, +US-IN-47362,US,IN,47362,7,,,, +US-IN-47366,US,IN,47366,7,,,, +US-IN-47367,US,IN,47367,7,,,, +US-IN-47368,US,IN,47368,7,,,, +US-IN-47369,US,IN,47369,7,,,, +US-IN-47370,US,IN,47370,7,,,, +US-IN-47371,US,IN,47371,7,,,, +US-IN-47373,US,IN,47373,7,,,, +US-IN-47374,US,IN,47374,7,,,, +US-IN-47375,US,IN,47375,7,,,, +US-IN-47380,US,IN,47380,7,,,, +US-IN-47381,US,IN,47381,7,,,, +US-IN-47382,US,IN,47382,7,,,, +US-IN-47383,US,IN,47383,7,,,, +US-IN-47384,US,IN,47384,7,,,, +US-IN-47385,US,IN,47385,7,,,, +US-IN-47386,US,IN,47386,7,,,, +US-IN-47387,US,IN,47387,7,,,, +US-IN-47388,US,IN,47388,7,,,, +US-IN-47390,US,IN,47390,7,,,, +US-IN-47392,US,IN,47392,7,,,, +US-IN-47393,US,IN,47393,7,,,, +US-IN-47394,US,IN,47394,7,,,, +US-IN-47396,US,IN,47396,7,,,, +US-IN-47401,US,IN,47401,7,,,, +US-IN-47402,US,IN,47402,7,,,, +US-IN-47403,US,IN,47403,7,,,, +US-IN-47404,US,IN,47404,7,,,, +US-IN-47405,US,IN,47405,7,,,, +US-IN-47406,US,IN,47406,7,,,, +US-IN-47407,US,IN,47407,7,,,, +US-IN-47408,US,IN,47408,7,,,, +US-IN-47420,US,IN,47420,7,,,, +US-IN-47421,US,IN,47421,7,,,, +US-IN-47424,US,IN,47424,7,,,, +US-IN-47426,US,IN,47426,7,,,, +US-IN-47427,US,IN,47427,7,,,, +US-IN-47429,US,IN,47429,7,,,, +US-IN-47431,US,IN,47431,7,,,, +US-IN-47432,US,IN,47432,7,,,, +US-IN-47433,US,IN,47433,7,,,, +US-IN-47434,US,IN,47434,7,,,, +US-IN-47435,US,IN,47435,7,,,, +US-IN-47436,US,IN,47436,7,,,, +US-IN-47437,US,IN,47437,7,,,, +US-IN-47438,US,IN,47438,7,,,, +US-IN-47439,US,IN,47439,7,,,, +US-IN-47441,US,IN,47441,7,,,, +US-IN-47443,US,IN,47443,7,,,, +US-IN-47445,US,IN,47445,7,,,, +US-IN-47446,US,IN,47446,7,,,, +US-IN-47448,US,IN,47448,7,,,, +US-IN-47449,US,IN,47449,7,,,, +US-IN-47451,US,IN,47451,7,,,, +US-IN-47452,US,IN,47452,7,,,, +US-IN-47453,US,IN,47453,7,,,, +US-IN-47454,US,IN,47454,7,,,, +US-IN-47455,US,IN,47455,7,,,, +US-IN-47456,US,IN,47456,7,,,, +US-IN-47457,US,IN,47457,7,,,, +US-IN-47458,US,IN,47458,7,,,, +US-IN-47459,US,IN,47459,7,,,, +US-IN-47460,US,IN,47460,7,,,, +US-IN-47462,US,IN,47462,7,,,, +US-IN-47463,US,IN,47463,7,,,, +US-IN-47464,US,IN,47464,7,,,, +US-IN-47465,US,IN,47465,7,,,, +US-IN-47467,US,IN,47467,7,,,, +US-IN-47468,US,IN,47468,7,,,, +US-IN-47469,US,IN,47469,7,,,, +US-IN-47470,US,IN,47470,7,,,, +US-IN-47471,US,IN,47471,7,,,, +US-IN-47501,US,IN,47501,7,,,, +US-IN-47512,US,IN,47512,7,,,, +US-IN-47513,US,IN,47513,7,,,, +US-IN-47514,US,IN,47514,7,,,, +US-IN-47515,US,IN,47515,7,,,, +US-IN-47516,US,IN,47516,7,,,, +US-IN-47519,US,IN,47519,7,,,, +US-IN-47520,US,IN,47520,7,,,, +US-IN-47521,US,IN,47521,7,,,, +US-IN-47522,US,IN,47522,7,,,, +US-IN-47523,US,IN,47523,7,,,, +US-IN-47524,US,IN,47524,7,,,, +US-IN-47525,US,IN,47525,7,,,, +US-IN-47527,US,IN,47527,7,,,, +US-IN-47528,US,IN,47528,7,,,, +US-IN-47529,US,IN,47529,7,,,, +US-IN-47531,US,IN,47531,7,,,, +US-IN-47532,US,IN,47532,7,,,, +US-IN-47535,US,IN,47535,7,,,, +US-IN-47536,US,IN,47536,7,,,, +US-IN-47537,US,IN,47537,7,,,, +US-IN-47541,US,IN,47541,7,,,, +US-IN-47542,US,IN,47542,7,,,, +US-IN-47545,US,IN,47545,7,,,, +US-IN-47546,US,IN,47546,7,,,, +US-IN-47547,US,IN,47547,7,,,, +US-IN-47549,US,IN,47549,7,,,, +US-IN-47550,US,IN,47550,7,,,, +US-IN-47551,US,IN,47551,7,,,, +US-IN-47552,US,IN,47552,7,,,, +US-IN-47553,US,IN,47553,7,,,, +US-IN-47556,US,IN,47556,7,,,, +US-IN-47557,US,IN,47557,7,,,, +US-IN-47558,US,IN,47558,7,,,, +US-IN-47561,US,IN,47561,7,,,, +US-IN-47562,US,IN,47562,7,,,, +US-IN-47564,US,IN,47564,7,,,, +US-IN-47567,US,IN,47567,7,,,, +US-IN-47568,US,IN,47568,7,,,, +US-IN-47573,US,IN,47573,7,,,, +US-IN-47574,US,IN,47574,7,,,, +US-IN-47575,US,IN,47575,7,,,, +US-IN-47576,US,IN,47576,7,,,, +US-IN-47577,US,IN,47577,7,,,, +US-IN-47578,US,IN,47578,7,,,, +US-IN-47579,US,IN,47579,7,,,, +US-IN-47580,US,IN,47580,7,,,, +US-IN-47581,US,IN,47581,7,,,, +US-IN-47584,US,IN,47584,7,,,, +US-IN-47585,US,IN,47585,7,,,, +US-IN-47586,US,IN,47586,7,,,, +US-IN-47588,US,IN,47588,7,,,, +US-IN-47590,US,IN,47590,7,,,, +US-IN-47591,US,IN,47591,7,,,, +US-IN-47596,US,IN,47596,7,,,, +US-IN-47597,US,IN,47597,7,,,, +US-IN-47598,US,IN,47598,7,,,, +US-IN-47601,US,IN,47601,7,,,, +US-IN-47610,US,IN,47610,7,,,, +US-IN-47611,US,IN,47611,7,,,, +US-IN-47612,US,IN,47612,7,,,, +US-IN-47613,US,IN,47613,7,,,, +US-IN-47615,US,IN,47615,7,,,, +US-IN-47616,US,IN,47616,7,,,, +US-IN-47617,US,IN,47617,7,,,, +US-IN-47618,US,IN,47618,7,,,, +US-IN-47619,US,IN,47619,7,,,, +US-IN-47620,US,IN,47620,7,,,, +US-IN-47629,US,IN,47629,7,,,, +US-IN-47630,US,IN,47630,7,,,, +US-IN-47631,US,IN,47631,7,,,, +US-IN-47633,US,IN,47633,7,,,, +US-IN-47634,US,IN,47634,7,,,, +US-IN-47635,US,IN,47635,7,,,, +US-IN-47637,US,IN,47637,7,,,, +US-IN-47638,US,IN,47638,7,,,, +US-IN-47639,US,IN,47639,7,,,, +US-IN-47640,US,IN,47640,7,,,, +US-IN-47647,US,IN,47647,7,,,, +US-IN-47648,US,IN,47648,7,,,, +US-IN-47649,US,IN,47649,7,,,, +US-IN-47654,US,IN,47654,7,,,, +US-IN-47660,US,IN,47660,7,,,, +US-IN-47665,US,IN,47665,7,,,, +US-IN-47666,US,IN,47666,7,,,, +US-IN-47670,US,IN,47670,7,,,, +US-IN-47683,US,IN,47683,7,,,, +US-IN-47701,US,IN,47701,7,,,, +US-IN-47702,US,IN,47702,7,,,, +US-IN-47703,US,IN,47703,7,,,, +US-IN-47704,US,IN,47704,7,,,, +US-IN-47705,US,IN,47705,7,,,, +US-IN-47706,US,IN,47706,7,,,, +US-IN-47708,US,IN,47708,7,,,, +US-IN-47710,US,IN,47710,7,,,, +US-IN-47711,US,IN,47711,7,,,, +US-IN-47712,US,IN,47712,7,,,, +US-IN-47713,US,IN,47713,7,,,, +US-IN-47714,US,IN,47714,7,,,, +US-IN-47715,US,IN,47715,7,,,, +US-IN-47716,US,IN,47716,7,,,, +US-IN-47719,US,IN,47719,7,,,, +US-IN-47720,US,IN,47720,7,,,, +US-IN-47721,US,IN,47721,7,,,, +US-IN-47722,US,IN,47722,7,,,, +US-IN-47724,US,IN,47724,7,,,, +US-IN-47725,US,IN,47725,7,,,, +US-IN-47728,US,IN,47728,7,,,, +US-IN-47730,US,IN,47730,7,,,, +US-IN-47731,US,IN,47731,7,,,, +US-IN-47732,US,IN,47732,7,,,, +US-IN-47733,US,IN,47733,7,,,, +US-IN-47734,US,IN,47734,7,,,, +US-IN-47735,US,IN,47735,7,,,, +US-IN-47736,US,IN,47736,7,,,, +US-IN-47737,US,IN,47737,7,,,, +US-IN-47740,US,IN,47740,7,,,, +US-IN-47747,US,IN,47747,7,,,, +US-IN-47750,US,IN,47750,7,,,, +US-IN-47801,US,IN,47801,7,,,, +US-IN-47802,US,IN,47802,7,,,, +US-IN-47803,US,IN,47803,7,,,, +US-IN-47804,US,IN,47804,7,,,, +US-IN-47805,US,IN,47805,7,,,, +US-IN-47807,US,IN,47807,7,,,, +US-IN-47808,US,IN,47808,7,,,, +US-IN-47809,US,IN,47809,7,,,, +US-IN-47830,US,IN,47830,7,,,, +US-IN-47831,US,IN,47831,7,,,, +US-IN-47832,US,IN,47832,7,,,, +US-IN-47833,US,IN,47833,7,,,, +US-IN-47834,US,IN,47834,7,,,, +US-IN-47836,US,IN,47836,7,,,, +US-IN-47837,US,IN,47837,7,,,, +US-IN-47838,US,IN,47838,7,,,, +US-IN-47840,US,IN,47840,7,,,, +US-IN-47841,US,IN,47841,7,,,, +US-IN-47842,US,IN,47842,7,,,, +US-IN-47845,US,IN,47845,7,,,, +US-IN-47846,US,IN,47846,7,,,, +US-IN-47847,US,IN,47847,7,,,, +US-IN-47848,US,IN,47848,7,,,, +US-IN-47849,US,IN,47849,7,,,, +US-IN-47850,US,IN,47850,7,,,, +US-IN-47851,US,IN,47851,7,,,, +US-IN-47852,US,IN,47852,7,,,, +US-IN-47853,US,IN,47853,7,,,, +US-IN-47854,US,IN,47854,7,,,, +US-IN-47855,US,IN,47855,7,,,, +US-IN-47857,US,IN,47857,7,,,, +US-IN-47858,US,IN,47858,7,,,, +US-IN-47859,US,IN,47859,7,,,, +US-IN-47860,US,IN,47860,7,,,, +US-IN-47861,US,IN,47861,7,,,, +US-IN-47862,US,IN,47862,7,,,, +US-IN-47863,US,IN,47863,7,,,, +US-IN-47865,US,IN,47865,7,,,, +US-IN-47866,US,IN,47866,7,,,, +US-IN-47868,US,IN,47868,7,,,, +US-IN-47869,US,IN,47869,7,,,, +US-IN-47870,US,IN,47870,7,,,, +US-IN-47871,US,IN,47871,7,,,, +US-IN-47872,US,IN,47872,7,,,, +US-IN-47874,US,IN,47874,7,,,, +US-IN-47875,US,IN,47875,7,,,, +US-IN-47876,US,IN,47876,7,,,, +US-IN-47878,US,IN,47878,7,,,, +US-IN-47879,US,IN,47879,7,,,, +US-IN-47880,US,IN,47880,7,,,, +US-IN-47881,US,IN,47881,7,,,, +US-IN-47882,US,IN,47882,7,,,, +US-IN-47884,US,IN,47884,7,,,, +US-IN-47885,US,IN,47885,7,,,, +US-IN-47901,US,IN,47901,7,,,, +US-IN-47902,US,IN,47902,7,,,, +US-IN-47903,US,IN,47903,7,,,, +US-IN-47904,US,IN,47904,7,,,, +US-IN-47905,US,IN,47905,7,,,, +US-IN-47906,US,IN,47906,7,,,, +US-IN-47907,US,IN,47907,7,,,, +US-IN-47909,US,IN,47909,7,,,, +US-IN-47916,US,IN,47916,7,,,, +US-IN-47917,US,IN,47917,7,,,, +US-IN-47918,US,IN,47918,7,,,, +US-IN-47920,US,IN,47920,7,,,, +US-IN-47921,US,IN,47921,7,,,, +US-IN-47922,US,IN,47922,7,,,, +US-IN-47923,US,IN,47923,7,,,, +US-IN-47924,US,IN,47924,7,,,, +US-IN-47925,US,IN,47925,7,,,, +US-IN-47926,US,IN,47926,7,,,, +US-IN-47928,US,IN,47928,7,,,, +US-IN-47929,US,IN,47929,7,,,, +US-IN-47930,US,IN,47930,7,,,, +US-IN-47932,US,IN,47932,7,,,, +US-IN-47933,US,IN,47933,7,,,, +US-IN-47940,US,IN,47940,7,,,, +US-IN-47941,US,IN,47941,7,,,, +US-IN-47942,US,IN,47942,7,,,, +US-IN-47943,US,IN,47943,7,,,, +US-IN-47944,US,IN,47944,7,,,, +US-IN-47946,US,IN,47946,7,,,, +US-IN-47948,US,IN,47948,7,,,, +US-IN-47949,US,IN,47949,7,,,, +US-IN-47950,US,IN,47950,7,,,, +US-IN-47951,US,IN,47951,7,,,, +US-IN-47952,US,IN,47952,7,,,, +US-IN-47954,US,IN,47954,7,,,, +US-IN-47955,US,IN,47955,7,,,, +US-IN-47957,US,IN,47957,7,,,, +US-IN-47958,US,IN,47958,7,,,, +US-IN-47959,US,IN,47959,7,,,, +US-IN-47960,US,IN,47960,7,,,, +US-IN-47962,US,IN,47962,7,,,, +US-IN-47963,US,IN,47963,7,,,, +US-IN-47964,US,IN,47964,7,,,, +US-IN-47965,US,IN,47965,7,,,, +US-IN-47966,US,IN,47966,7,,,, +US-IN-47967,US,IN,47967,7,,,, +US-IN-47968,US,IN,47968,7,,,, +US-IN-47969,US,IN,47969,7,,,, +US-IN-47970,US,IN,47970,7,,,, +US-IN-47971,US,IN,47971,7,,,, +US-IN-47974,US,IN,47974,7,,,, +US-IN-47975,US,IN,47975,7,,,, +US-IN-47977,US,IN,47977,7,,,, +US-IN-47978,US,IN,47978,7,,,, +US-IN-47980,US,IN,47980,7,,,, +US-IN-47981,US,IN,47981,7,,,, +US-IN-47982,US,IN,47982,7,,,, +US-IN-47983,US,IN,47983,7,,,, +US-IN-47984,US,IN,47984,7,,,, +US-IN-47986,US,IN,47986,7,,,, +US-IN-47987,US,IN,47987,7,,,, +US-IN-47988,US,IN,47988,7,,,, +US-IN-47989,US,IN,47989,7,,,, +US-IN-47990,US,IN,47990,7,,,, +US-IN-47991,US,IN,47991,7,,,, +US-IN-47992,US,IN,47992,7,,,, +US-IN-47993,US,IN,47993,7,,,, +US-IN-47994,US,IN,47994,7,,,, +US-IN-47995,US,IN,47995,7,,,, +US-IN-47996,US,IN,47996,7,,,, +US-IN-47997,US,IN,47997,7,,,, +US-KS-66002,US,KS,66002,8.4,,,, +US-KS-66006,US,KS,66006,8.4,,,, +US-KS-66007,US,KS,66007,8.15,,,, +US-KS-66008,US,KS,66008,7.15,,,, +US-KS-66010,US,KS,66010,6.15,,,, +US-KS-66012,US,KS,66012,8.9,,,, +US-KS-66013,US,KS,66013,7.65,,,, +US-KS-66014,US,KS,66014,6.15,,,, +US-KS-66015,US,KS,66015,7.65,,,, +US-KS-66016,US,KS,66016,7.4,,,, +US-KS-66017,US,KS,66017,7.15,,,, +US-KS-66018,US,KS,66018,9.125,,,, +US-KS-66019,US,KS,66019,9.125,,,, +US-KS-66020,US,KS,66020,7.15,,,, +US-KS-66021,US,KS,66021,8.375,,,, +US-KS-66023,US,KS,66023,7.4,,,, +US-KS-66024,US,KS,66024,8.15,,,, +US-KS-66025,US,KS,66025,8.15,,,, +US-KS-66026,US,KS,66026,7.65,,,, +US-KS-66027,US,KS,66027,8.15,,,, +US-KS-66030,US,KS,66030,8.875,,,, +US-KS-66031,US,KS,66031,7.375,,,, +US-KS-66032,US,KS,66032,7.65,,,, +US-KS-66033,US,KS,66033,7.65,,,, +US-KS-66035,US,KS,66035,8.15,,,, +US-KS-66036,US,KS,66036,7.65,,,, +US-KS-66039,US,KS,66039,7.65,,,, +US-KS-66040,US,KS,66040,6.15,,,, +US-KS-66041,US,KS,66041,7.4,,,, +US-KS-66042,US,KS,66042,7.65,,,, +US-KS-66043,US,KS,66043,8.15,,,, +US-KS-66044,US,KS,66044,8.7,,,, +US-KS-66045,US,KS,66045,8.7,,,, +US-KS-66046,US,KS,66046,8.7,,,, +US-KS-66047,US,KS,66047,8.7,,,, +US-KS-66048,US,KS,66048,8.15,,,, +US-KS-66049,US,KS,66049,8.7,,,, +US-KS-66050,US,KS,66050,7.15,,,, +US-KS-66051,US,KS,66051,8.5,,,, +US-KS-66052,US,KS,66052,7.15,,,, +US-KS-66053,US,KS,66053,7.65,,,, +US-KS-66054,US,KS,66054,7.15,,,, +US-KS-66056,US,KS,66056,6.15,,,, +US-KS-66058,US,KS,66058,7.4,,,, +US-KS-66060,US,KS,66060,7.15,,,, +US-KS-66061,US,KS,66061,8.5,,,, +US-KS-66062,US,KS,66062,8.5,,,, +US-KS-66063,US,KS,66063,8.5,,,, +US-KS-66064,US,KS,66064,7.65,,,, +US-KS-66066,US,KS,66066,7.15,,,, +US-KS-66067,US,KS,66067,8.75,,,, +US-KS-66070,US,KS,66070,7.15,,,, +US-KS-66071,US,KS,66071,7.65,,,, +US-KS-66072,US,KS,66072,6.15,,,, +US-KS-66073,US,KS,66073,7.15,,,, +US-KS-66075,US,KS,66075,7.15,,,, +US-KS-66076,US,KS,66076,7.65,,,, +US-KS-66078,US,KS,66078,7.65,,,, +US-KS-66079,US,KS,66079,7.65,,,, +US-KS-66080,US,KS,66080,7.65,,,, +US-KS-66083,US,KS,66083,7.65,,,, +US-KS-66085,US,KS,66085,7.375,,,, +US-KS-66086,US,KS,66086,7.15,,,, +US-KS-66087,US,KS,66087,7.15,,,, +US-KS-66088,US,KS,66088,7.15,,,, +US-KS-66090,US,KS,66090,8.15,,,, +US-KS-66091,US,KS,66091,7.65,,,, +US-KS-66092,US,KS,66092,7.65,,,, +US-KS-66093,US,KS,66093,7.65,,,, +US-KS-66094,US,KS,66094,7.15,,,, +US-KS-66095,US,KS,66095,7.65,,,, +US-KS-66097,US,KS,66097,7.15,,,, +US-KS-66101,US,KS,66101,8.775,,,, +US-KS-66102,US,KS,66102,8.775,,,, +US-KS-66103,US,KS,66103,8.775,,,, +US-KS-66104,US,KS,66104,8.775,,,, +US-KS-66105,US,KS,66105,8.775,,,, +US-KS-66106,US,KS,66106,8.775,,,, +US-KS-66109,US,KS,66109,8.775,,,, +US-KS-66110,US,KS,66110,8.775,,,, +US-KS-66111,US,KS,66111,8.775,,,, +US-KS-66112,US,KS,66112,8.775,,,, +US-KS-66113,US,KS,66113,8.15,,,, +US-KS-66115,US,KS,66115,8.775,,,, +US-KS-66117,US,KS,66117,8.775,,,, +US-KS-66118,US,KS,66118,8.775,,,, +US-KS-66119,US,KS,66119,8.775,,,, +US-KS-66160,US,KS,66160,8.775,,,, +US-KS-66201,US,KS,66201,9,,,, +US-KS-66202,US,KS,66202,9,,,, +US-KS-66203,US,KS,66203,8.625,,,, +US-KS-66204,US,KS,66204,8.5,,,, +US-KS-66205,US,KS,66205,8.625,,,, +US-KS-66206,US,KS,66206,8.5,,,, +US-KS-66207,US,KS,66207,8.5,,,, +US-KS-66208,US,KS,66208,8.375,,,, +US-KS-66209,US,KS,66209,8.5,,,, +US-KS-66210,US,KS,66210,8.5,,,, +US-KS-66211,US,KS,66211,8.5,,,, +US-KS-66212,US,KS,66212,8.5,,,, +US-KS-66213,US,KS,66213,8.5,,,, +US-KS-66214,US,KS,66214,8.5,,,, +US-KS-66215,US,KS,66215,8.75,,,, +US-KS-66216,US,KS,66216,8.625,,,, +US-KS-66217,US,KS,66217,8.625,,,, +US-KS-66218,US,KS,66218,8.625,,,, +US-KS-66219,US,KS,66219,8.75,,,, +US-KS-66220,US,KS,66220,8.75,,,, +US-KS-66221,US,KS,66221,8.5,,,, +US-KS-66222,US,KS,66222,9,,,, +US-KS-66223,US,KS,66223,8.5,,,, +US-KS-66224,US,KS,66224,8.5,,,, +US-KS-66225,US,KS,66225,8.5,,,, +US-KS-66226,US,KS,66226,8.625,,,, +US-KS-66227,US,KS,66227,8.75,,,, +US-KS-66250,US,KS,66250,8.75,,,, +US-KS-66251,US,KS,66251,8.5,,,, +US-KS-66276,US,KS,66276,10,,,, +US-KS-66282,US,KS,66282,8.5,,,, +US-KS-66283,US,KS,66283,8.5,,,, +US-KS-66285,US,KS,66285,8.75,,,, +US-KS-66286,US,KS,66286,8.625,,,, +US-KS-66401,US,KS,66401,7.65,,,, +US-KS-66402,US,KS,66402,7.3,,,, +US-KS-66403,US,KS,66403,7.15,,,, +US-KS-66404,US,KS,66404,7.15,,,, +US-KS-66406,US,KS,66406,6.15,,,, +US-KS-66407,US,KS,66407,7.15,,,, +US-KS-66408,US,KS,66408,7.15,,,, +US-KS-66409,US,KS,66409,7.3,,,, +US-KS-66411,US,KS,66411,7.65,,,, +US-KS-66412,US,KS,66412,6.15,,,, +US-KS-66413,US,KS,66413,7.15,,,, +US-KS-66414,US,KS,66414,7.15,,,, +US-KS-66415,US,KS,66415,7.15,,,, +US-KS-66416,US,KS,66416,7.55,,,, +US-KS-66417,US,KS,66417,7.15,,,, +US-KS-66418,US,KS,66418,7.55,,,, +US-KS-66419,US,KS,66419,7.55,,,, +US-KS-66420,US,KS,66420,7.3,,,, +US-KS-66422,US,KS,66422,7.15,,,, +US-KS-66423,US,KS,66423,7.65,,,, +US-KS-66424,US,KS,66424,7.65,,,, +US-KS-66425,US,KS,66425,7.65,,,, +US-KS-66426,US,KS,66426,7.15,,,, +US-KS-66427,US,KS,66427,7.15,,,, +US-KS-66428,US,KS,66428,7.15,,,, +US-KS-66429,US,KS,66429,7.15,,,, +US-KS-66431,US,KS,66431,7.65,,,, +US-KS-66432,US,KS,66432,7.15,,,, +US-KS-66434,US,KS,66434,8.65,,,, +US-KS-66436,US,KS,66436,7.55,,,, +US-KS-66438,US,KS,66438,6.15,,,, +US-KS-66439,US,KS,66439,8.65,,,, +US-KS-66440,US,KS,66440,7.55,,,, +US-KS-66441,US,KS,66441,9.4,,,, +US-KS-66442,US,KS,66442,7.15,,,, +US-KS-66449,US,KS,66449,7.15,,,, +US-KS-66451,US,KS,66451,7.15,,,, +US-KS-66501,US,KS,66501,7.65,,,, +US-KS-66502,US,KS,66502,8.4,,,, +US-KS-66503,US,KS,66503,8.4,,,, +US-KS-66505,US,KS,66505,8.4,,,, +US-KS-66506,US,KS,66506,8.4,,,, +US-KS-66507,US,KS,66507,7.65,,,, +US-KS-66508,US,KS,66508,7.75,,,, +US-KS-66509,US,KS,66509,7.55,,,, +US-KS-66510,US,KS,66510,7.15,,,, +US-KS-66512,US,KS,66512,7.15,,,, +US-KS-66514,US,KS,66514,7.4,,,, +US-KS-66515,US,KS,66515,7.65,,,, +US-KS-66516,US,KS,66516,7.55,,,, +US-KS-66517,US,KS,66517,8.15,,,, +US-KS-66518,US,KS,66518,6.15,,,, +US-KS-66520,US,KS,66520,7.15,,,, +US-KS-66521,US,KS,66521,7.15,,,, +US-KS-66522,US,KS,66522,7.15,,,, +US-KS-66523,US,KS,66523,8.65,,,, +US-KS-66524,US,KS,66524,7.15,,,, +US-KS-66526,US,KS,66526,7.65,,,, +US-KS-66527,US,KS,66527,7.65,,,, +US-KS-66528,US,KS,66528,7.15,,,, +US-KS-66531,US,KS,66531,8.15,,,, +US-KS-66532,US,KS,66532,7.65,,,, +US-KS-66533,US,KS,66533,7.3,,,, +US-KS-66534,US,KS,66534,8.15,,,, +US-KS-66535,US,KS,66535,7.15,,,, +US-KS-66536,US,KS,66536,8.15,,,, +US-KS-66537,US,KS,66537,7.15,,,, +US-KS-66538,US,KS,66538,8.15,,,, +US-KS-66539,US,KS,66539,7.3,,,, +US-KS-66540,US,KS,66540,7.55,,,, +US-KS-66541,US,KS,66541,6.15,,,, +US-KS-66542,US,KS,66542,7.3,,,, +US-KS-66543,US,KS,66543,7.15,,,, +US-KS-66544,US,KS,66544,6.15,,,, +US-KS-66546,US,KS,66546,7.3,,,, +US-KS-66547,US,KS,66547,8.9,,,, +US-KS-66548,US,KS,66548,7.65,,,, +US-KS-66549,US,KS,66549,7.15,,,, +US-KS-66550,US,KS,66550,7.15,,,, +US-KS-66552,US,KS,66552,7.55,,,, +US-KS-66554,US,KS,66554,7.15,,,, +US-KS-66601,US,KS,66601,8.8,,,, +US-KS-66603,US,KS,66603,8.8,,,, +US-KS-66604,US,KS,66604,8.8,,,, +US-KS-66605,US,KS,66605,8.8,,,, +US-KS-66606,US,KS,66606,8.8,,,, +US-KS-66607,US,KS,66607,8.8,,,, +US-KS-66608,US,KS,66608,8.8,,,, +US-KS-66609,US,KS,66609,8.8,,,, +US-KS-66610,US,KS,66610,7.3,,,, +US-KS-66611,US,KS,66611,8.8,,,, +US-KS-66612,US,KS,66612,8.8,,,, +US-KS-66614,US,KS,66614,8.8,,,, +US-KS-66615,US,KS,66615,7.3,,,, +US-KS-66616,US,KS,66616,8.8,,,, +US-KS-66617,US,KS,66617,7.3,,,, +US-KS-66618,US,KS,66618,7.3,,,, +US-KS-66619,US,KS,66619,7.3,,,, +US-KS-66620,US,KS,66620,8.8,,,, +US-KS-66621,US,KS,66621,8.8,,,, +US-KS-66622,US,KS,66622,8.8,,,, +US-KS-66624,US,KS,66624,8.8,,,, +US-KS-66625,US,KS,66625,8.8,,,, +US-KS-66626,US,KS,66626,8.8,,,, +US-KS-66629,US,KS,66629,8.8,,,, +US-KS-66636,US,KS,66636,8.8,,,, +US-KS-66647,US,KS,66647,8.8,,,, +US-KS-66667,US,KS,66667,8.8,,,, +US-KS-66675,US,KS,66675,8.8,,,, +US-KS-66683,US,KS,66683,8.8,,,, +US-KS-66699,US,KS,66699,8.8,,,, +US-KS-66701,US,KS,66701,8.65,,,, +US-KS-66710,US,KS,66710,6.15,,,, +US-KS-66711,US,KS,66711,7.15,,,, +US-KS-66712,US,KS,66712,8.15,,,, +US-KS-66713,US,KS,66713,8.65,,,, +US-KS-66714,US,KS,66714,6.15,,,, +US-KS-66716,US,KS,66716,8.15,,,, +US-KS-66717,US,KS,66717,6.15,,,, +US-KS-66720,US,KS,66720,8.4,,,, +US-KS-66724,US,KS,66724,7.15,,,, +US-KS-66725,US,KS,66725,7.65,,,, +US-KS-66728,US,KS,66728,7.65,,,, +US-KS-66732,US,KS,66732,7.4,,,, +US-KS-66733,US,KS,66733,7.15,,,, +US-KS-66734,US,KS,66734,7.15,,,, +US-KS-66735,US,KS,66735,7.15,,,, +US-KS-66736,US,KS,66736,8.65,,,, +US-KS-66738,US,KS,66738,7.15,,,, +US-KS-66739,US,KS,66739,8.65,,,, +US-KS-66740,US,KS,66740,7.15,,,, +US-KS-66741,US,KS,66741,7.15,,,, +US-KS-66742,US,KS,66742,8.4,,,, +US-KS-66743,US,KS,66743,8.15,,,, +US-KS-66746,US,KS,66746,7.15,,,, +US-KS-66748,US,KS,66748,8.65,,,, +US-KS-66749,US,KS,66749,8.4,,,, +US-KS-66751,US,KS,66751,7.4,,,, +US-KS-66753,US,KS,66753,7.15,,,, +US-KS-66754,US,KS,66754,7.15,,,, +US-KS-66755,US,KS,66755,7.4,,,, +US-KS-66756,US,KS,66756,7.15,,,, +US-KS-66757,US,KS,66757,9.15,,,, +US-KS-66758,US,KS,66758,7.15,,,, +US-KS-66759,US,KS,66759,6.15,,,, +US-KS-66760,US,KS,66760,7.15,,,, +US-KS-66761,US,KS,66761,7.15,,,, +US-KS-66762,US,KS,66762,8.4,,,, +US-KS-66763,US,KS,66763,8.4,,,, +US-KS-66767,US,KS,66767,6.15,,,, +US-KS-66769,US,KS,66769,7.15,,,, +US-KS-66770,US,KS,66770,7.65,,,, +US-KS-66771,US,KS,66771,7.15,,,, +US-KS-66772,US,KS,66772,7.4,,,, +US-KS-66773,US,KS,66773,8.65,,,, +US-KS-66775,US,KS,66775,7.15,,,, +US-KS-66776,US,KS,66776,7.15,,,, +US-KS-66777,US,KS,66777,7.65,,,, +US-KS-66778,US,KS,66778,8.65,,,, +US-KS-66779,US,KS,66779,8.15,,,, +US-KS-66780,US,KS,66780,7.15,,,, +US-KS-66781,US,KS,66781,7.65,,,, +US-KS-66782,US,KS,66782,7.65,,,, +US-KS-66783,US,KS,66783,8.9,,,, +US-KS-66801,US,KS,66801,8.15,,,, +US-KS-66830,US,KS,66830,7.15,,,, +US-KS-66833,US,KS,66833,7.15,,,, +US-KS-66834,US,KS,66834,7.65,,,, +US-KS-66835,US,KS,66835,7.65,,,, +US-KS-66838,US,KS,66838,7.15,,,, +US-KS-66839,US,KS,66839,8.15,,,, +US-KS-66840,US,KS,66840,6.4,,,, +US-KS-66842,US,KS,66842,6.4,,,, +US-KS-66843,US,KS,66843,6.15,,,, +US-KS-66845,US,KS,66845,7.15,,,, +US-KS-66846,US,KS,66846,8.85,,,, +US-KS-66849,US,KS,66849,7.15,,,, +US-KS-66850,US,KS,66850,6.15,,,, +US-KS-66851,US,KS,66851,8.65,,,, +US-KS-66852,US,KS,66852,6.15,,,, +US-KS-66853,US,KS,66853,7.15,,,, +US-KS-66854,US,KS,66854,7.15,,,, +US-KS-66855,US,KS,66855,7.15,,,, +US-KS-66856,US,KS,66856,7.15,,,, +US-KS-66857,US,KS,66857,7.15,,,, +US-KS-66858,US,KS,66858,7.65,,,, +US-KS-66859,US,KS,66859,7.65,,,, +US-KS-66860,US,KS,66860,7.15,,,, +US-KS-66861,US,KS,66861,8.4,,,, +US-KS-66862,US,KS,66862,6.15,,,, +US-KS-66863,US,KS,66863,7.15,,,, +US-KS-66864,US,KS,66864,8.15,,,, +US-KS-66865,US,KS,66865,7.15,,,, +US-KS-66866,US,KS,66866,8.65,,,, +US-KS-66868,US,KS,66868,7.15,,,, +US-KS-66869,US,KS,66869,7.15,,,, +US-KS-66870,US,KS,66870,7.15,,,, +US-KS-66871,US,KS,66871,6.15,,,, +US-KS-66872,US,KS,66872,7.15,,,, +US-KS-66873,US,KS,66873,7.15,,,, +US-KS-66901,US,KS,66901,8.15,,,, +US-KS-66930,US,KS,66930,8.15,,,, +US-KS-66932,US,KS,66932,7.15,,,, +US-KS-66933,US,KS,66933,7.15,,,, +US-KS-66935,US,KS,66935,8.15,,,, +US-KS-66936,US,KS,66936,7.15,,,, +US-KS-66937,US,KS,66937,7.15,,,, +US-KS-66938,US,KS,66938,7.15,,,, +US-KS-66939,US,KS,66939,8.15,,,, +US-KS-66940,US,KS,66940,8.15,,,, +US-KS-66941,US,KS,66941,7.15,,,, +US-KS-66942,US,KS,66942,7.15,,,, +US-KS-66943,US,KS,66943,7.15,,,, +US-KS-66944,US,KS,66944,7.15,,,, +US-KS-66945,US,KS,66945,7.15,,,, +US-KS-66946,US,KS,66946,7.15,,,, +US-KS-66948,US,KS,66948,7.15,,,, +US-KS-66949,US,KS,66949,7.15,,,, +US-KS-66951,US,KS,66951,7.15,,,, +US-KS-66952,US,KS,66952,7.15,,,, +US-KS-66953,US,KS,66953,7.15,,,, +US-KS-66955,US,KS,66955,7.15,,,, +US-KS-66956,US,KS,66956,7.9,,,, +US-KS-66958,US,KS,66958,7.15,,,, +US-KS-66959,US,KS,66959,8.15,,,, +US-KS-66960,US,KS,66960,8.15,,,, +US-KS-66961,US,KS,66961,8.15,,,, +US-KS-66962,US,KS,66962,7.15,,,, +US-KS-66963,US,KS,66963,7.15,,,, +US-KS-66964,US,KS,66964,8.15,,,, +US-KS-66966,US,KS,66966,8.15,,,, +US-KS-66967,US,KS,66967,7.65,,,, +US-KS-66968,US,KS,66968,8.15,,,, +US-KS-66970,US,KS,66970,7.15,,,, +US-KS-67001,US,KS,67001,7.15,,,, +US-KS-67002,US,KS,67002,7.4,,,, +US-KS-67003,US,KS,67003,6.65,,,, +US-KS-67004,US,KS,67004,7.65,,,, +US-KS-67005,US,KS,67005,8.4,,,, +US-KS-67008,US,KS,67008,6.4,,,, +US-KS-67009,US,KS,67009,7.15,,,, +US-KS-67010,US,KS,67010,6.4,,,, +US-KS-67012,US,KS,67012,6.4,,,, +US-KS-67013,US,KS,67013,7.65,,,, +US-KS-67016,US,KS,67016,7.15,,,, +US-KS-67017,US,KS,67017,6.4,,,, +US-KS-67018,US,KS,67018,6.15,,,, +US-KS-67019,US,KS,67019,6.4,,,, +US-KS-67020,US,KS,67020,8.15,,,, +US-KS-67021,US,KS,67021,7.9,,,, +US-KS-67022,US,KS,67022,7.65,,,, +US-KS-67023,US,KS,67023,6.4,,,, +US-KS-67024,US,KS,67024,8.15,,,, +US-KS-67025,US,KS,67025,7.15,,,, +US-KS-67026,US,KS,67026,7.15,,,, +US-KS-67028,US,KS,67028,7.9,,,, +US-KS-67029,US,KS,67029,8.15,,,, +US-KS-67030,US,KS,67030,7.15,,,, +US-KS-67031,US,KS,67031,6.65,,,, +US-KS-67035,US,KS,67035,6.9,,,, +US-KS-67036,US,KS,67036,6.15,,,, +US-KS-67037,US,KS,67037,7.65,,,, +US-KS-67038,US,KS,67038,6.4,,,, +US-KS-67039,US,KS,67039,6.4,,,, +US-KS-67041,US,KS,67041,6.4,,,, +US-KS-67042,US,KS,67042,7.4,,,, +US-KS-67045,US,KS,67045,8.15,,,, +US-KS-67047,US,KS,67047,7.15,,,, +US-KS-67049,US,KS,67049,6.15,,,, +US-KS-67050,US,KS,67050,7.15,,,, +US-KS-67051,US,KS,67051,6.65,,,, +US-KS-67052,US,KS,67052,7.15,,,, +US-KS-67053,US,KS,67053,7.65,,,, +US-KS-67054,US,KS,67054,8.15,,,, +US-KS-67055,US,KS,67055,7.15,,,, +US-KS-67056,US,KS,67056,8.15,,,, +US-KS-67057,US,KS,67057,7.15,,,, +US-KS-67058,US,KS,67058,7.65,,,, +US-KS-67059,US,KS,67059,7.15,,,, +US-KS-67060,US,KS,67060,7.15,,,, +US-KS-67061,US,KS,67061,7.15,,,, +US-KS-67062,US,KS,67062,8.15,,,, +US-KS-67063,US,KS,67063,8.65,,,, +US-KS-67065,US,KS,67065,7.15,,,, +US-KS-67066,US,KS,67066,7.9,,,, +US-KS-67067,US,KS,67067,7.15,,,, +US-KS-67068,US,KS,67068,7.9,,,, +US-KS-67070,US,KS,67070,7.15,,,, +US-KS-67071,US,KS,67071,7.15,,,, +US-KS-67072,US,KS,67072,6.4,,,, +US-KS-67073,US,KS,67073,7.65,,,, +US-KS-67074,US,KS,67074,6.4,,,, +US-KS-67101,US,KS,67101,7.15,,,, +US-KS-67102,US,KS,67102,6.4,,,, +US-KS-67103,US,KS,67103,6.65,,,, +US-KS-67104,US,KS,67104,7.9,,,, +US-KS-67105,US,KS,67105,6.65,,,, +US-KS-67106,US,KS,67106,6.65,,,, +US-KS-67107,US,KS,67107,8.15,,,, +US-KS-67108,US,KS,67108,7.15,,,, +US-KS-67109,US,KS,67109,7.15,,,, +US-KS-67110,US,KS,67110,7.15,,,, +US-KS-67111,US,KS,67111,6.9,,,, +US-KS-67112,US,KS,67112,6.9,,,, +US-KS-67114,US,KS,67114,8.15,,,, +US-KS-67117,US,KS,67117,8.15,,,, +US-KS-67118,US,KS,67118,6.9,,,, +US-KS-67119,US,KS,67119,7.65,,,, +US-KS-67120,US,KS,67120,7.15,,,, +US-KS-67122,US,KS,67122,7.15,,,, +US-KS-67123,US,KS,67123,6.4,,,, +US-KS-67124,US,KS,67124,8.65,,,, +US-KS-67127,US,KS,67127,6.15,,,, +US-KS-67131,US,KS,67131,6.4,,,, +US-KS-67132,US,KS,67132,6.4,,,, +US-KS-67133,US,KS,67133,6.4,,,, +US-KS-67134,US,KS,67134,7.9,,,, +US-KS-67135,US,KS,67135,8.15,,,, +US-KS-67137,US,KS,67137,7.15,,,, +US-KS-67138,US,KS,67138,7.15,,,, +US-KS-67140,US,KS,67140,6.65,,,, +US-KS-67142,US,KS,67142,6.9,,,, +US-KS-67143,US,KS,67143,7.15,,,, +US-KS-67144,US,KS,67144,6.4,,,, +US-KS-67146,US,KS,67146,6.4,,,, +US-KS-67147,US,KS,67147,7.15,,,, +US-KS-67149,US,KS,67149,7.15,,,, +US-KS-67150,US,KS,67150,6.15,,,, +US-KS-67151,US,KS,67151,8.15,,,, +US-KS-67152,US,KS,67152,8.4,,,, +US-KS-67154,US,KS,67154,6.4,,,, +US-KS-67155,US,KS,67155,6.15,,,, +US-KS-67156,US,KS,67156,7.4,,,, +US-KS-67159,US,KS,67159,6.9,,,, +US-KS-67201,US,KS,67201,7.15,,,, +US-KS-67202,US,KS,67202,7.15,,,, +US-KS-67203,US,KS,67203,7.15,,,, +US-KS-67204,US,KS,67204,7.15,,,, +US-KS-67205,US,KS,67205,7.15,,,, +US-KS-67206,US,KS,67206,7.15,,,, +US-KS-67207,US,KS,67207,7.15,,,, +US-KS-67208,US,KS,67208,7.15,,,, +US-KS-67209,US,KS,67209,7.15,,,, +US-KS-67210,US,KS,67210,7.15,,,, +US-KS-67211,US,KS,67211,7.15,,,, +US-KS-67212,US,KS,67212,7.15,,,, +US-KS-67213,US,KS,67213,7.15,,,, +US-KS-67214,US,KS,67214,7.15,,,, +US-KS-67215,US,KS,67215,7.15,,,, +US-KS-67216,US,KS,67216,7.15,,,, +US-KS-67217,US,KS,67217,7.15,,,, +US-KS-67218,US,KS,67218,7.15,,,, +US-KS-67219,US,KS,67219,7.15,,,, +US-KS-67220,US,KS,67220,7.15,,,, +US-KS-67221,US,KS,67221,7.15,,,, +US-KS-67223,US,KS,67223,7.15,,,, +US-KS-67226,US,KS,67226,7.15,,,, +US-KS-67227,US,KS,67227,7.15,,,, +US-KS-67228,US,KS,67228,7.15,,,, +US-KS-67230,US,KS,67230,7.15,,,, +US-KS-67232,US,KS,67232,7.15,,,, +US-KS-67235,US,KS,67235,7.15,,,, +US-KS-67260,US,KS,67260,7.15,,,, +US-KS-67275,US,KS,67275,7.15,,,, +US-KS-67276,US,KS,67276,7.15,,,, +US-KS-67277,US,KS,67277,7.15,,,, +US-KS-67278,US,KS,67278,7.15,,,, +US-KS-67301,US,KS,67301,9.15,,,, +US-KS-67330,US,KS,67330,8.4,,,, +US-KS-67332,US,KS,67332,7.4,,,, +US-KS-67333,US,KS,67333,8.9,,,, +US-KS-67334,US,KS,67334,8.15,,,, +US-KS-67335,US,KS,67335,8.9,,,, +US-KS-67336,US,KS,67336,8.9,,,, +US-KS-67337,US,KS,67337,9.15,,,, +US-KS-67340,US,KS,67340,7.15,,,, +US-KS-67341,US,KS,67341,7.4,,,, +US-KS-67342,US,KS,67342,7.4,,,, +US-KS-67344,US,KS,67344,6.15,,,, +US-KS-67345,US,KS,67345,7.15,,,, +US-KS-67346,US,KS,67346,7.15,,,, +US-KS-67347,US,KS,67347,6.15,,,, +US-KS-67349,US,KS,67349,7.15,,,, +US-KS-67351,US,KS,67351,6.15,,,, +US-KS-67352,US,KS,67352,7.15,,,, +US-KS-67353,US,KS,67353,7.15,,,, +US-KS-67354,US,KS,67354,7.9,,,, +US-KS-67355,US,KS,67355,8.15,,,, +US-KS-67356,US,KS,67356,8.4,,,, +US-KS-67357,US,KS,67357,8.4,,,, +US-KS-67360,US,KS,67360,8.15,,,, +US-KS-67361,US,KS,67361,9.65,,,, +US-KS-67363,US,KS,67363,6.15,,,, +US-KS-67364,US,KS,67364,6.15,,,, +US-KS-67401,US,KS,67401,8.05,,,, +US-KS-67402,US,KS,67402,8.05,,,, +US-KS-67410,US,KS,67410,8.25,,,, +US-KS-67416,US,KS,67416,7.15,,,, +US-KS-67417,US,KS,67417,7.15,,,, +US-KS-67418,US,KS,67418,7.15,,,, +US-KS-67420,US,KS,67420,8.15,,,, +US-KS-67422,US,KS,67422,7.15,,,, +US-KS-67423,US,KS,67423,7.15,,,, +US-KS-67425,US,KS,67425,7.15,,,, +US-KS-67427,US,KS,67427,7.15,,,, +US-KS-67428,US,KS,67428,7.15,,,, +US-KS-67430,US,KS,67430,7.15,,,, +US-KS-67431,US,KS,67431,7.15,,,, +US-KS-67432,US,KS,67432,8.65,,,, +US-KS-67436,US,KS,67436,8.15,,,, +US-KS-67437,US,KS,67437,7.65,,,, +US-KS-67438,US,KS,67438,7.65,,,, +US-KS-67439,US,KS,67439,8.4,,,, +US-KS-67441,US,KS,67441,7.15,,,, +US-KS-67442,US,KS,67442,7.15,,,, +US-KS-67443,US,KS,67443,7.15,,,, +US-KS-67444,US,KS,67444,9.15,,,, +US-KS-67445,US,KS,67445,8.15,,,, +US-KS-67446,US,KS,67446,7.15,,,, +US-KS-67447,US,KS,67447,7.15,,,, +US-KS-67448,US,KS,67448,7.15,,,, +US-KS-67449,US,KS,67449,8.65,,,, +US-KS-67450,US,KS,67450,7.15,,,, +US-KS-67451,US,KS,67451,7.15,,,, +US-KS-67452,US,KS,67452,7.15,,,, +US-KS-67454,US,KS,67454,8.15,,,, +US-KS-67455,US,KS,67455,8.15,,,, +US-KS-67456,US,KS,67456,8.65,,,, +US-KS-67457,US,KS,67457,7.15,,,, +US-KS-67458,US,KS,67458,7.15,,,, +US-KS-67459,US,KS,67459,7.15,,,, +US-KS-67460,US,KS,67460,8.15,,,, +US-KS-67464,US,KS,67464,7.15,,,, +US-KS-67466,US,KS,67466,8.15,,,, +US-KS-67467,US,KS,67467,8.15,,,, +US-KS-67468,US,KS,67468,7.15,,,, +US-KS-67470,US,KS,67470,7.15,,,, +US-KS-67473,US,KS,67473,7.65,,,, +US-KS-67474,US,KS,67474,7.65,,,, +US-KS-67475,US,KS,67475,7.65,,,, +US-KS-67476,US,KS,67476,7.15,,,, +US-KS-67478,US,KS,67478,7.15,,,, +US-KS-67480,US,KS,67480,7.15,,,, +US-KS-67481,US,KS,67481,7.15,,,, +US-KS-67482,US,KS,67482,7.15,,,, +US-KS-67483,US,KS,67483,7.65,,,, +US-KS-67484,US,KS,67484,7.15,,,, +US-KS-67485,US,KS,67485,7.15,,,, +US-KS-67487,US,KS,67487,7.15,,,, +US-KS-67490,US,KS,67490,8.15,,,, +US-KS-67491,US,KS,67491,7.15,,,, +US-KS-67492,US,KS,67492,7.15,,,, +US-KS-67501,US,KS,67501,8.4,,,, +US-KS-67502,US,KS,67502,8.4,,,, +US-KS-67504,US,KS,67504,8.4,,,, +US-KS-67505,US,KS,67505,8.4,,,, +US-KS-67510,US,KS,67510,7.65,,,, +US-KS-67511,US,KS,67511,7.15,,,, +US-KS-67512,US,KS,67512,7.15,,,, +US-KS-67513,US,KS,67513,6.15,,,, +US-KS-67514,US,KS,67514,7.65,,,, +US-KS-67515,US,KS,67515,6.15,,,, +US-KS-67516,US,KS,67516,6.15,,,, +US-KS-67518,US,KS,67518,6.15,,,, +US-KS-67519,US,KS,67519,7.15,,,, +US-KS-67520,US,KS,67520,6.15,,,, +US-KS-67521,US,KS,67521,6.15,,,, +US-KS-67522,US,KS,67522,7.65,,,, +US-KS-67523,US,KS,67523,8.15,,,, +US-KS-67524,US,KS,67524,7.65,,,, +US-KS-67525,US,KS,67525,7.15,,,, +US-KS-67526,US,KS,67526,7.65,,,, +US-KS-67529,US,KS,67529,8.15,,,, +US-KS-67530,US,KS,67530,7.9,,,, +US-KS-67543,US,KS,67543,7.65,,,, +US-KS-67544,US,KS,67544,7.65,,,, +US-KS-67545,US,KS,67545,7.15,,,, +US-KS-67546,US,KS,67546,7.15,,,, +US-KS-67547,US,KS,67547,8.15,,,, +US-KS-67548,US,KS,67548,7.15,,,, +US-KS-67550,US,KS,67550,8.65,,,, +US-KS-67552,US,KS,67552,7.15,,,, +US-KS-67553,US,KS,67553,6.15,,,, +US-KS-67554,US,KS,67554,8.15,,,, +US-KS-67556,US,KS,67556,6.15,,,, +US-KS-67557,US,KS,67557,7.15,,,, +US-KS-67559,US,KS,67559,6.15,,,, +US-KS-67560,US,KS,67560,7.15,,,, +US-KS-67561,US,KS,67561,7.65,,,, +US-KS-67563,US,KS,67563,7.15,,,, +US-KS-67564,US,KS,67564,7.15,,,, +US-KS-67565,US,KS,67565,6.15,,,, +US-KS-67566,US,KS,67566,7.65,,,, +US-KS-67567,US,KS,67567,7.15,,,, +US-KS-67568,US,KS,67568,7.65,,,, +US-KS-67570,US,KS,67570,7.65,,,, +US-KS-67572,US,KS,67572,6.15,,,, +US-KS-67573,US,KS,67573,7.15,,,, +US-KS-67574,US,KS,67574,8.15,,,, +US-KS-67575,US,KS,67575,6.15,,,, +US-KS-67576,US,KS,67576,7.15,,,, +US-KS-67578,US,KS,67578,8.15,,,, +US-KS-67579,US,KS,67579,8.15,,,, +US-KS-67581,US,KS,67581,7.65,,,, +US-KS-67583,US,KS,67583,7.65,,,, +US-KS-67584,US,KS,67584,6.15,,,, +US-KS-67585,US,KS,67585,7.65,,,, +US-KS-67601,US,KS,67601,8.4,,,, +US-KS-67621,US,KS,67621,6.65,,,, +US-KS-67622,US,KS,67622,7.4,,,, +US-KS-67623,US,KS,67623,7.65,,,, +US-KS-67625,US,KS,67625,7.15,,,, +US-KS-67626,US,KS,67626,8.15,,,, +US-KS-67627,US,KS,67627,6.65,,,, +US-KS-67628,US,KS,67628,7.15,,,, +US-KS-67629,US,KS,67629,6.9,,,, +US-KS-67631,US,KS,67631,8.65,,,, +US-KS-67632,US,KS,67632,6.15,,,, +US-KS-67634,US,KS,67634,8.15,,,, +US-KS-67635,US,KS,67635,8.15,,,, +US-KS-67637,US,KS,67637,8.65,,,, +US-KS-67638,US,KS,67638,7.15,,,, +US-KS-67639,US,KS,67639,6.65,,,, +US-KS-67640,US,KS,67640,8.15,,,, +US-KS-67642,US,KS,67642,8.15,,,, +US-KS-67643,US,KS,67643,7.15,,,, +US-KS-67644,US,KS,67644,6.65,,,, +US-KS-67645,US,KS,67645,6.9,,,, +US-KS-67646,US,KS,67646,7.65,,,, +US-KS-67647,US,KS,67647,6.65,,,, +US-KS-67648,US,KS,67648,8.15,,,, +US-KS-67649,US,KS,67649,8.15,,,, +US-KS-67650,US,KS,67650,7.15,,,, +US-KS-67651,US,KS,67651,7.65,,,, +US-KS-67653,US,KS,67653,7.15,,,, +US-KS-67654,US,KS,67654,8.15,,,, +US-KS-67656,US,KS,67656,7.65,,,, +US-KS-67657,US,KS,67657,6.15,,,, +US-KS-67658,US,KS,67658,8.15,,,, +US-KS-67659,US,KS,67659,7.15,,,, +US-KS-67660,US,KS,67660,6.65,,,, +US-KS-67661,US,KS,67661,8.65,,,, +US-KS-67663,US,KS,67663,8.15,,,, +US-KS-67664,US,KS,67664,6.65,,,, +US-KS-67665,US,KS,67665,8.15,,,, +US-KS-67667,US,KS,67667,6.65,,,, +US-KS-67669,US,KS,67669,7.65,,,, +US-KS-67671,US,KS,67671,7.65,,,, +US-KS-67672,US,KS,67672,8.65,,,, +US-KS-67673,US,KS,67673,8.15,,,, +US-KS-67674,US,KS,67674,6.65,,,, +US-KS-67675,US,KS,67675,6.15,,,, +US-KS-67701,US,KS,67701,7.9,,,, +US-KS-67730,US,KS,67730,7.9,,,, +US-KS-67731,US,KS,67731,8.15,,,, +US-KS-67732,US,KS,67732,7.15,,,, +US-KS-67733,US,KS,67733,8.4,,,, +US-KS-67734,US,KS,67734,7.15,,,, +US-KS-67735,US,KS,67735,8.65,,,, +US-KS-67736,US,KS,67736,7.9,,,, +US-KS-67737,US,KS,67737,7.9,,,, +US-KS-67738,US,KS,67738,8.15,,,, +US-KS-67739,US,KS,67739,7.9,,,, +US-KS-67740,US,KS,67740,8.15,,,, +US-KS-67741,US,KS,67741,8.4,,,, +US-KS-67743,US,KS,67743,7.15,,,, +US-KS-67744,US,KS,67744,7.9,,,, +US-KS-67745,US,KS,67745,7.9,,,, +US-KS-67747,US,KS,67747,7.65,,,, +US-KS-67748,US,KS,67748,8.15,,,, +US-KS-67749,US,KS,67749,8.65,,,, +US-KS-67751,US,KS,67751,7.9,,,, +US-KS-67752,US,KS,67752,7.9,,,, +US-KS-67753,US,KS,67753,7.15,,,, +US-KS-67756,US,KS,67756,8.15,,,, +US-KS-67757,US,KS,67757,8.15,,,, +US-KS-67758,US,KS,67758,6.15,,,, +US-KS-67761,US,KS,67761,7.65,,,, +US-KS-67762,US,KS,67762,6.15,,,, +US-KS-67764,US,KS,67764,7.65,,,, +US-KS-67801,US,KS,67801,8.8,,,, +US-KS-67831,US,KS,67831,6.15,,,, +US-KS-67834,US,KS,67834,7.8,,,, +US-KS-67835,US,KS,67835,7.3,,,, +US-KS-67836,US,KS,67836,8.15,,,, +US-KS-67837,US,KS,67837,7.3,,,, +US-KS-67838,US,KS,67838,7.15,,,, +US-KS-67839,US,KS,67839,7.15,,,, +US-KS-67840,US,KS,67840,6.15,,,, +US-KS-67841,US,KS,67841,7.3,,,, +US-KS-67842,US,KS,67842,7.8,,,, +US-KS-67843,US,KS,67843,7.8,,,, +US-KS-67844,US,KS,67844,7.15,,,, +US-KS-67846,US,KS,67846,8.3,,,, +US-KS-67849,US,KS,67849,7.3,,,, +US-KS-67850,US,KS,67850,7.15,,,, +US-KS-67851,US,KS,67851,7.8,,,, +US-KS-67853,US,KS,67853,7.3,,,, +US-KS-67854,US,KS,67854,8.3,,,, +US-KS-67855,US,KS,67855,7.15,,,, +US-KS-67857,US,KS,67857,7.15,,,, +US-KS-67859,US,KS,67859,7.4,,,, +US-KS-67860,US,KS,67860,7.15,,,, +US-KS-67861,US,KS,67861,8.15,,,, +US-KS-67862,US,KS,67862,7.15,,,, +US-KS-67863,US,KS,67863,8.15,,,, +US-KS-67864,US,KS,67864,8.15,,,, +US-KS-67865,US,KS,67865,7.15,,,, +US-KS-67867,US,KS,67867,7.3,,,, +US-KS-67868,US,KS,67868,7.3,,,, +US-KS-67869,US,KS,67869,7.15,,,, +US-KS-67870,US,KS,67870,7.65,,,, +US-KS-67871,US,KS,67871,8.65,,,, +US-KS-67876,US,KS,67876,7.8,,,, +US-KS-67877,US,KS,67877,7.9,,,, +US-KS-67878,US,KS,67878,8.15,,,, +US-KS-67879,US,KS,67879,7.15,,,, +US-KS-67880,US,KS,67880,8.15,,,, +US-KS-67882,US,KS,67882,7.8,,,, +US-KS-67901,US,KS,67901,8.4,,,, +US-KS-67905,US,KS,67905,8.4,,,, +US-KS-67950,US,KS,67950,7.15,,,, +US-KS-67951,US,KS,67951,7.65,,,, +US-KS-67952,US,KS,67952,8.15,,,, +US-KS-67953,US,KS,67953,6.15,,,, +US-KS-67954,US,KS,67954,8.15,,,, +US-KY-40003,US,KY,40003,6,,,, +US-KY-40004,US,KY,40004,6,,,, +US-KY-40006,US,KY,40006,6,,,, +US-KY-40007,US,KY,40007,6,,,, +US-KY-40008,US,KY,40008,6,,,, +US-KY-40009,US,KY,40009,6,,,, +US-KY-40010,US,KY,40010,6,,,, +US-KY-40011,US,KY,40011,6,,,, +US-KY-40012,US,KY,40012,6,,,, +US-KY-40013,US,KY,40013,6,,,, +US-KY-40014,US,KY,40014,6,,,, +US-KY-40018,US,KY,40018,6,,,, +US-KY-40019,US,KY,40019,6,,,, +US-KY-40020,US,KY,40020,6,,,, +US-KY-40022,US,KY,40022,6,,,, +US-KY-40023,US,KY,40023,6,,,, +US-KY-40025,US,KY,40025,6,,,, +US-KY-40026,US,KY,40026,6,,,, +US-KY-40027,US,KY,40027,6,,,, +US-KY-40031,US,KY,40031,6,,,, +US-KY-40032,US,KY,40032,6,,,, +US-KY-40033,US,KY,40033,6,,,, +US-KY-40036,US,KY,40036,6,,,, +US-KY-40037,US,KY,40037,6,,,, +US-KY-40040,US,KY,40040,6,,,, +US-KY-40041,US,KY,40041,6,,,, +US-KY-40045,US,KY,40045,6,,,, +US-KY-40046,US,KY,40046,6,,,, +US-KY-40047,US,KY,40047,6,,,, +US-KY-40048,US,KY,40048,6,,,, +US-KY-40049,US,KY,40049,6,,,, +US-KY-40050,US,KY,40050,6,,,, +US-KY-40051,US,KY,40051,6,,,, +US-KY-40052,US,KY,40052,6,,,, +US-KY-40055,US,KY,40055,6,,,, +US-KY-40056,US,KY,40056,6,,,, +US-KY-40057,US,KY,40057,6,,,, +US-KY-40058,US,KY,40058,6,,,, +US-KY-40059,US,KY,40059,6,,,, +US-KY-40060,US,KY,40060,6,,,, +US-KY-40061,US,KY,40061,6,,,, +US-KY-40062,US,KY,40062,6,,,, +US-KY-40063,US,KY,40063,6,,,, +US-KY-40065,US,KY,40065,6,,,, +US-KY-40066,US,KY,40066,6,,,, +US-KY-40067,US,KY,40067,6,,,, +US-KY-40068,US,KY,40068,6,,,, +US-KY-40069,US,KY,40069,6,,,, +US-KY-40070,US,KY,40070,6,,,, +US-KY-40071,US,KY,40071,6,,,, +US-KY-40075,US,KY,40075,6,,,, +US-KY-40076,US,KY,40076,6,,,, +US-KY-40077,US,KY,40077,6,,,, +US-KY-40078,US,KY,40078,6,,,, +US-KY-40104,US,KY,40104,6,,,, +US-KY-40107,US,KY,40107,6,,,, +US-KY-40108,US,KY,40108,6,,,, +US-KY-40109,US,KY,40109,6,,,, +US-KY-40110,US,KY,40110,6,,,, +US-KY-40111,US,KY,40111,6,,,, +US-KY-40115,US,KY,40115,6,,,, +US-KY-40117,US,KY,40117,6,,,, +US-KY-40118,US,KY,40118,6,,,, +US-KY-40119,US,KY,40119,6,,,, +US-KY-40121,US,KY,40121,6,,,, +US-KY-40122,US,KY,40122,6,,,, +US-KY-40129,US,KY,40129,6,,,, +US-KY-40140,US,KY,40140,6,,,, +US-KY-40142,US,KY,40142,6,,,, +US-KY-40143,US,KY,40143,6,,,, +US-KY-40144,US,KY,40144,6,,,, +US-KY-40145,US,KY,40145,6,,,, +US-KY-40146,US,KY,40146,6,,,, +US-KY-40150,US,KY,40150,6,,,, +US-KY-40152,US,KY,40152,6,,,, +US-KY-40153,US,KY,40153,6,,,, +US-KY-40155,US,KY,40155,6,,,, +US-KY-40157,US,KY,40157,6,,,, +US-KY-40159,US,KY,40159,6,,,, +US-KY-40160,US,KY,40160,6,,,, +US-KY-40161,US,KY,40161,6,,,, +US-KY-40162,US,KY,40162,6,,,, +US-KY-40165,US,KY,40165,6,,,, +US-KY-40166,US,KY,40166,6,,,, +US-KY-40170,US,KY,40170,6,,,, +US-KY-40171,US,KY,40171,6,,,, +US-KY-40175,US,KY,40175,6,,,, +US-KY-40176,US,KY,40176,6,,,, +US-KY-40177,US,KY,40177,6,,,, +US-KY-40178,US,KY,40178,6,,,, +US-KY-40201,US,KY,40201,6,,,, +US-KY-40202,US,KY,40202,6,,,, +US-KY-40203,US,KY,40203,6,,,, +US-KY-40204,US,KY,40204,6,,,, +US-KY-40205,US,KY,40205,6,,,, +US-KY-40206,US,KY,40206,6,,,, +US-KY-40207,US,KY,40207,6,,,, +US-KY-40208,US,KY,40208,6,,,, +US-KY-40209,US,KY,40209,6,,,, +US-KY-40210,US,KY,40210,6,,,, +US-KY-40211,US,KY,40211,6,,,, +US-KY-40212,US,KY,40212,6,,,, +US-KY-40213,US,KY,40213,6,,,, +US-KY-40214,US,KY,40214,6,,,, +US-KY-40215,US,KY,40215,6,,,, +US-KY-40216,US,KY,40216,6,,,, +US-KY-40217,US,KY,40217,6,,,, +US-KY-40218,US,KY,40218,6,,,, +US-KY-40219,US,KY,40219,6,,,, +US-KY-40220,US,KY,40220,6,,,, +US-KY-40221,US,KY,40221,6,,,, +US-KY-40222,US,KY,40222,6,,,, +US-KY-40223,US,KY,40223,6,,,, +US-KY-40224,US,KY,40224,6,,,, +US-KY-40225,US,KY,40225,6,,,, +US-KY-40228,US,KY,40228,6,,,, +US-KY-40229,US,KY,40229,6,,,, +US-KY-40231,US,KY,40231,6,,,, +US-KY-40232,US,KY,40232,6,,,, +US-KY-40233,US,KY,40233,6,,,, +US-KY-40241,US,KY,40241,6,,,, +US-KY-40242,US,KY,40242,6,,,, +US-KY-40243,US,KY,40243,6,,,, +US-KY-40245,US,KY,40245,6,,,, +US-KY-40250,US,KY,40250,6,,,, +US-KY-40251,US,KY,40251,6,,,, +US-KY-40252,US,KY,40252,6,,,, +US-KY-40253,US,KY,40253,6,,,, +US-KY-40255,US,KY,40255,6,,,, +US-KY-40256,US,KY,40256,6,,,, +US-KY-40257,US,KY,40257,6,,,, +US-KY-40258,US,KY,40258,6,,,, +US-KY-40259,US,KY,40259,6,,,, +US-KY-40261,US,KY,40261,6,,,, +US-KY-40266,US,KY,40266,6,,,, +US-KY-40268,US,KY,40268,6,,,, +US-KY-40269,US,KY,40269,6,,,, +US-KY-40270,US,KY,40270,6,,,, +US-KY-40272,US,KY,40272,6,,,, +US-KY-40280,US,KY,40280,6,,,, +US-KY-40281,US,KY,40281,6,,,, +US-KY-40282,US,KY,40282,6,,,, +US-KY-40283,US,KY,40283,6,,,, +US-KY-40285,US,KY,40285,6,,,, +US-KY-40287,US,KY,40287,6,,,, +US-KY-40289,US,KY,40289,6,,,, +US-KY-40290,US,KY,40290,6,,,, +US-KY-40291,US,KY,40291,6,,,, +US-KY-40292,US,KY,40292,6,,,, +US-KY-40293,US,KY,40293,6,,,, +US-KY-40294,US,KY,40294,6,,,, +US-KY-40295,US,KY,40295,6,,,, +US-KY-40296,US,KY,40296,6,,,, +US-KY-40297,US,KY,40297,6,,,, +US-KY-40298,US,KY,40298,6,,,, +US-KY-40299,US,KY,40299,6,,,, +US-KY-40310,US,KY,40310,6,,,, +US-KY-40311,US,KY,40311,6,,,, +US-KY-40312,US,KY,40312,6,,,, +US-KY-40313,US,KY,40313,6,,,, +US-KY-40316,US,KY,40316,6,,,, +US-KY-40317,US,KY,40317,6,,,, +US-KY-40319,US,KY,40319,6,,,, +US-KY-40322,US,KY,40322,6,,,, +US-KY-40324,US,KY,40324,6,,,, +US-KY-40328,US,KY,40328,6,,,, +US-KY-40330,US,KY,40330,6,,,, +US-KY-40334,US,KY,40334,6,,,, +US-KY-40336,US,KY,40336,6,,,, +US-KY-40337,US,KY,40337,6,,,, +US-KY-40339,US,KY,40339,6,,,, +US-KY-40340,US,KY,40340,6,,,, +US-KY-40342,US,KY,40342,6,,,, +US-KY-40346,US,KY,40346,6,,,, +US-KY-40347,US,KY,40347,6,,,, +US-KY-40348,US,KY,40348,6,,,, +US-KY-40350,US,KY,40350,6,,,, +US-KY-40351,US,KY,40351,6,,,, +US-KY-40353,US,KY,40353,6,,,, +US-KY-40355,US,KY,40355,6,,,, +US-KY-40356,US,KY,40356,6,,,, +US-KY-40357,US,KY,40357,6,,,, +US-KY-40358,US,KY,40358,6,,,, +US-KY-40359,US,KY,40359,6,,,, +US-KY-40360,US,KY,40360,6,,,, +US-KY-40361,US,KY,40361,6,,,, +US-KY-40362,US,KY,40362,6,,,, +US-KY-40363,US,KY,40363,6,,,, +US-KY-40366,US,KY,40366,6,,,, +US-KY-40370,US,KY,40370,6,,,, +US-KY-40371,US,KY,40371,6,,,, +US-KY-40372,US,KY,40372,6,,,, +US-KY-40374,US,KY,40374,6,,,, +US-KY-40376,US,KY,40376,6,,,, +US-KY-40379,US,KY,40379,6,,,, +US-KY-40380,US,KY,40380,6,,,, +US-KY-40383,US,KY,40383,6,,,, +US-KY-40384,US,KY,40384,6,,,, +US-KY-40385,US,KY,40385,6,,,, +US-KY-40387,US,KY,40387,6,,,, +US-KY-40390,US,KY,40390,6,,,, +US-KY-40391,US,KY,40391,6,,,, +US-KY-40392,US,KY,40392,6,,,, +US-KY-40402,US,KY,40402,6,,,, +US-KY-40403,US,KY,40403,6,,,, +US-KY-40404,US,KY,40404,6,,,, +US-KY-40405,US,KY,40405,6,,,, +US-KY-40409,US,KY,40409,6,,,, +US-KY-40410,US,KY,40410,6,,,, +US-KY-40419,US,KY,40419,6,,,, +US-KY-40422,US,KY,40422,6,,,, +US-KY-40423,US,KY,40423,6,,,, +US-KY-40434,US,KY,40434,6,,,, +US-KY-40437,US,KY,40437,6,,,, +US-KY-40440,US,KY,40440,6,,,, +US-KY-40442,US,KY,40442,6,,,, +US-KY-40444,US,KY,40444,6,,,, +US-KY-40445,US,KY,40445,6,,,, +US-KY-40446,US,KY,40446,6,,,, +US-KY-40447,US,KY,40447,6,,,, +US-KY-40448,US,KY,40448,6,,,, +US-KY-40452,US,KY,40452,6,,,, +US-KY-40456,US,KY,40456,6,,,, +US-KY-40460,US,KY,40460,6,,,, +US-KY-40461,US,KY,40461,6,,,, +US-KY-40464,US,KY,40464,6,,,, +US-KY-40468,US,KY,40468,6,,,, +US-KY-40472,US,KY,40472,6,,,, +US-KY-40473,US,KY,40473,6,,,, +US-KY-40475,US,KY,40475,6,,,, +US-KY-40476,US,KY,40476,6,,,, +US-KY-40481,US,KY,40481,6,,,, +US-KY-40484,US,KY,40484,6,,,, +US-KY-40486,US,KY,40486,6,,,, +US-KY-40488,US,KY,40488,6,,,, +US-KY-40489,US,KY,40489,6,,,, +US-KY-40492,US,KY,40492,6,,,, +US-KY-40502,US,KY,40502,6,,,, +US-KY-40503,US,KY,40503,6,,,, +US-KY-40504,US,KY,40504,6,,,, +US-KY-40505,US,KY,40505,6,,,, +US-KY-40506,US,KY,40506,6,,,, +US-KY-40507,US,KY,40507,6,,,, +US-KY-40508,US,KY,40508,6,,,, +US-KY-40509,US,KY,40509,6,,,, +US-KY-40510,US,KY,40510,6,,,, +US-KY-40511,US,KY,40511,6,,,, +US-KY-40512,US,KY,40512,6,,,, +US-KY-40513,US,KY,40513,6,,,, +US-KY-40514,US,KY,40514,6,,,, +US-KY-40515,US,KY,40515,6,,,, +US-KY-40516,US,KY,40516,6,,,, +US-KY-40517,US,KY,40517,6,,,, +US-KY-40522,US,KY,40522,6,,,, +US-KY-40523,US,KY,40523,6,,,, +US-KY-40524,US,KY,40524,6,,,, +US-KY-40526,US,KY,40526,6,,,, +US-KY-40533,US,KY,40533,6,,,, +US-KY-40536,US,KY,40536,6,,,, +US-KY-40544,US,KY,40544,6,,,, +US-KY-40546,US,KY,40546,6,,,, +US-KY-40550,US,KY,40550,6,,,, +US-KY-40555,US,KY,40555,6,,,, +US-KY-40574,US,KY,40574,6,,,, +US-KY-40575,US,KY,40575,6,,,, +US-KY-40576,US,KY,40576,6,,,, +US-KY-40577,US,KY,40577,6,,,, +US-KY-40578,US,KY,40578,6,,,, +US-KY-40579,US,KY,40579,6,,,, +US-KY-40580,US,KY,40580,6,,,, +US-KY-40581,US,KY,40581,6,,,, +US-KY-40582,US,KY,40582,6,,,, +US-KY-40583,US,KY,40583,6,,,, +US-KY-40588,US,KY,40588,6,,,, +US-KY-40591,US,KY,40591,6,,,, +US-KY-40598,US,KY,40598,6,,,, +US-KY-40601,US,KY,40601,6,,,, +US-KY-40602,US,KY,40602,6,,,, +US-KY-40603,US,KY,40603,6,,,, +US-KY-40604,US,KY,40604,6,,,, +US-KY-40618,US,KY,40618,6,,,, +US-KY-40619,US,KY,40619,6,,,, +US-KY-40620,US,KY,40620,6,,,, +US-KY-40621,US,KY,40621,6,,,, +US-KY-40622,US,KY,40622,6,,,, +US-KY-40701,US,KY,40701,6,,,, +US-KY-40702,US,KY,40702,6,,,, +US-KY-40724,US,KY,40724,6,,,, +US-KY-40729,US,KY,40729,6,,,, +US-KY-40730,US,KY,40730,6,,,, +US-KY-40734,US,KY,40734,6,,,, +US-KY-40737,US,KY,40737,6,,,, +US-KY-40740,US,KY,40740,6,,,, +US-KY-40741,US,KY,40741,6,,,, +US-KY-40742,US,KY,40742,6,,,, +US-KY-40743,US,KY,40743,6,,,, +US-KY-40744,US,KY,40744,6,,,, +US-KY-40745,US,KY,40745,6,,,, +US-KY-40755,US,KY,40755,6,,,, +US-KY-40759,US,KY,40759,6,,,, +US-KY-40763,US,KY,40763,6,,,, +US-KY-40769,US,KY,40769,6,,,, +US-KY-40771,US,KY,40771,6,,,, +US-KY-40801,US,KY,40801,6,,,, +US-KY-40803,US,KY,40803,6,,,, +US-KY-40806,US,KY,40806,6,,,, +US-KY-40807,US,KY,40807,6,,,, +US-KY-40808,US,KY,40808,6,,,, +US-KY-40810,US,KY,40810,6,,,, +US-KY-40813,US,KY,40813,6,,,, +US-KY-40815,US,KY,40815,6,,,, +US-KY-40816,US,KY,40816,6,,,, +US-KY-40818,US,KY,40818,6,,,, +US-KY-40819,US,KY,40819,6,,,, +US-KY-40820,US,KY,40820,6,,,, +US-KY-40823,US,KY,40823,6,,,, +US-KY-40824,US,KY,40824,6,,,, +US-KY-40826,US,KY,40826,6,,,, +US-KY-40827,US,KY,40827,6,,,, +US-KY-40828,US,KY,40828,6,,,, +US-KY-40829,US,KY,40829,6,,,, +US-KY-40830,US,KY,40830,6,,,, +US-KY-40831,US,KY,40831,6,,,, +US-KY-40840,US,KY,40840,6,,,, +US-KY-40843,US,KY,40843,6,,,, +US-KY-40844,US,KY,40844,6,,,, +US-KY-40845,US,KY,40845,6,,,, +US-KY-40847,US,KY,40847,6,,,, +US-KY-40849,US,KY,40849,6,,,, +US-KY-40854,US,KY,40854,6,,,, +US-KY-40855,US,KY,40855,6,,,, +US-KY-40856,US,KY,40856,6,,,, +US-KY-40858,US,KY,40858,6,,,, +US-KY-40862,US,KY,40862,6,,,, +US-KY-40863,US,KY,40863,6,,,, +US-KY-40865,US,KY,40865,6,,,, +US-KY-40868,US,KY,40868,6,,,, +US-KY-40870,US,KY,40870,6,,,, +US-KY-40873,US,KY,40873,6,,,, +US-KY-40874,US,KY,40874,6,,,, +US-KY-40902,US,KY,40902,6,,,, +US-KY-40903,US,KY,40903,6,,,, +US-KY-40906,US,KY,40906,6,,,, +US-KY-40913,US,KY,40913,6,,,, +US-KY-40914,US,KY,40914,6,,,, +US-KY-40915,US,KY,40915,6,,,, +US-KY-40921,US,KY,40921,6,,,, +US-KY-40923,US,KY,40923,6,,,, +US-KY-40927,US,KY,40927,6,,,, +US-KY-40930,US,KY,40930,6,,,, +US-KY-40932,US,KY,40932,6,,,, +US-KY-40935,US,KY,40935,6,,,, +US-KY-40939,US,KY,40939,6,,,, +US-KY-40940,US,KY,40940,6,,,, +US-KY-40941,US,KY,40941,6,,,, +US-KY-40943,US,KY,40943,6,,,, +US-KY-40944,US,KY,40944,6,,,, +US-KY-40946,US,KY,40946,6,,,, +US-KY-40949,US,KY,40949,6,,,, +US-KY-40951,US,KY,40951,6,,,, +US-KY-40953,US,KY,40953,6,,,, +US-KY-40955,US,KY,40955,6,,,, +US-KY-40958,US,KY,40958,6,,,, +US-KY-40962,US,KY,40962,6,,,, +US-KY-40964,US,KY,40964,6,,,, +US-KY-40965,US,KY,40965,6,,,, +US-KY-40972,US,KY,40972,6,,,, +US-KY-40977,US,KY,40977,6,,,, +US-KY-40979,US,KY,40979,6,,,, +US-KY-40981,US,KY,40981,6,,,, +US-KY-40982,US,KY,40982,6,,,, +US-KY-40983,US,KY,40983,6,,,, +US-KY-40988,US,KY,40988,6,,,, +US-KY-40995,US,KY,40995,6,,,, +US-KY-40997,US,KY,40997,6,,,, +US-KY-41001,US,KY,41001,6,,,, +US-KY-41002,US,KY,41002,6,,,, +US-KY-41003,US,KY,41003,6,,,, +US-KY-41004,US,KY,41004,6,,,, +US-KY-41005,US,KY,41005,6,,,, +US-KY-41006,US,KY,41006,6,,,, +US-KY-41007,US,KY,41007,6,,,, +US-KY-41008,US,KY,41008,6,,,, +US-KY-41010,US,KY,41010,6,,,, +US-KY-41011,US,KY,41011,6,,,, +US-KY-41012,US,KY,41012,6,,,, +US-KY-41014,US,KY,41014,6,,,, +US-KY-41015,US,KY,41015,6,,,, +US-KY-41016,US,KY,41016,6,,,, +US-KY-41017,US,KY,41017,6,,,, +US-KY-41018,US,KY,41018,6,,,, +US-KY-41019,US,KY,41019,6,,,, +US-KY-41022,US,KY,41022,6,,,, +US-KY-41030,US,KY,41030,6,,,, +US-KY-41031,US,KY,41031,6,,,, +US-KY-41033,US,KY,41033,6,,,, +US-KY-41034,US,KY,41034,6,,,, +US-KY-41035,US,KY,41035,6,,,, +US-KY-41037,US,KY,41037,6,,,, +US-KY-41039,US,KY,41039,6,,,, +US-KY-41040,US,KY,41040,6,,,, +US-KY-41041,US,KY,41041,6,,,, +US-KY-41042,US,KY,41042,6,,,, +US-KY-41043,US,KY,41043,6,,,, +US-KY-41044,US,KY,41044,6,,,, +US-KY-41045,US,KY,41045,6,,,, +US-KY-41046,US,KY,41046,6,,,, +US-KY-41048,US,KY,41048,6,,,, +US-KY-41049,US,KY,41049,6,,,, +US-KY-41051,US,KY,41051,6,,,, +US-KY-41052,US,KY,41052,6,,,, +US-KY-41053,US,KY,41053,6,,,, +US-KY-41055,US,KY,41055,6,,,, +US-KY-41056,US,KY,41056,6,,,, +US-KY-41059,US,KY,41059,6,,,, +US-KY-41061,US,KY,41061,6,,,, +US-KY-41062,US,KY,41062,6,,,, +US-KY-41063,US,KY,41063,6,,,, +US-KY-41064,US,KY,41064,6,,,, +US-KY-41065,US,KY,41065,6,,,, +US-KY-41071,US,KY,41071,6,,,, +US-KY-41072,US,KY,41072,6,,,, +US-KY-41073,US,KY,41073,6,,,, +US-KY-41074,US,KY,41074,6,,,, +US-KY-41075,US,KY,41075,6,,,, +US-KY-41076,US,KY,41076,6,,,, +US-KY-41080,US,KY,41080,6,,,, +US-KY-41081,US,KY,41081,6,,,, +US-KY-41083,US,KY,41083,6,,,, +US-KY-41085,US,KY,41085,6,,,, +US-KY-41086,US,KY,41086,6,,,, +US-KY-41091,US,KY,41091,6,,,, +US-KY-41092,US,KY,41092,6,,,, +US-KY-41093,US,KY,41093,6,,,, +US-KY-41094,US,KY,41094,6,,,, +US-KY-41095,US,KY,41095,6,,,, +US-KY-41096,US,KY,41096,6,,,, +US-KY-41097,US,KY,41097,6,,,, +US-KY-41098,US,KY,41098,6,,,, +US-KY-41099,US,KY,41099,6,,,, +US-KY-41101,US,KY,41101,6,,,, +US-KY-41102,US,KY,41102,6,,,, +US-KY-41105,US,KY,41105,6,,,, +US-KY-41114,US,KY,41114,6,,,, +US-KY-41121,US,KY,41121,6,,,, +US-KY-41124,US,KY,41124,6,,,, +US-KY-41128,US,KY,41128,6,,,, +US-KY-41129,US,KY,41129,6,,,, +US-KY-41132,US,KY,41132,6,,,, +US-KY-41135,US,KY,41135,6,,,, +US-KY-41139,US,KY,41139,6,,,, +US-KY-41141,US,KY,41141,6,,,, +US-KY-41142,US,KY,41142,6,,,, +US-KY-41143,US,KY,41143,6,,,, +US-KY-41144,US,KY,41144,6,,,, +US-KY-41146,US,KY,41146,6,,,, +US-KY-41149,US,KY,41149,6,,,, +US-KY-41159,US,KY,41159,6,,,, +US-KY-41160,US,KY,41160,6,,,, +US-KY-41164,US,KY,41164,6,,,, +US-KY-41166,US,KY,41166,6,,,, +US-KY-41168,US,KY,41168,6,,,, +US-KY-41169,US,KY,41169,6,,,, +US-KY-41171,US,KY,41171,6,,,, +US-KY-41173,US,KY,41173,6,,,, +US-KY-41174,US,KY,41174,6,,,, +US-KY-41175,US,KY,41175,6,,,, +US-KY-41179,US,KY,41179,6,,,, +US-KY-41180,US,KY,41180,6,,,, +US-KY-41181,US,KY,41181,6,,,, +US-KY-41183,US,KY,41183,6,,,, +US-KY-41189,US,KY,41189,6,,,, +US-KY-41201,US,KY,41201,6,,,, +US-KY-41203,US,KY,41203,6,,,, +US-KY-41204,US,KY,41204,6,,,, +US-KY-41214,US,KY,41214,6,,,, +US-KY-41216,US,KY,41216,6,,,, +US-KY-41219,US,KY,41219,6,,,, +US-KY-41222,US,KY,41222,6,,,, +US-KY-41224,US,KY,41224,6,,,, +US-KY-41226,US,KY,41226,6,,,, +US-KY-41230,US,KY,41230,6,,,, +US-KY-41231,US,KY,41231,6,,,, +US-KY-41232,US,KY,41232,6,,,, +US-KY-41234,US,KY,41234,6,,,, +US-KY-41238,US,KY,41238,6,,,, +US-KY-41240,US,KY,41240,6,,,, +US-KY-41250,US,KY,41250,6,,,, +US-KY-41254,US,KY,41254,6,,,, +US-KY-41255,US,KY,41255,6,,,, +US-KY-41256,US,KY,41256,6,,,, +US-KY-41257,US,KY,41257,6,,,, +US-KY-41260,US,KY,41260,6,,,, +US-KY-41262,US,KY,41262,6,,,, +US-KY-41263,US,KY,41263,6,,,, +US-KY-41264,US,KY,41264,6,,,, +US-KY-41265,US,KY,41265,6,,,, +US-KY-41267,US,KY,41267,6,,,, +US-KY-41268,US,KY,41268,6,,,, +US-KY-41271,US,KY,41271,6,,,, +US-KY-41274,US,KY,41274,6,,,, +US-KY-41301,US,KY,41301,6,,,, +US-KY-41307,US,KY,41307,6,,,, +US-KY-41310,US,KY,41310,6,,,, +US-KY-41311,US,KY,41311,6,,,, +US-KY-41314,US,KY,41314,6,,,, +US-KY-41317,US,KY,41317,6,,,, +US-KY-41332,US,KY,41332,6,,,, +US-KY-41333,US,KY,41333,6,,,, +US-KY-41339,US,KY,41339,6,,,, +US-KY-41347,US,KY,41347,6,,,, +US-KY-41348,US,KY,41348,6,,,, +US-KY-41351,US,KY,41351,6,,,, +US-KY-41352,US,KY,41352,6,,,, +US-KY-41360,US,KY,41360,6,,,, +US-KY-41364,US,KY,41364,6,,,, +US-KY-41365,US,KY,41365,6,,,, +US-KY-41366,US,KY,41366,6,,,, +US-KY-41367,US,KY,41367,6,,,, +US-KY-41368,US,KY,41368,6,,,, +US-KY-41385,US,KY,41385,6,,,, +US-KY-41386,US,KY,41386,6,,,, +US-KY-41390,US,KY,41390,6,,,, +US-KY-41397,US,KY,41397,6,,,, +US-KY-41408,US,KY,41408,6,,,, +US-KY-41413,US,KY,41413,6,,,, +US-KY-41421,US,KY,41421,6,,,, +US-KY-41425,US,KY,41425,6,,,, +US-KY-41426,US,KY,41426,6,,,, +US-KY-41451,US,KY,41451,6,,,, +US-KY-41459,US,KY,41459,6,,,, +US-KY-41464,US,KY,41464,6,,,, +US-KY-41465,US,KY,41465,6,,,, +US-KY-41472,US,KY,41472,6,,,, +US-KY-41501,US,KY,41501,6,,,, +US-KY-41502,US,KY,41502,6,,,, +US-KY-41503,US,KY,41503,6,,,, +US-KY-41512,US,KY,41512,6,,,, +US-KY-41513,US,KY,41513,6,,,, +US-KY-41514,US,KY,41514,6,,,, +US-KY-41517,US,KY,41517,6,,,, +US-KY-41519,US,KY,41519,6,,,, +US-KY-41520,US,KY,41520,6,,,, +US-KY-41522,US,KY,41522,6,,,, +US-KY-41524,US,KY,41524,6,,,, +US-KY-41526,US,KY,41526,6,,,, +US-KY-41527,US,KY,41527,6,,,, +US-KY-41528,US,KY,41528,6,,,, +US-KY-41531,US,KY,41531,6,,,, +US-KY-41534,US,KY,41534,6,,,, +US-KY-41535,US,KY,41535,6,,,, +US-KY-41537,US,KY,41537,6,,,, +US-KY-41538,US,KY,41538,6,,,, +US-KY-41539,US,KY,41539,6,,,, +US-KY-41540,US,KY,41540,6,,,, +US-KY-41542,US,KY,41542,6,,,, +US-KY-41543,US,KY,41543,6,,,, +US-KY-41544,US,KY,41544,6,,,, +US-KY-41547,US,KY,41547,6,,,, +US-KY-41548,US,KY,41548,6,,,, +US-KY-41549,US,KY,41549,6,,,, +US-KY-41553,US,KY,41553,6,,,, +US-KY-41554,US,KY,41554,6,,,, +US-KY-41555,US,KY,41555,6,,,, +US-KY-41557,US,KY,41557,6,,,, +US-KY-41558,US,KY,41558,6,,,, +US-KY-41559,US,KY,41559,6,,,, +US-KY-41560,US,KY,41560,6,,,, +US-KY-41561,US,KY,41561,6,,,, +US-KY-41562,US,KY,41562,6,,,, +US-KY-41563,US,KY,41563,6,,,, +US-KY-41564,US,KY,41564,6,,,, +US-KY-41566,US,KY,41566,6,,,, +US-KY-41567,US,KY,41567,6,,,, +US-KY-41568,US,KY,41568,6,,,, +US-KY-41571,US,KY,41571,6,,,, +US-KY-41572,US,KY,41572,6,,,, +US-KY-41601,US,KY,41601,6,,,, +US-KY-41602,US,KY,41602,6,,,, +US-KY-41603,US,KY,41603,6,,,, +US-KY-41604,US,KY,41604,6,,,, +US-KY-41605,US,KY,41605,6,,,, +US-KY-41606,US,KY,41606,6,,,, +US-KY-41607,US,KY,41607,6,,,, +US-KY-41612,US,KY,41612,6,,,, +US-KY-41615,US,KY,41615,6,,,, +US-KY-41616,US,KY,41616,6,,,, +US-KY-41619,US,KY,41619,6,,,, +US-KY-41621,US,KY,41621,6,,,, +US-KY-41622,US,KY,41622,6,,,, +US-KY-41630,US,KY,41630,6,,,, +US-KY-41631,US,KY,41631,6,,,, +US-KY-41632,US,KY,41632,6,,,, +US-KY-41635,US,KY,41635,6,,,, +US-KY-41636,US,KY,41636,6,,,, +US-KY-41640,US,KY,41640,6,,,, +US-KY-41642,US,KY,41642,6,,,, +US-KY-41643,US,KY,41643,6,,,, +US-KY-41645,US,KY,41645,6,,,, +US-KY-41647,US,KY,41647,6,,,, +US-KY-41649,US,KY,41649,6,,,, +US-KY-41650,US,KY,41650,6,,,, +US-KY-41651,US,KY,41651,6,,,, +US-KY-41653,US,KY,41653,6,,,, +US-KY-41655,US,KY,41655,6,,,, +US-KY-41659,US,KY,41659,6,,,, +US-KY-41660,US,KY,41660,6,,,, +US-KY-41663,US,KY,41663,6,,,, +US-KY-41666,US,KY,41666,6,,,, +US-KY-41667,US,KY,41667,6,,,, +US-KY-41669,US,KY,41669,6,,,, +US-KY-41701,US,KY,41701,6,,,, +US-KY-41702,US,KY,41702,6,,,, +US-KY-41712,US,KY,41712,6,,,, +US-KY-41713,US,KY,41713,6,,,, +US-KY-41714,US,KY,41714,6,,,, +US-KY-41719,US,KY,41719,6,,,, +US-KY-41721,US,KY,41721,6,,,, +US-KY-41722,US,KY,41722,6,,,, +US-KY-41723,US,KY,41723,6,,,, +US-KY-41725,US,KY,41725,6,,,, +US-KY-41727,US,KY,41727,6,,,, +US-KY-41729,US,KY,41729,6,,,, +US-KY-41731,US,KY,41731,6,,,, +US-KY-41735,US,KY,41735,6,,,, +US-KY-41736,US,KY,41736,6,,,, +US-KY-41739,US,KY,41739,6,,,, +US-KY-41740,US,KY,41740,6,,,, +US-KY-41743,US,KY,41743,6,,,, +US-KY-41745,US,KY,41745,6,,,, +US-KY-41746,US,KY,41746,6,,,, +US-KY-41749,US,KY,41749,6,,,, +US-KY-41751,US,KY,41751,6,,,, +US-KY-41754,US,KY,41754,6,,,, +US-KY-41759,US,KY,41759,6,,,, +US-KY-41760,US,KY,41760,6,,,, +US-KY-41762,US,KY,41762,6,,,, +US-KY-41763,US,KY,41763,6,,,, +US-KY-41764,US,KY,41764,6,,,, +US-KY-41766,US,KY,41766,6,,,, +US-KY-41772,US,KY,41772,6,,,, +US-KY-41773,US,KY,41773,6,,,, +US-KY-41774,US,KY,41774,6,,,, +US-KY-41775,US,KY,41775,6,,,, +US-KY-41776,US,KY,41776,6,,,, +US-KY-41777,US,KY,41777,6,,,, +US-KY-41778,US,KY,41778,6,,,, +US-KY-41804,US,KY,41804,6,,,, +US-KY-41810,US,KY,41810,6,,,, +US-KY-41812,US,KY,41812,6,,,, +US-KY-41815,US,KY,41815,6,,,, +US-KY-41817,US,KY,41817,6,,,, +US-KY-41819,US,KY,41819,6,,,, +US-KY-41821,US,KY,41821,6,,,, +US-KY-41822,US,KY,41822,6,,,, +US-KY-41824,US,KY,41824,6,,,, +US-KY-41825,US,KY,41825,6,,,, +US-KY-41826,US,KY,41826,6,,,, +US-KY-41828,US,KY,41828,6,,,, +US-KY-41831,US,KY,41831,6,,,, +US-KY-41832,US,KY,41832,6,,,, +US-KY-41833,US,KY,41833,6,,,, +US-KY-41834,US,KY,41834,6,,,, +US-KY-41835,US,KY,41835,6,,,, +US-KY-41836,US,KY,41836,6,,,, +US-KY-41837,US,KY,41837,6,,,, +US-KY-41838,US,KY,41838,6,,,, +US-KY-41839,US,KY,41839,6,,,, +US-KY-41840,US,KY,41840,6,,,, +US-KY-41843,US,KY,41843,6,,,, +US-KY-41844,US,KY,41844,6,,,, +US-KY-41845,US,KY,41845,6,,,, +US-KY-41847,US,KY,41847,6,,,, +US-KY-41848,US,KY,41848,6,,,, +US-KY-41849,US,KY,41849,6,,,, +US-KY-41855,US,KY,41855,6,,,, +US-KY-41858,US,KY,41858,6,,,, +US-KY-41859,US,KY,41859,6,,,, +US-KY-41861,US,KY,41861,6,,,, +US-KY-41862,US,KY,41862,6,,,, +US-KY-42001,US,KY,42001,6,,,, +US-KY-42002,US,KY,42002,6,,,, +US-KY-42003,US,KY,42003,6,,,, +US-KY-42020,US,KY,42020,6,,,, +US-KY-42021,US,KY,42021,6,,,, +US-KY-42022,US,KY,42022,6,,,, +US-KY-42023,US,KY,42023,6,,,, +US-KY-42024,US,KY,42024,6,,,, +US-KY-42025,US,KY,42025,6,,,, +US-KY-42027,US,KY,42027,6,,,, +US-KY-42028,US,KY,42028,6,,,, +US-KY-42029,US,KY,42029,6,,,, +US-KY-42031,US,KY,42031,6,,,, +US-KY-42032,US,KY,42032,6,,,, +US-KY-42033,US,KY,42033,6,,,, +US-KY-42035,US,KY,42035,6,,,, +US-KY-42036,US,KY,42036,6,,,, +US-KY-42037,US,KY,42037,6,,,, +US-KY-42038,US,KY,42038,6,,,, +US-KY-42039,US,KY,42039,6,,,, +US-KY-42040,US,KY,42040,6,,,, +US-KY-42041,US,KY,42041,6,,,, +US-KY-42044,US,KY,42044,6,,,, +US-KY-42045,US,KY,42045,6,,,, +US-KY-42047,US,KY,42047,6,,,, +US-KY-42048,US,KY,42048,6,,,, +US-KY-42049,US,KY,42049,6,,,, +US-KY-42050,US,KY,42050,6,,,, +US-KY-42051,US,KY,42051,6,,,, +US-KY-42053,US,KY,42053,6,,,, +US-KY-42054,US,KY,42054,6,,,, +US-KY-42055,US,KY,42055,6,,,, +US-KY-42056,US,KY,42056,6,,,, +US-KY-42058,US,KY,42058,6,,,, +US-KY-42060,US,KY,42060,6,,,, +US-KY-42061,US,KY,42061,6,,,, +US-KY-42063,US,KY,42063,6,,,, +US-KY-42064,US,KY,42064,6,,,, +US-KY-42066,US,KY,42066,6,,,, +US-KY-42069,US,KY,42069,6,,,, +US-KY-42070,US,KY,42070,6,,,, +US-KY-42071,US,KY,42071,6,,,, +US-KY-42076,US,KY,42076,6,,,, +US-KY-42078,US,KY,42078,6,,,, +US-KY-42079,US,KY,42079,6,,,, +US-KY-42081,US,KY,42081,6,,,, +US-KY-42082,US,KY,42082,6,,,, +US-KY-42083,US,KY,42083,6,,,, +US-KY-42084,US,KY,42084,6,,,, +US-KY-42085,US,KY,42085,6,,,, +US-KY-42086,US,KY,42086,6,,,, +US-KY-42087,US,KY,42087,6,,,, +US-KY-42088,US,KY,42088,6,,,, +US-KY-42101,US,KY,42101,6,,,, +US-KY-42102,US,KY,42102,6,,,, +US-KY-42103,US,KY,42103,6,,,, +US-KY-42104,US,KY,42104,6,,,, +US-KY-42120,US,KY,42120,6,,,, +US-KY-42122,US,KY,42122,6,,,, +US-KY-42123,US,KY,42123,6,,,, +US-KY-42124,US,KY,42124,6,,,, +US-KY-42127,US,KY,42127,6,,,, +US-KY-42128,US,KY,42128,6,,,, +US-KY-42129,US,KY,42129,6,,,, +US-KY-42130,US,KY,42130,6,,,, +US-KY-42131,US,KY,42131,6,,,, +US-KY-42133,US,KY,42133,6,,,, +US-KY-42134,US,KY,42134,6,,,, +US-KY-42135,US,KY,42135,6,,,, +US-KY-42140,US,KY,42140,6,,,, +US-KY-42141,US,KY,42141,6,,,, +US-KY-42142,US,KY,42142,6,,,, +US-KY-42151,US,KY,42151,6,,,, +US-KY-42152,US,KY,42152,6,,,, +US-KY-42153,US,KY,42153,6,,,, +US-KY-42154,US,KY,42154,6,,,, +US-KY-42156,US,KY,42156,6,,,, +US-KY-42157,US,KY,42157,6,,,, +US-KY-42159,US,KY,42159,6,,,, +US-KY-42160,US,KY,42160,6,,,, +US-KY-42163,US,KY,42163,6,,,, +US-KY-42164,US,KY,42164,6,,,, +US-KY-42166,US,KY,42166,6,,,, +US-KY-42167,US,KY,42167,6,,,, +US-KY-42170,US,KY,42170,6,,,, +US-KY-42171,US,KY,42171,6,,,, +US-KY-42201,US,KY,42201,6,,,, +US-KY-42202,US,KY,42202,6,,,, +US-KY-42204,US,KY,42204,6,,,, +US-KY-42206,US,KY,42206,6,,,, +US-KY-42207,US,KY,42207,6,,,, +US-KY-42210,US,KY,42210,6,,,, +US-KY-42211,US,KY,42211,6,,,, +US-KY-42214,US,KY,42214,6,,,, +US-KY-42215,US,KY,42215,6,,,, +US-KY-42216,US,KY,42216,6,,,, +US-KY-42217,US,KY,42217,6,,,, +US-KY-42219,US,KY,42219,6,,,, +US-KY-42220,US,KY,42220,6,,,, +US-KY-42221,US,KY,42221,6,,,, +US-KY-42223,US,KY,42223,6,,,, +US-KY-42232,US,KY,42232,6,,,, +US-KY-42234,US,KY,42234,6,,,, +US-KY-42236,US,KY,42236,6,,,, +US-KY-42240,US,KY,42240,6,,,, +US-KY-42241,US,KY,42241,6,,,, +US-KY-42252,US,KY,42252,6,,,, +US-KY-42254,US,KY,42254,6,,,, +US-KY-42256,US,KY,42256,6,,,, +US-KY-42259,US,KY,42259,6,,,, +US-KY-42261,US,KY,42261,6,,,, +US-KY-42262,US,KY,42262,6,,,, +US-KY-42265,US,KY,42265,6,,,, +US-KY-42266,US,KY,42266,6,,,, +US-KY-42273,US,KY,42273,6,,,, +US-KY-42274,US,KY,42274,6,,,, +US-KY-42275,US,KY,42275,6,,,, +US-KY-42276,US,KY,42276,6,,,, +US-KY-42280,US,KY,42280,6,,,, +US-KY-42285,US,KY,42285,6,,,, +US-KY-42286,US,KY,42286,6,,,, +US-KY-42288,US,KY,42288,6,,,, +US-KY-42301,US,KY,42301,6,,,, +US-KY-42302,US,KY,42302,6,,,, +US-KY-42303,US,KY,42303,6,,,, +US-KY-42304,US,KY,42304,6,,,, +US-KY-42320,US,KY,42320,6,,,, +US-KY-42321,US,KY,42321,6,,,, +US-KY-42322,US,KY,42322,6,,,, +US-KY-42323,US,KY,42323,6,,,, +US-KY-42324,US,KY,42324,6,,,, +US-KY-42325,US,KY,42325,6,,,, +US-KY-42326,US,KY,42326,6,,,, +US-KY-42327,US,KY,42327,6,,,, +US-KY-42328,US,KY,42328,6,,,, +US-KY-42330,US,KY,42330,6,,,, +US-KY-42332,US,KY,42332,6,,,, +US-KY-42333,US,KY,42333,6,,,, +US-KY-42334,US,KY,42334,6,,,, +US-KY-42337,US,KY,42337,6,,,, +US-KY-42338,US,KY,42338,6,,,, +US-KY-42339,US,KY,42339,6,,,, +US-KY-42343,US,KY,42343,6,,,, +US-KY-42344,US,KY,42344,6,,,, +US-KY-42345,US,KY,42345,6,,,, +US-KY-42347,US,KY,42347,6,,,, +US-KY-42348,US,KY,42348,6,,,, +US-KY-42349,US,KY,42349,6,,,, +US-KY-42350,US,KY,42350,6,,,, +US-KY-42351,US,KY,42351,6,,,, +US-KY-42352,US,KY,42352,6,,,, +US-KY-42354,US,KY,42354,6,,,, +US-KY-42355,US,KY,42355,6,,,, +US-KY-42356,US,KY,42356,6,,,, +US-KY-42361,US,KY,42361,6,,,, +US-KY-42364,US,KY,42364,6,,,, +US-KY-42366,US,KY,42366,6,,,, +US-KY-42367,US,KY,42367,6,,,, +US-KY-42368,US,KY,42368,6,,,, +US-KY-42369,US,KY,42369,6,,,, +US-KY-42370,US,KY,42370,6,,,, +US-KY-42371,US,KY,42371,6,,,, +US-KY-42372,US,KY,42372,6,,,, +US-KY-42374,US,KY,42374,6,,,, +US-KY-42376,US,KY,42376,6,,,, +US-KY-42377,US,KY,42377,6,,,, +US-KY-42378,US,KY,42378,6,,,, +US-KY-42402,US,KY,42402,6,,,, +US-KY-42404,US,KY,42404,6,,,, +US-KY-42406,US,KY,42406,6,,,, +US-KY-42408,US,KY,42408,6,,,, +US-KY-42409,US,KY,42409,6,,,, +US-KY-42410,US,KY,42410,6,,,, +US-KY-42411,US,KY,42411,6,,,, +US-KY-42413,US,KY,42413,6,,,, +US-KY-42419,US,KY,42419,6,,,, +US-KY-42420,US,KY,42420,6,,,, +US-KY-42431,US,KY,42431,6,,,, +US-KY-42436,US,KY,42436,6,,,, +US-KY-42437,US,KY,42437,6,,,, +US-KY-42440,US,KY,42440,6,,,, +US-KY-42441,US,KY,42441,6,,,, +US-KY-42442,US,KY,42442,6,,,, +US-KY-42444,US,KY,42444,6,,,, +US-KY-42445,US,KY,42445,6,,,, +US-KY-42450,US,KY,42450,6,,,, +US-KY-42451,US,KY,42451,6,,,, +US-KY-42452,US,KY,42452,6,,,, +US-KY-42453,US,KY,42453,6,,,, +US-KY-42455,US,KY,42455,6,,,, +US-KY-42456,US,KY,42456,6,,,, +US-KY-42457,US,KY,42457,6,,,, +US-KY-42458,US,KY,42458,6,,,, +US-KY-42459,US,KY,42459,6,,,, +US-KY-42460,US,KY,42460,6,,,, +US-KY-42461,US,KY,42461,6,,,, +US-KY-42462,US,KY,42462,6,,,, +US-KY-42463,US,KY,42463,6,,,, +US-KY-42464,US,KY,42464,6,,,, +US-KY-42501,US,KY,42501,6,,,, +US-KY-42502,US,KY,42502,6,,,, +US-KY-42503,US,KY,42503,6,,,, +US-KY-42516,US,KY,42516,6,,,, +US-KY-42518,US,KY,42518,6,,,, +US-KY-42519,US,KY,42519,6,,,, +US-KY-42528,US,KY,42528,6,,,, +US-KY-42533,US,KY,42533,6,,,, +US-KY-42539,US,KY,42539,6,,,, +US-KY-42541,US,KY,42541,6,,,, +US-KY-42544,US,KY,42544,6,,,, +US-KY-42553,US,KY,42553,6,,,, +US-KY-42558,US,KY,42558,6,,,, +US-KY-42564,US,KY,42564,6,,,, +US-KY-42565,US,KY,42565,6,,,, +US-KY-42566,US,KY,42566,6,,,, +US-KY-42567,US,KY,42567,6,,,, +US-KY-42602,US,KY,42602,6,,,, +US-KY-42603,US,KY,42603,6,,,, +US-KY-42629,US,KY,42629,6,,,, +US-KY-42631,US,KY,42631,6,,,, +US-KY-42633,US,KY,42633,6,,,, +US-KY-42634,US,KY,42634,6,,,, +US-KY-42635,US,KY,42635,6,,,, +US-KY-42638,US,KY,42638,6,,,, +US-KY-42642,US,KY,42642,6,,,, +US-KY-42647,US,KY,42647,6,,,, +US-KY-42649,US,KY,42649,6,,,, +US-KY-42653,US,KY,42653,6,,,, +US-KY-42701,US,KY,42701,6,,,, +US-KY-42702,US,KY,42702,6,,,, +US-KY-42712,US,KY,42712,6,,,, +US-KY-42713,US,KY,42713,6,,,, +US-KY-42715,US,KY,42715,6,,,, +US-KY-42716,US,KY,42716,6,,,, +US-KY-42717,US,KY,42717,6,,,, +US-KY-42718,US,KY,42718,6,,,, +US-KY-42719,US,KY,42719,6,,,, +US-KY-42720,US,KY,42720,6,,,, +US-KY-42721,US,KY,42721,6,,,, +US-KY-42722,US,KY,42722,6,,,, +US-KY-42724,US,KY,42724,6,,,, +US-KY-42726,US,KY,42726,6,,,, +US-KY-42728,US,KY,42728,6,,,, +US-KY-42729,US,KY,42729,6,,,, +US-KY-42731,US,KY,42731,6,,,, +US-KY-42732,US,KY,42732,6,,,, +US-KY-42733,US,KY,42733,6,,,, +US-KY-42740,US,KY,42740,6,,,, +US-KY-42741,US,KY,42741,6,,,, +US-KY-42742,US,KY,42742,6,,,, +US-KY-42743,US,KY,42743,6,,,, +US-KY-42746,US,KY,42746,6,,,, +US-KY-42748,US,KY,42748,6,,,, +US-KY-42749,US,KY,42749,6,,,, +US-KY-42753,US,KY,42753,6,,,, +US-KY-42754,US,KY,42754,6,,,, +US-KY-42755,US,KY,42755,6,,,, +US-KY-42757,US,KY,42757,6,,,, +US-KY-42758,US,KY,42758,6,,,, +US-KY-42759,US,KY,42759,6,,,, +US-KY-42762,US,KY,42762,6,,,, +US-KY-42764,US,KY,42764,6,,,, +US-KY-42765,US,KY,42765,6,,,, +US-KY-42776,US,KY,42776,6,,,, +US-KY-42782,US,KY,42782,6,,,, +US-KY-42784,US,KY,42784,6,,,, +US-KY-42788,US,KY,42788,6,,,, +US-LA-70001,US,LA,70001,8.75,,,, +US-LA-70002,US,LA,70002,8.75,,,, +US-LA-70003,US,LA,70003,8.75,,,, +US-LA-70004,US,LA,70004,8.75,,,, +US-LA-70005,US,LA,70005,8.75,,,, +US-LA-70006,US,LA,70006,8.75,,,, +US-LA-70009,US,LA,70009,8.75,,,, +US-LA-70010,US,LA,70010,8.75,,,, +US-LA-70011,US,LA,70011,8.75,,,, +US-LA-70030,US,LA,70030,9,,,, +US-LA-70031,US,LA,70031,9,,,, +US-LA-70032,US,LA,70032,9,,,, +US-LA-70033,US,LA,70033,8.75,,,, +US-LA-70036,US,LA,70036,8.75,,,, +US-LA-70037,US,LA,70037,8,,,, +US-LA-70038,US,LA,70038,8,,,, +US-LA-70039,US,LA,70039,9,,,, +US-LA-70040,US,LA,70040,8,,,, +US-LA-70041,US,LA,70041,8,,,, +US-LA-70043,US,LA,70043,9,,,, +US-LA-70044,US,LA,70044,9,,,, +US-LA-70047,US,LA,70047,9,,,, +US-LA-70049,US,LA,70049,8.75,,,, +US-LA-70050,US,LA,70050,8,,,, +US-LA-70051,US,LA,70051,8.75,,,, +US-LA-70052,US,LA,70052,7.5,,,, +US-LA-70053,US,LA,70053,8.75,,,, +US-LA-70054,US,LA,70054,8.75,,,, +US-LA-70055,US,LA,70055,8.75,,,, +US-LA-70056,US,LA,70056,8.75,,,, +US-LA-70057,US,LA,70057,9,,,, +US-LA-70058,US,LA,70058,8.75,,,, +US-LA-70059,US,LA,70059,8.75,,,, +US-LA-70060,US,LA,70060,8.75,,,, +US-LA-70062,US,LA,70062,8.75,,,, +US-LA-70063,US,LA,70063,8.75,,,, +US-LA-70064,US,LA,70064,8.75,,,, +US-LA-70065,US,LA,70065,8.75,,,, +US-LA-70067,US,LA,70067,8.75,,,, +US-LA-70068,US,LA,70068,8.75,,,, +US-LA-70069,US,LA,70069,8.75,,,, +US-LA-70070,US,LA,70070,9,,,, +US-LA-70071,US,LA,70071,7.5,,,, +US-LA-70072,US,LA,70072,8.75,,,, +US-LA-70073,US,LA,70073,8.75,,,, +US-LA-70075,US,LA,70075,9,,,, +US-LA-70076,US,LA,70076,8.75,,,, +US-LA-70078,US,LA,70078,9,,,, +US-LA-70079,US,LA,70079,9,,,, +US-LA-70080,US,LA,70080,9,,,, +US-LA-70081,US,LA,70081,8,,,, +US-LA-70082,US,LA,70082,8,,,, +US-LA-70083,US,LA,70083,8,,,, +US-LA-70084,US,LA,70084,8.75,,,, +US-LA-70085,US,LA,70085,9,,,, +US-LA-70086,US,LA,70086,7.5,,,, +US-LA-70087,US,LA,70087,9,,,, +US-LA-70090,US,LA,70090,7.5,,,, +US-LA-70091,US,LA,70091,8,,,, +US-LA-70092,US,LA,70092,9,,,, +US-LA-70093,US,LA,70093,8,,,, +US-LA-70094,US,LA,70094,8.75,,,, +US-LA-70096,US,LA,70096,8.75,,,, +US-LA-70097,US,LA,70097,8.75,,,, +US-LA-70112,US,LA,70112,9,,,, +US-LA-70113,US,LA,70113,9,,,, +US-LA-70114,US,LA,70114,9,,,, +US-LA-70115,US,LA,70115,9,,,, +US-LA-70116,US,LA,70116,9,,,, +US-LA-70117,US,LA,70117,9,,,, +US-LA-70118,US,LA,70118,9,,,, +US-LA-70119,US,LA,70119,9,,,, +US-LA-70121,US,LA,70121,8.75,,,, +US-LA-70122,US,LA,70122,9,,,, +US-LA-70123,US,LA,70123,8.75,,,, +US-LA-70124,US,LA,70124,9,,,, +US-LA-70125,US,LA,70125,9,,,, +US-LA-70126,US,LA,70126,9,,,, +US-LA-70127,US,LA,70127,9,,,, +US-LA-70128,US,LA,70128,9,,,, +US-LA-70129,US,LA,70129,9,,,, +US-LA-70130,US,LA,70130,9,,,, +US-LA-70131,US,LA,70131,9,,,, +US-LA-70139,US,LA,70139,9,,,, +US-LA-70141,US,LA,70141,10.75,,,, +US-LA-70142,US,LA,70142,9,,,, +US-LA-70143,US,LA,70143,9,,,, +US-LA-70145,US,LA,70145,9,,,, +US-LA-70146,US,LA,70146,9,,,, +US-LA-70148,US,LA,70148,9,,,, +US-LA-70150,US,LA,70150,9,,,, +US-LA-70151,US,LA,70151,9,,,, +US-LA-70152,US,LA,70152,9,,,, +US-LA-70153,US,LA,70153,9,,,, +US-LA-70154,US,LA,70154,9,,,, +US-LA-70156,US,LA,70156,9,,,, +US-LA-70157,US,LA,70157,9,,,, +US-LA-70158,US,LA,70158,9,,,, +US-LA-70159,US,LA,70159,9,,,, +US-LA-70160,US,LA,70160,9,,,, +US-LA-70161,US,LA,70161,9,,,, +US-LA-70162,US,LA,70162,9,,,, +US-LA-70163,US,LA,70163,9,,,, +US-LA-70164,US,LA,70164,9,,,, +US-LA-70165,US,LA,70165,9,,,, +US-LA-70166,US,LA,70166,9,,,, +US-LA-70167,US,LA,70167,9,,,, +US-LA-70170,US,LA,70170,9,,,, +US-LA-70172,US,LA,70172,9,,,, +US-LA-70174,US,LA,70174,9,,,, +US-LA-70175,US,LA,70175,9,,,, +US-LA-70176,US,LA,70176,9,,,, +US-LA-70177,US,LA,70177,9,,,, +US-LA-70178,US,LA,70178,9,,,, +US-LA-70179,US,LA,70179,9,,,, +US-LA-70181,US,LA,70181,9,,,, +US-LA-70182,US,LA,70182,9,,,, +US-LA-70183,US,LA,70183,8.75,,,, +US-LA-70184,US,LA,70184,9,,,, +US-LA-70185,US,LA,70185,9,,,, +US-LA-70186,US,LA,70186,9,,,, +US-LA-70187,US,LA,70187,9,,,, +US-LA-70189,US,LA,70189,9,,,, +US-LA-70190,US,LA,70190,9,,,, +US-LA-70195,US,LA,70195,9,,,, +US-LA-70301,US,LA,70301,8,,,, +US-LA-70302,US,LA,70302,8,,,, +US-LA-70310,US,LA,70310,8,,,, +US-LA-70339,US,LA,70339,9,,,, +US-LA-70340,US,LA,70340,8,,,, +US-LA-70341,US,LA,70341,9,,,, +US-LA-70342,US,LA,70342,8,,,, +US-LA-70343,US,LA,70343,9,,,, +US-LA-70344,US,LA,70344,9,,,, +US-LA-70345,US,LA,70345,9.2,,,, +US-LA-70346,US,LA,70346,9,,,, +US-LA-70352,US,LA,70352,9,,,, +US-LA-70353,US,LA,70353,9,,,, +US-LA-70354,US,LA,70354,9.2,,,, +US-LA-70355,US,LA,70355,8.7,,,, +US-LA-70356,US,LA,70356,9,,,, +US-LA-70357,US,LA,70357,9.2,,,, +US-LA-70358,US,LA,70358,8.75,,,, +US-LA-70359,US,LA,70359,9,,,, +US-LA-70360,US,LA,70360,9,,,, +US-LA-70361,US,LA,70361,9,,,, +US-LA-70363,US,LA,70363,9,,,, +US-LA-70364,US,LA,70364,9,,,, +US-LA-70371,US,LA,70371,8.7,,,, +US-LA-70372,US,LA,70372,9,,,, +US-LA-70373,US,LA,70373,9.2,,,, +US-LA-70374,US,LA,70374,8.7,,,, +US-LA-70375,US,LA,70375,8.7,,,, +US-LA-70377,US,LA,70377,9,,,, +US-LA-70380,US,LA,70380,8.3,,,, +US-LA-70381,US,LA,70381,8.3,,,, +US-LA-70390,US,LA,70390,9,,,, +US-LA-70391,US,LA,70391,9,,,, +US-LA-70392,US,LA,70392,8,,,, +US-LA-70393,US,LA,70393,9,,,, +US-LA-70394,US,LA,70394,8.7,,,, +US-LA-70395,US,LA,70395,9,,,, +US-LA-70397,US,LA,70397,9,,,, +US-LA-70401,US,LA,70401,9,,,, +US-LA-70402,US,LA,70402,9,,,, +US-LA-70403,US,LA,70403,7,,,, +US-LA-70404,US,LA,70404,9,,,, +US-LA-70420,US,LA,70420,8.75,,,, +US-LA-70421,US,LA,70421,7,,,, +US-LA-70422,US,LA,70422,7,,,, +US-LA-70426,US,LA,70426,8.5,,,, +US-LA-70427,US,LA,70427,9.163,,,, +US-LA-70429,US,LA,70429,9.163,,,, +US-LA-70431,US,LA,70431,8.75,,,, +US-LA-70433,US,LA,70433,8.75,,,, +US-LA-70434,US,LA,70434,8.75,,,, +US-LA-70435,US,LA,70435,8.75,,,, +US-LA-70436,US,LA,70436,7.5,,,, +US-LA-70437,US,LA,70437,8.75,,,, +US-LA-70438,US,LA,70438,8.5,,,, +US-LA-70441,US,LA,70441,9,,,, +US-LA-70442,US,LA,70442,7,,,, +US-LA-70443,US,LA,70443,7,,,, +US-LA-70444,US,LA,70444,7,,,, +US-LA-70445,US,LA,70445,8.75,,,, +US-LA-70446,US,LA,70446,7,,,, +US-LA-70447,US,LA,70447,8.75,,,, +US-LA-70448,US,LA,70448,8.75,,,, +US-LA-70449,US,LA,70449,9,,,, +US-LA-70450,US,LA,70450,8.5,,,, +US-LA-70451,US,LA,70451,7,,,, +US-LA-70452,US,LA,70452,8.75,,,, +US-LA-70453,US,LA,70453,9,,,, +US-LA-70454,US,LA,70454,7,,,, +US-LA-70455,US,LA,70455,7,,,, +US-LA-70456,US,LA,70456,7.5,,,, +US-LA-70457,US,LA,70457,8.75,,,, +US-LA-70458,US,LA,70458,8.75,,,, +US-LA-70459,US,LA,70459,8.75,,,, +US-LA-70460,US,LA,70460,8.75,,,, +US-LA-70461,US,LA,70461,8.75,,,, +US-LA-70462,US,LA,70462,8,,,, +US-LA-70463,US,LA,70463,9.25,,,, +US-LA-70464,US,LA,70464,8.75,,,, +US-LA-70465,US,LA,70465,9,,,, +US-LA-70466,US,LA,70466,7,,,, +US-LA-70467,US,LA,70467,8.5,,,, +US-LA-70469,US,LA,70469,8.75,,,, +US-LA-70470,US,LA,70470,9.25,,,, +US-LA-70471,US,LA,70471,8.75,,,, +US-LA-70501,US,LA,70501,8,,,, +US-LA-70502,US,LA,70502,8,,,, +US-LA-70503,US,LA,70503,8,,,, +US-LA-70504,US,LA,70504,8,,,, +US-LA-70505,US,LA,70505,8,,,, +US-LA-70506,US,LA,70506,8,,,, +US-LA-70507,US,LA,70507,8,,,, +US-LA-70508,US,LA,70508,8,,,, +US-LA-70509,US,LA,70509,8,,,, +US-LA-70510,US,LA,70510,9.5,,,, +US-LA-70511,US,LA,70511,9.5,,,, +US-LA-70512,US,LA,70512,7.55,,,, +US-LA-70513,US,LA,70513,7.25,,,, +US-LA-70514,US,LA,70514,8,,,, +US-LA-70515,US,LA,70515,8.25,,,, +US-LA-70516,US,LA,70516,8.25,,,, +US-LA-70517,US,LA,70517,7.5,,,, +US-LA-70518,US,LA,70518,7.5,,,, +US-LA-70519,US,LA,70519,7.5,,,, +US-LA-70520,US,LA,70520,8,,,, +US-LA-70521,US,LA,70521,7.5,,,, +US-LA-70523,US,LA,70523,8,,,, +US-LA-70524,US,LA,70524,9,,,, +US-LA-70525,US,LA,70525,8.25,,,, +US-LA-70526,US,LA,70526,9.5,,,, +US-LA-70527,US,LA,70527,9.5,,,, +US-LA-70528,US,LA,70528,9.25,,,, +US-LA-70529,US,LA,70529,8,,,, +US-LA-70531,US,LA,70531,8.25,,,, +US-LA-70532,US,LA,70532,8.5,,,, +US-LA-70533,US,LA,70533,8.25,,,, +US-LA-70534,US,LA,70534,8.25,,,, +US-LA-70535,US,LA,70535,9.75,,,, +US-LA-70537,US,LA,70537,8.25,,,, +US-LA-70538,US,LA,70538,8,,,, +US-LA-70540,US,LA,70540,8,,,, +US-LA-70541,US,LA,70541,9.55,,,, +US-LA-70542,US,LA,70542,7.75,,,, +US-LA-70543,US,LA,70543,8.25,,,, +US-LA-70544,US,LA,70544,8.5,,,, +US-LA-70546,US,LA,70546,9,,,, +US-LA-70548,US,LA,70548,8.75,,,, +US-LA-70549,US,LA,70549,9,,,, +US-LA-70550,US,LA,70550,7.55,,,, +US-LA-70551,US,LA,70551,7.55,,,, +US-LA-70552,US,LA,70552,7.25,,,, +US-LA-70554,US,LA,70554,9,,,, +US-LA-70555,US,LA,70555,8.25,,,, +US-LA-70556,US,LA,70556,8.25,,,, +US-LA-70558,US,LA,70558,8,,,, +US-LA-70559,US,LA,70559,8.25,,,, +US-LA-70560,US,LA,70560,8.5,,,, +US-LA-70562,US,LA,70562,8.5,,,, +US-LA-70563,US,LA,70563,7.25,,,, +US-LA-70569,US,LA,70569,7.25,,,, +US-LA-70570,US,LA,70570,9.75,,,, +US-LA-70571,US,LA,70571,9.75,,,, +US-LA-70575,US,LA,70575,8.25,,,, +US-LA-70576,US,LA,70576,9,,,, +US-LA-70577,US,LA,70577,7.55,,,, +US-LA-70578,US,LA,70578,9,,,, +US-LA-70580,US,LA,70580,9,,,, +US-LA-70581,US,LA,70581,8.5,,,, +US-LA-70582,US,LA,70582,8.5,,,, +US-LA-70583,US,LA,70583,8,,,, +US-LA-70584,US,LA,70584,7.55,,,, +US-LA-70585,US,LA,70585,9,,,, +US-LA-70586,US,LA,70586,9,,,, +US-LA-70589,US,LA,70589,7.55,,,, +US-LA-70591,US,LA,70591,8.5,,,, +US-LA-70592,US,LA,70592,9.5,,,, +US-LA-70593,US,LA,70593,8,,,, +US-LA-70596,US,LA,70596,8,,,, +US-LA-70598,US,LA,70598,8,,,, +US-LA-70601,US,LA,70601,9,,,, +US-LA-70602,US,LA,70602,9,,,, +US-LA-70605,US,LA,70605,9,,,, +US-LA-70606,US,LA,70606,9,,,, +US-LA-70607,US,LA,70607,9,,,, +US-LA-70609,US,LA,70609,9,,,, +US-LA-70611,US,LA,70611,9.25,,,, +US-LA-70612,US,LA,70612,9.25,,,, +US-LA-70615,US,LA,70615,9.25,,,, +US-LA-70616,US,LA,70616,9,,,, +US-LA-70629,US,LA,70629,9,,,, +US-LA-70630,US,LA,70630,9.25,,,, +US-LA-70631,US,LA,70631,4,,,, +US-LA-70632,US,LA,70632,4,,,, +US-LA-70633,US,LA,70633,9.25,,,, +US-LA-70634,US,LA,70634,9,,,, +US-LA-70637,US,LA,70637,8.75,,,, +US-LA-70638,US,LA,70638,10,,,, +US-LA-70639,US,LA,70639,8,,,, +US-LA-70640,US,LA,70640,8.5,,,, +US-LA-70643,US,LA,70643,4,,,, +US-LA-70644,US,LA,70644,8.7,,,, +US-LA-70645,US,LA,70645,4,,,, +US-LA-70646,US,LA,70646,9.25,,,, +US-LA-70647,US,LA,70647,9.25,,,, +US-LA-70648,US,LA,70648,8.7,,,, +US-LA-70650,US,LA,70650,8.5,,,, +US-LA-70651,US,LA,70651,8.7,,,, +US-LA-70652,US,LA,70652,8.75,,,, +US-LA-70653,US,LA,70653,8.75,,,, +US-LA-70654,US,LA,70654,8.7,,,, +US-LA-70655,US,LA,70655,8.7,,,, +US-LA-70656,US,LA,70656,8,,,, +US-LA-70657,US,LA,70657,8.75,,,, +US-LA-70658,US,LA,70658,8.7,,,, +US-LA-70659,US,LA,70659,9.5,,,, +US-LA-70660,US,LA,70660,8.75,,,, +US-LA-70661,US,LA,70661,9.25,,,, +US-LA-70662,US,LA,70662,8.75,,,, +US-LA-70663,US,LA,70663,9.25,,,, +US-LA-70664,US,LA,70664,9.25,,,, +US-LA-70665,US,LA,70665,9.25,,,, +US-LA-70668,US,LA,70668,9.25,,,, +US-LA-70669,US,LA,70669,9.25,,,, +US-LA-70704,US,LA,70704,9.5,,,, +US-LA-70706,US,LA,70706,9.5,,,, +US-LA-70707,US,LA,70707,8.5,,,, +US-LA-70710,US,LA,70710,9,,,, +US-LA-70711,US,LA,70711,8,,,, +US-LA-70712,US,LA,70712,9,,,, +US-LA-70714,US,LA,70714,9.5,,,, +US-LA-70715,US,LA,70715,8,,,, +US-LA-70718,US,LA,70718,8.5,,,, +US-LA-70719,US,LA,70719,9,,,, +US-LA-70721,US,LA,70721,9.666,,,, +US-LA-70722,US,LA,70722,9,,,, +US-LA-70723,US,LA,70723,7.5,,,, +US-LA-70725,US,LA,70725,8.5,,,, +US-LA-70726,US,LA,70726,8.5,,,, +US-LA-70727,US,LA,70727,9.5,,,, +US-LA-70728,US,LA,70728,8.5,,,, +US-LA-70729,US,LA,70729,9,,,, +US-LA-70730,US,LA,70730,9,,,, +US-LA-70732,US,LA,70732,9,,,, +US-LA-70733,US,LA,70733,8,,,, +US-LA-70734,US,LA,70734,8.5,,,, +US-LA-70736,US,LA,70736,8,,,, +US-LA-70737,US,LA,70737,8.5,,,, +US-LA-70738,US,LA,70738,8.5,,,, +US-LA-70739,US,LA,70739,9.5,,,, +US-LA-70740,US,LA,70740,9,,,, +US-LA-70743,US,LA,70743,7.5,,,, +US-LA-70744,US,LA,70744,8,,,, +US-LA-70747,US,LA,70747,8,,,, +US-LA-70748,US,LA,70748,9,,,, +US-LA-70749,US,LA,70749,8,,,, +US-LA-70750,US,LA,70750,7.55,,,, +US-LA-70752,US,LA,70752,8,,,, +US-LA-70753,US,LA,70753,8,,,, +US-LA-70754,US,LA,70754,8,,,, +US-LA-70755,US,LA,70755,9,,,, +US-LA-70756,US,LA,70756,8,,,, +US-LA-70757,US,LA,70757,9,,,, +US-LA-70759,US,LA,70759,8,,,, +US-LA-70760,US,LA,70760,9,,,, +US-LA-70761,US,LA,70761,9,,,, +US-LA-70762,US,LA,70762,8,,,, +US-LA-70763,US,LA,70763,7.5,,,, +US-LA-70764,US,LA,70764,9,,,, +US-LA-70765,US,LA,70765,9,,,, +US-LA-70767,US,LA,70767,9,,,, +US-LA-70769,US,LA,70769,8.5,,,, +US-LA-70770,US,LA,70770,9,,,, +US-LA-70772,US,LA,70772,9,,,, +US-LA-70773,US,LA,70773,8,,,, +US-LA-70774,US,LA,70774,8.5,,,, +US-LA-70775,US,LA,70775,9,,,, +US-LA-70776,US,LA,70776,9.666,,,, +US-LA-70777,US,LA,70777,9,,,, +US-LA-70778,US,LA,70778,8.5,,,, +US-LA-70780,US,LA,70780,9.666,,,, +US-LA-70782,US,LA,70782,9,,,, +US-LA-70783,US,LA,70783,8,,,, +US-LA-70784,US,LA,70784,9,,,, +US-LA-70785,US,LA,70785,9.5,,,, +US-LA-70786,US,LA,70786,9.5,,,, +US-LA-70787,US,LA,70787,9,,,, +US-LA-70788,US,LA,70788,9,,,, +US-LA-70789,US,LA,70789,9,,,, +US-LA-70791,US,LA,70791,9,,,, +US-LA-70792,US,LA,70792,7.5,,,, +US-LA-70801,US,LA,70801,9,,,, +US-LA-70802,US,LA,70802,9,,,, +US-LA-70804,US,LA,70804,9,,,, +US-LA-70805,US,LA,70805,9,,,, +US-LA-70806,US,LA,70806,9,,,, +US-LA-70807,US,LA,70807,9,,,, +US-LA-70808,US,LA,70808,9,,,, +US-LA-70809,US,LA,70809,9,,,, +US-LA-70810,US,LA,70810,9,,,, +US-LA-70811,US,LA,70811,9,,,, +US-LA-70812,US,LA,70812,9,,,, +US-LA-70813,US,LA,70813,9,,,, +US-LA-70814,US,LA,70814,9,,,, +US-LA-70815,US,LA,70815,9,,,, +US-LA-70816,US,LA,70816,9,,,, +US-LA-70817,US,LA,70817,9,,,, +US-LA-70818,US,LA,70818,9.5,,,, +US-LA-70819,US,LA,70819,9,,,, +US-LA-70820,US,LA,70820,9,,,, +US-LA-70821,US,LA,70821,9,,,, +US-LA-70822,US,LA,70822,9,,,, +US-LA-70823,US,LA,70823,9,,,, +US-LA-70825,US,LA,70825,9,,,, +US-LA-70826,US,LA,70826,9,,,, +US-LA-70827,US,LA,70827,9,,,, +US-LA-70831,US,LA,70831,9,,,, +US-LA-70833,US,LA,70833,9,,,, +US-LA-70835,US,LA,70835,9,,,, +US-LA-70836,US,LA,70836,9,,,, +US-LA-70837,US,LA,70837,9.5,,,, +US-LA-70873,US,LA,70873,9,,,, +US-LA-70874,US,LA,70874,9,,,, +US-LA-70879,US,LA,70879,9,,,, +US-LA-70884,US,LA,70884,9,,,, +US-LA-70891,US,LA,70891,9,,,, +US-LA-70892,US,LA,70892,9,,,, +US-LA-70893,US,LA,70893,9,,,, +US-LA-70895,US,LA,70895,9,,,, +US-LA-70896,US,LA,70896,9,,,, +US-LA-70898,US,LA,70898,9,,,, +US-LA-71001,US,LA,71001,9.5,,,, +US-LA-71002,US,LA,71002,7.5,,,, +US-LA-71003,US,LA,71003,7.125,,,, +US-LA-71004,US,LA,71004,8.35,,,, +US-LA-71006,US,LA,71006,8.25,,,, +US-LA-71007,US,LA,71007,7.35,,,, +US-LA-71008,US,LA,71008,7,,,, +US-LA-71009,US,LA,71009,8.35,,,, +US-LA-71016,US,LA,71016,7,,,, +US-LA-71018,US,LA,71018,7,,,, +US-LA-71019,US,LA,71019,8.5,,,, +US-LA-71021,US,LA,71021,9.5,,,, +US-LA-71023,US,LA,71023,7,,,, +US-LA-71024,US,LA,71024,7,,,, +US-LA-71027,US,LA,71027,8,,,, +US-LA-71028,US,LA,71028,7,,,, +US-LA-71029,US,LA,71029,8.35,,,, +US-LA-71030,US,LA,71030,8,,,, +US-LA-71031,US,LA,71031,7.5,,,, +US-LA-71032,US,LA,71032,8,,,, +US-LA-71033,US,LA,71033,8.35,,,, +US-LA-71034,US,LA,71034,9.5,,,, +US-LA-71037,US,LA,71037,8.25,,,, +US-LA-71038,US,LA,71038,7.125,,,, +US-LA-71039,US,LA,71039,7,,,, +US-LA-71040,US,LA,71040,7.125,,,, +US-LA-71043,US,LA,71043,8.35,,,, +US-LA-71044,US,LA,71044,8.35,,,, +US-LA-71045,US,LA,71045,7,,,, +US-LA-71046,US,LA,71046,8,,,, +US-LA-71047,US,LA,71047,7.35,,,, +US-LA-71048,US,LA,71048,7.125,,,, +US-LA-71049,US,LA,71049,8,,,, +US-LA-71050,US,LA,71050,9,,,, +US-LA-71051,US,LA,71051,8.25,,,, +US-LA-71052,US,LA,71052,8,,,, +US-LA-71055,US,LA,71055,9.5,,,, +US-LA-71058,US,LA,71058,9.5,,,, +US-LA-71060,US,LA,71060,8.35,,,, +US-LA-71061,US,LA,71061,8.35,,,, +US-LA-71063,US,LA,71063,8,,,, +US-LA-71064,US,LA,71064,8.25,,,, +US-LA-71065,US,LA,71065,8.625,,,, +US-LA-71066,US,LA,71066,7.5,,,, +US-LA-71067,US,LA,71067,8.25,,,, +US-LA-71068,US,LA,71068,7,,,, +US-LA-71069,US,LA,71069,8.35,,,, +US-LA-71070,US,LA,71070,7.5,,,, +US-LA-71071,US,LA,71071,7,,,, +US-LA-71072,US,LA,71072,7,,,, +US-LA-71073,US,LA,71073,7,,,, +US-LA-71075,US,LA,71075,9.5,,,, +US-LA-71078,US,LA,71078,8,,,, +US-LA-71079,US,LA,71079,7.125,,,, +US-LA-71080,US,LA,71080,7,,,, +US-LA-71082,US,LA,71082,9.35,,,, +US-LA-71101,US,LA,71101,8.6,,,, +US-LA-71102,US,LA,71102,8.6,,,, +US-LA-71103,US,LA,71103,8.6,,,, +US-LA-71104,US,LA,71104,8.6,,,, +US-LA-71105,US,LA,71105,8.6,,,, +US-LA-71106,US,LA,71106,8.6,,,, +US-LA-71107,US,LA,71107,7.35,,,, +US-LA-71108,US,LA,71108,8.6,,,, +US-LA-71109,US,LA,71109,8.6,,,, +US-LA-71110,US,LA,71110,8.25,,,, +US-LA-71111,US,LA,71111,9,,,, +US-LA-71112,US,LA,71112,9,,,, +US-LA-71113,US,LA,71113,9,,,, +US-LA-71115,US,LA,71115,8.6,,,, +US-LA-71118,US,LA,71118,8.6,,,, +US-LA-71119,US,LA,71119,8.6,,,, +US-LA-71120,US,LA,71120,8.6,,,, +US-LA-71129,US,LA,71129,8.6,,,, +US-LA-71130,US,LA,71130,8.6,,,, +US-LA-71133,US,LA,71133,8.6,,,, +US-LA-71134,US,LA,71134,8.6,,,, +US-LA-71135,US,LA,71135,8.6,,,, +US-LA-71136,US,LA,71136,8.6,,,, +US-LA-71137,US,LA,71137,9.25,,,, +US-LA-71138,US,LA,71138,8.6,,,, +US-LA-71148,US,LA,71148,8.6,,,, +US-LA-71149,US,LA,71149,8.6,,,, +US-LA-71150,US,LA,71150,8.6,,,, +US-LA-71151,US,LA,71151,8.6,,,, +US-LA-71152,US,LA,71152,8.6,,,, +US-LA-71153,US,LA,71153,8.6,,,, +US-LA-71154,US,LA,71154,8.6,,,, +US-LA-71156,US,LA,71156,8.6,,,, +US-LA-71161,US,LA,71161,8.6,,,, +US-LA-71162,US,LA,71162,8.6,,,, +US-LA-71163,US,LA,71163,8.6,,,, +US-LA-71164,US,LA,71164,8.6,,,, +US-LA-71165,US,LA,71165,8.6,,,, +US-LA-71166,US,LA,71166,8.6,,,, +US-LA-71171,US,LA,71171,9,,,, +US-LA-71172,US,LA,71172,9,,,, +US-LA-71201,US,LA,71201,9.99,,,, +US-LA-71202,US,LA,71202,9.99,,,, +US-LA-71203,US,LA,71203,8.6,,,, +US-LA-71207,US,LA,71207,9.99,,,, +US-LA-71209,US,LA,71209,9.99,,,, +US-LA-71210,US,LA,71210,9.99,,,, +US-LA-71211,US,LA,71211,9.99,,,, +US-LA-71212,US,LA,71212,9.99,,,, +US-LA-71213,US,LA,71213,9.99,,,, +US-LA-71217,US,LA,71217,9.99,,,, +US-LA-71218,US,LA,71218,8,,,, +US-LA-71219,US,LA,71219,8,,,, +US-LA-71220,US,LA,71220,8,,,, +US-LA-71221,US,LA,71221,10,,,, +US-LA-71222,US,LA,71222,8,,,, +US-LA-71223,US,LA,71223,8,,,, +US-LA-71225,US,LA,71225,9.6,,,, +US-LA-71226,US,LA,71226,8,,,, +US-LA-71227,US,LA,71227,7.25,,,, +US-LA-71229,US,LA,71229,8,,,, +US-LA-71230,US,LA,71230,8,,,, +US-LA-71232,US,LA,71232,9.5,,,, +US-LA-71233,US,LA,71233,8.5,,,, +US-LA-71234,US,LA,71234,8,,,, +US-LA-71235,US,LA,71235,7.25,,,, +US-LA-71237,US,LA,71237,9,,,, +US-LA-71238,US,LA,71238,9.6,,,, +US-LA-71240,US,LA,71240,8.6,,,, +US-LA-71241,US,LA,71241,8,,,, +US-LA-71242,US,LA,71242,9,,,, +US-LA-71243,US,LA,71243,8,,,, +US-LA-71245,US,LA,71245,9,,,, +US-LA-71247,US,LA,71247,9,,,, +US-LA-71249,US,LA,71249,8,,,, +US-LA-71250,US,LA,71250,8,,,, +US-LA-71251,US,LA,71251,8,,,, +US-LA-71253,US,LA,71253,10,,,, +US-LA-71254,US,LA,71254,11,,,, +US-LA-71256,US,LA,71256,8,,,, +US-LA-71259,US,LA,71259,8,,,, +US-LA-71260,US,LA,71260,8,,,, +US-LA-71261,US,LA,71261,8,,,, +US-LA-71263,US,LA,71263,9,,,, +US-LA-71264,US,LA,71264,8,,,, +US-LA-71266,US,LA,71266,9,,,, +US-LA-71268,US,LA,71268,8,,,, +US-LA-71269,US,LA,71269,8,,,, +US-LA-71270,US,LA,71270,8.75,,,, +US-LA-71272,US,LA,71272,8.75,,,, +US-LA-71273,US,LA,71273,8.75,,,, +US-LA-71275,US,LA,71275,7.25,,,, +US-LA-71276,US,LA,71276,9,,,, +US-LA-71277,US,LA,71277,8,,,, +US-LA-71279,US,LA,71279,8,,,, +US-LA-71280,US,LA,71280,8,,,, +US-LA-71281,US,LA,71281,8.6,,,, +US-LA-71282,US,LA,71282,9.5,,,, +US-LA-71284,US,LA,71284,9.5,,,, +US-LA-71286,US,LA,71286,9,,,, +US-LA-71291,US,LA,71291,9.6,,,, +US-LA-71292,US,LA,71292,9.6,,,, +US-LA-71294,US,LA,71294,9.5,,,, +US-LA-71295,US,LA,71295,8,,,, +US-LA-71301,US,LA,71301,9,,,, +US-LA-71302,US,LA,71302,9,,,, +US-LA-71303,US,LA,71303,9,,,, +US-LA-71306,US,LA,71306,9,,,, +US-LA-71307,US,LA,71307,9,,,, +US-LA-71309,US,LA,71309,9,,,, +US-LA-71315,US,LA,71315,9,,,, +US-LA-71316,US,LA,71316,8.75,,,, +US-LA-71320,US,LA,71320,7.25,,,, +US-LA-71322,US,LA,71322,9.25,,,, +US-LA-71323,US,LA,71323,7.25,,,, +US-LA-71324,US,LA,71324,8,,,, +US-LA-71325,US,LA,71325,7,,,, +US-LA-71326,US,LA,71326,8.75,,,, +US-LA-71327,US,LA,71327,7.25,,,, +US-LA-71328,US,LA,71328,7,,,, +US-LA-71329,US,LA,71329,7.25,,,, +US-LA-71330,US,LA,71330,7,,,, +US-LA-71331,US,LA,71331,7.25,,,, +US-LA-71333,US,LA,71333,7.25,,,, +US-LA-71334,US,LA,71334,8.75,,,, +US-LA-71336,US,LA,71336,8,,,, +US-LA-71339,US,LA,71339,7.25,,,, +US-LA-71340,US,LA,71340,10,,,, +US-LA-71341,US,LA,71341,7.25,,,, +US-LA-71342,US,LA,71342,7.5,,,, +US-LA-71343,US,LA,71343,10,,,, +US-LA-71345,US,LA,71345,7.55,,,, +US-LA-71346,US,LA,71346,7,,,, +US-LA-71348,US,LA,71348,7,,,, +US-LA-71350,US,LA,71350,7.25,,,, +US-LA-71351,US,LA,71351,7.25,,,, +US-LA-71353,US,LA,71353,7.55,,,, +US-LA-71354,US,LA,71354,8.75,,,, +US-LA-71355,US,LA,71355,7.25,,,, +US-LA-71356,US,LA,71356,7.55,,,, +US-LA-71357,US,LA,71357,9.25,,,, +US-LA-71358,US,LA,71358,7.55,,,, +US-LA-71359,US,LA,71359,9,,,, +US-LA-71360,US,LA,71360,7,,,, +US-LA-71361,US,LA,71361,9,,,, +US-LA-71362,US,LA,71362,7.25,,,, +US-LA-71363,US,LA,71363,10,,,, +US-LA-71365,US,LA,71365,7.25,,,, +US-LA-71366,US,LA,71366,10.25,,,, +US-LA-71367,US,LA,71367,9,,,, +US-LA-71368,US,LA,71368,10,,,, +US-LA-71369,US,LA,71369,7.25,,,, +US-LA-71371,US,LA,71371,7.5,,,, +US-LA-71373,US,LA,71373,8.75,,,, +US-LA-71375,US,LA,71375,9.25,,,, +US-LA-71377,US,LA,71377,10,,,, +US-LA-71378,US,LA,71378,8,,,, +US-LA-71401,US,LA,71401,10,,,, +US-LA-71403,US,LA,71403,8,,,, +US-LA-71404,US,LA,71404,7,,,, +US-LA-71405,US,LA,71405,9,,,, +US-LA-71406,US,LA,71406,8.625,,,, +US-LA-71407,US,LA,71407,8,,,, +US-LA-71409,US,LA,71409,7,,,, +US-LA-71410,US,LA,71410,7,,,, +US-LA-71411,US,LA,71411,7.5,,,, +US-LA-71414,US,LA,71414,8.5,,,, +US-LA-71415,US,LA,71415,9,,,, +US-LA-71416,US,LA,71416,7.5,,,, +US-LA-71417,US,LA,71417,8,,,, +US-LA-71418,US,LA,71418,9,,,, +US-LA-71419,US,LA,71419,8.625,,,, +US-LA-71422,US,LA,71422,7,,,, +US-LA-71423,US,LA,71423,8,,,, +US-LA-71424,US,LA,71424,7,,,, +US-LA-71425,US,LA,71425,10,,,, +US-LA-71426,US,LA,71426,8.625,,,, +US-LA-71427,US,LA,71427,7,,,, +US-LA-71428,US,LA,71428,7.5,,,, +US-LA-71429,US,LA,71429,8.625,,,, +US-LA-71430,US,LA,71430,7,,,, +US-LA-71431,US,LA,71431,8,,,, +US-LA-71432,US,LA,71432,8,,,, +US-LA-71433,US,LA,71433,7,,,, +US-LA-71434,US,LA,71434,7.5,,,, +US-LA-71435,US,LA,71435,9,,,, +US-LA-71438,US,LA,71438,8,,,, +US-LA-71439,US,LA,71439,8,,,, +US-LA-71440,US,LA,71440,7,,,, +US-LA-71441,US,LA,71441,9,,,, +US-LA-71443,US,LA,71443,9.5,,,, +US-LA-71446,US,LA,71446,8,,,, +US-LA-71447,US,LA,71447,7,,,, +US-LA-71448,US,LA,71448,7,,,, +US-LA-71449,US,LA,71449,8.625,,,, +US-LA-71450,US,LA,71450,7.5,,,, +US-LA-71452,US,LA,71452,7.5,,,, +US-LA-71454,US,LA,71454,8,,,, +US-LA-71455,US,LA,71455,7,,,, +US-LA-71456,US,LA,71456,7.5,,,, +US-LA-71457,US,LA,71457,9,,,, +US-LA-71458,US,LA,71458,9,,,, +US-LA-71459,US,LA,71459,8,,,, +US-LA-71460,US,LA,71460,8.625,,,, +US-LA-71461,US,LA,71461,9.5,,,, +US-LA-71462,US,LA,71462,8.625,,,, +US-LA-71463,US,LA,71463,10,,,, +US-LA-71465,US,LA,71465,7.5,,,, +US-LA-71466,US,LA,71466,7,,,, +US-LA-71467,US,LA,71467,8,,,, +US-LA-71468,US,LA,71468,7.5,,,, +US-LA-71469,US,LA,71469,7.5,,,, +US-LA-71471,US,LA,71471,8.5,,,, +US-LA-71472,US,LA,71472,7,,,, +US-LA-71473,US,LA,71473,7,,,, +US-LA-71474,US,LA,71474,8,,,, +US-LA-71475,US,LA,71475,8,,,, +US-LA-71477,US,LA,71477,7,,,, +US-LA-71479,US,LA,71479,7.5,,,, +US-LA-71480,US,LA,71480,7.5,,,, +US-LA-71483,US,LA,71483,8.5,,,, +US-LA-71485,US,LA,71485,9,,,, +US-LA-71486,US,LA,71486,8.625,,,, +US-LA-71496,US,LA,71496,9.5,,,, +US-LA-71497,US,LA,71497,9,,,, +US-MA-01001,US,MA,01001,6.25,,,, +US-MA-01002,US,MA,01002,6.25,,,, +US-MA-01003,US,MA,01003,6.25,,,, +US-MA-01004,US,MA,01004,6.25,,,, +US-MA-01005,US,MA,01005,6.25,,,, +US-MA-01007,US,MA,01007,6.25,,,, +US-MA-01008,US,MA,01008,6.25,,,, +US-MA-01009,US,MA,01009,6.25,,,, +US-MA-01010,US,MA,01010,6.25,,,, +US-MA-01011,US,MA,01011,6.25,,,, +US-MA-01012,US,MA,01012,6.25,,,, +US-MA-01013,US,MA,01013,6.25,,,, +US-MA-01014,US,MA,01014,6.25,,,, +US-MA-01020,US,MA,01020,6.25,,,, +US-MA-01021,US,MA,01021,6.25,,,, +US-MA-01022,US,MA,01022,6.25,,,, +US-MA-01026,US,MA,01026,6.25,,,, +US-MA-01027,US,MA,01027,6.25,,,, +US-MA-01028,US,MA,01028,6.25,,,, +US-MA-01029,US,MA,01029,6.25,,,, +US-MA-01030,US,MA,01030,6.25,,,, +US-MA-01031,US,MA,01031,6.25,,,, +US-MA-01032,US,MA,01032,6.25,,,, +US-MA-01033,US,MA,01033,6.25,,,, +US-MA-01034,US,MA,01034,6.25,,,, +US-MA-01035,US,MA,01035,6.25,,,, +US-MA-01036,US,MA,01036,6.25,,,, +US-MA-01037,US,MA,01037,6.25,,,, +US-MA-01038,US,MA,01038,6.25,,,, +US-MA-01039,US,MA,01039,6.25,,,, +US-MA-01040,US,MA,01040,6.25,,,, +US-MA-01041,US,MA,01041,6.25,,,, +US-MA-01050,US,MA,01050,6.25,,,, +US-MA-01053,US,MA,01053,6.25,,,, +US-MA-01054,US,MA,01054,6.25,,,, +US-MA-01056,US,MA,01056,6.25,,,, +US-MA-01057,US,MA,01057,6.25,,,, +US-MA-01059,US,MA,01059,6.25,,,, +US-MA-01060,US,MA,01060,6.25,,,, +US-MA-01061,US,MA,01061,6.25,,,, +US-MA-01062,US,MA,01062,6.25,,,, +US-MA-01063,US,MA,01063,6.25,,,, +US-MA-01066,US,MA,01066,6.25,,,, +US-MA-01068,US,MA,01068,6.25,,,, +US-MA-01069,US,MA,01069,6.25,,,, +US-MA-01070,US,MA,01070,6.25,,,, +US-MA-01071,US,MA,01071,6.25,,,, +US-MA-01072,US,MA,01072,6.25,,,, +US-MA-01073,US,MA,01073,6.25,,,, +US-MA-01074,US,MA,01074,6.25,,,, +US-MA-01075,US,MA,01075,6.25,,,, +US-MA-01077,US,MA,01077,6.25,,,, +US-MA-01079,US,MA,01079,6.25,,,, +US-MA-01080,US,MA,01080,6.25,,,, +US-MA-01081,US,MA,01081,6.25,,,, +US-MA-01082,US,MA,01082,6.25,,,, +US-MA-01083,US,MA,01083,6.25,,,, +US-MA-01084,US,MA,01084,6.25,,,, +US-MA-01085,US,MA,01085,6.25,,,, +US-MA-01086,US,MA,01086,6.25,,,, +US-MA-01088,US,MA,01088,6.25,,,, +US-MA-01089,US,MA,01089,6.25,,,, +US-MA-01090,US,MA,01090,6.25,,,, +US-MA-01092,US,MA,01092,6.25,,,, +US-MA-01093,US,MA,01093,6.25,,,, +US-MA-01094,US,MA,01094,6.25,,,, +US-MA-01095,US,MA,01095,6.25,,,, +US-MA-01096,US,MA,01096,6.25,,,, +US-MA-01097,US,MA,01097,6.25,,,, +US-MA-01098,US,MA,01098,6.25,,,, +US-MA-01101,US,MA,01101,6.25,,,, +US-MA-01102,US,MA,01102,6.25,,,, +US-MA-01103,US,MA,01103,6.25,,,, +US-MA-01104,US,MA,01104,6.25,,,, +US-MA-01105,US,MA,01105,6.25,,,, +US-MA-01106,US,MA,01106,6.25,,,, +US-MA-01107,US,MA,01107,6.25,,,, +US-MA-01108,US,MA,01108,6.25,,,, +US-MA-01109,US,MA,01109,6.25,,,, +US-MA-01111,US,MA,01111,6.25,,,, +US-MA-01115,US,MA,01115,6.25,,,, +US-MA-01116,US,MA,01116,6.25,,,, +US-MA-01118,US,MA,01118,6.25,,,, +US-MA-01119,US,MA,01119,6.25,,,, +US-MA-01128,US,MA,01128,6.25,,,, +US-MA-01129,US,MA,01129,6.25,,,, +US-MA-01138,US,MA,01138,6.25,,,, +US-MA-01139,US,MA,01139,6.25,,,, +US-MA-01144,US,MA,01144,6.25,,,, +US-MA-01151,US,MA,01151,6.25,,,, +US-MA-01152,US,MA,01152,6.25,,,, +US-MA-01199,US,MA,01199,6.25,,,, +US-MA-01201,US,MA,01201,6.25,,,, +US-MA-01202,US,MA,01202,6.25,,,, +US-MA-01203,US,MA,01203,6.25,,,, +US-MA-01220,US,MA,01220,6.25,,,, +US-MA-01222,US,MA,01222,6.25,,,, +US-MA-01223,US,MA,01223,6.25,,,, +US-MA-01224,US,MA,01224,6.25,,,, +US-MA-01225,US,MA,01225,6.25,,,, +US-MA-01226,US,MA,01226,6.25,,,, +US-MA-01227,US,MA,01227,6.25,,,, +US-MA-01229,US,MA,01229,6.25,,,, +US-MA-01230,US,MA,01230,6.25,,,, +US-MA-01235,US,MA,01235,6.25,,,, +US-MA-01236,US,MA,01236,6.25,,,, +US-MA-01237,US,MA,01237,6.25,,,, +US-MA-01238,US,MA,01238,6.25,,,, +US-MA-01240,US,MA,01240,6.25,,,, +US-MA-01242,US,MA,01242,6.25,,,, +US-MA-01243,US,MA,01243,6.25,,,, +US-MA-01244,US,MA,01244,6.25,,,, +US-MA-01245,US,MA,01245,6.25,,,, +US-MA-01247,US,MA,01247,6.25,,,, +US-MA-01252,US,MA,01252,6.25,,,, +US-MA-01253,US,MA,01253,6.25,,,, +US-MA-01254,US,MA,01254,6.25,,,, +US-MA-01255,US,MA,01255,6.25,,,, +US-MA-01256,US,MA,01256,6.25,,,, +US-MA-01257,US,MA,01257,6.25,,,, +US-MA-01258,US,MA,01258,6.25,,,, +US-MA-01259,US,MA,01259,6.25,,,, +US-MA-01260,US,MA,01260,6.25,,,, +US-MA-01262,US,MA,01262,6.25,,,, +US-MA-01263,US,MA,01263,6.25,,,, +US-MA-01264,US,MA,01264,6.25,,,, +US-MA-01266,US,MA,01266,6.25,,,, +US-MA-01267,US,MA,01267,6.25,,,, +US-MA-01270,US,MA,01270,6.25,,,, +US-MA-01301,US,MA,01301,6.25,,,, +US-MA-01302,US,MA,01302,6.25,,,, +US-MA-01330,US,MA,01330,6.25,,,, +US-MA-01331,US,MA,01331,6.25,,,, +US-MA-01337,US,MA,01337,6.25,,,, +US-MA-01338,US,MA,01338,6.25,,,, +US-MA-01339,US,MA,01339,6.25,,,, +US-MA-01340,US,MA,01340,6.25,,,, +US-MA-01341,US,MA,01341,6.25,,,, +US-MA-01342,US,MA,01342,6.25,,,, +US-MA-01343,US,MA,01343,6.25,,,, +US-MA-01344,US,MA,01344,6.25,,,, +US-MA-01346,US,MA,01346,6.25,,,, +US-MA-01347,US,MA,01347,6.25,,,, +US-MA-01349,US,MA,01349,6.25,,,, +US-MA-01350,US,MA,01350,6.25,,,, +US-MA-01351,US,MA,01351,6.25,,,, +US-MA-01354,US,MA,01354,6.25,,,, +US-MA-01355,US,MA,01355,6.25,,,, +US-MA-01360,US,MA,01360,6.25,,,, +US-MA-01364,US,MA,01364,6.25,,,, +US-MA-01366,US,MA,01366,6.25,,,, +US-MA-01367,US,MA,01367,6.25,,,, +US-MA-01368,US,MA,01368,6.25,,,, +US-MA-01370,US,MA,01370,6.25,,,, +US-MA-01373,US,MA,01373,6.25,,,, +US-MA-01375,US,MA,01375,6.25,,,, +US-MA-01376,US,MA,01376,6.25,,,, +US-MA-01378,US,MA,01378,6.25,,,, +US-MA-01379,US,MA,01379,6.25,,,, +US-MA-01380,US,MA,01380,6.25,,,, +US-MA-01420,US,MA,01420,6.25,,,, +US-MA-01430,US,MA,01430,6.25,,,, +US-MA-01431,US,MA,01431,6.25,,,, +US-MA-01432,US,MA,01432,6.25,,,, +US-MA-01434,US,MA,01434,6.25,,,, +US-MA-01436,US,MA,01436,6.25,,,, +US-MA-01438,US,MA,01438,6.25,,,, +US-MA-01440,US,MA,01440,6.25,,,, +US-MA-01441,US,MA,01441,6.25,,,, +US-MA-01450,US,MA,01450,6.25,,,, +US-MA-01451,US,MA,01451,6.25,,,, +US-MA-01452,US,MA,01452,6.25,,,, +US-MA-01453,US,MA,01453,6.25,,,, +US-MA-01460,US,MA,01460,6.25,,,, +US-MA-01462,US,MA,01462,6.25,,,, +US-MA-01463,US,MA,01463,6.25,,,, +US-MA-01464,US,MA,01464,6.25,,,, +US-MA-01467,US,MA,01467,6.25,,,, +US-MA-01468,US,MA,01468,6.25,,,, +US-MA-01469,US,MA,01469,6.25,,,, +US-MA-01470,US,MA,01470,6.25,,,, +US-MA-01471,US,MA,01471,6.25,,,, +US-MA-01472,US,MA,01472,6.25,,,, +US-MA-01473,US,MA,01473,6.25,,,, +US-MA-01474,US,MA,01474,6.25,,,, +US-MA-01475,US,MA,01475,6.25,,,, +US-MA-01477,US,MA,01477,6.25,,,, +US-MA-01501,US,MA,01501,6.25,,,, +US-MA-01503,US,MA,01503,6.25,,,, +US-MA-01504,US,MA,01504,6.25,,,, +US-MA-01505,US,MA,01505,6.25,,,, +US-MA-01506,US,MA,01506,6.25,,,, +US-MA-01507,US,MA,01507,6.25,,,, +US-MA-01508,US,MA,01508,6.25,,,, +US-MA-01509,US,MA,01509,6.25,,,, +US-MA-01510,US,MA,01510,6.25,,,, +US-MA-01515,US,MA,01515,6.25,,,, +US-MA-01516,US,MA,01516,6.25,,,, +US-MA-01517,US,MA,01517,6.25,,,, +US-MA-01518,US,MA,01518,6.25,,,, +US-MA-01519,US,MA,01519,6.25,,,, +US-MA-01520,US,MA,01520,6.25,,,, +US-MA-01521,US,MA,01521,6.25,,,, +US-MA-01522,US,MA,01522,6.25,,,, +US-MA-01523,US,MA,01523,6.25,,,, +US-MA-01524,US,MA,01524,6.25,,,, +US-MA-01525,US,MA,01525,6.25,,,, +US-MA-01526,US,MA,01526,6.25,,,, +US-MA-01527,US,MA,01527,6.25,,,, +US-MA-01529,US,MA,01529,6.25,,,, +US-MA-01531,US,MA,01531,6.25,,,, +US-MA-01532,US,MA,01532,6.25,,,, +US-MA-01534,US,MA,01534,6.25,,,, +US-MA-01535,US,MA,01535,6.25,,,, +US-MA-01536,US,MA,01536,6.25,,,, +US-MA-01537,US,MA,01537,6.25,,,, +US-MA-01538,US,MA,01538,6.25,,,, +US-MA-01540,US,MA,01540,6.25,,,, +US-MA-01541,US,MA,01541,6.25,,,, +US-MA-01542,US,MA,01542,6.25,,,, +US-MA-01543,US,MA,01543,6.25,,,, +US-MA-01545,US,MA,01545,6.25,,,, +US-MA-01546,US,MA,01546,6.25,,,, +US-MA-01550,US,MA,01550,6.25,,,, +US-MA-01560,US,MA,01560,6.25,,,, +US-MA-01561,US,MA,01561,6.25,,,, +US-MA-01562,US,MA,01562,6.25,,,, +US-MA-01564,US,MA,01564,6.25,,,, +US-MA-01566,US,MA,01566,6.25,,,, +US-MA-01568,US,MA,01568,6.25,,,, +US-MA-01569,US,MA,01569,6.25,,,, +US-MA-01570,US,MA,01570,6.25,,,, +US-MA-01571,US,MA,01571,6.25,,,, +US-MA-01581,US,MA,01581,6.25,,,, +US-MA-01583,US,MA,01583,6.25,,,, +US-MA-01585,US,MA,01585,6.25,,,, +US-MA-01586,US,MA,01586,6.25,,,, +US-MA-01588,US,MA,01588,6.25,,,, +US-MA-01590,US,MA,01590,6.25,,,, +US-MA-01601,US,MA,01601,6.25,,,, +US-MA-01602,US,MA,01602,6.25,,,, +US-MA-01603,US,MA,01603,6.25,,,, +US-MA-01604,US,MA,01604,6.25,,,, +US-MA-01605,US,MA,01605,6.25,,,, +US-MA-01606,US,MA,01606,6.25,,,, +US-MA-01607,US,MA,01607,6.25,,,, +US-MA-01608,US,MA,01608,6.25,,,, +US-MA-01609,US,MA,01609,6.25,,,, +US-MA-01610,US,MA,01610,6.25,,,, +US-MA-01611,US,MA,01611,6.25,,,, +US-MA-01612,US,MA,01612,6.25,,,, +US-MA-01613,US,MA,01613,6.25,,,, +US-MA-01614,US,MA,01614,6.25,,,, +US-MA-01615,US,MA,01615,6.25,,,, +US-MA-01653,US,MA,01653,6.25,,,, +US-MA-01654,US,MA,01654,6.25,,,, +US-MA-01655,US,MA,01655,6.25,,,, +US-MA-01701,US,MA,01701,6.25,,,, +US-MA-01702,US,MA,01702,6.25,,,, +US-MA-01703,US,MA,01703,6.25,,,, +US-MA-01704,US,MA,01704,6.25,,,, +US-MA-01705,US,MA,01705,6.25,,,, +US-MA-01718,US,MA,01718,6.25,,,, +US-MA-01719,US,MA,01719,6.25,,,, +US-MA-01720,US,MA,01720,6.25,,,, +US-MA-01721,US,MA,01721,6.25,,,, +US-MA-01730,US,MA,01730,6.25,,,, +US-MA-01731,US,MA,01731,6.25,,,, +US-MA-01740,US,MA,01740,6.25,,,, +US-MA-01741,US,MA,01741,6.25,,,, +US-MA-01742,US,MA,01742,6.25,,,, +US-MA-01745,US,MA,01745,6.25,,,, +US-MA-01746,US,MA,01746,6.25,,,, +US-MA-01747,US,MA,01747,6.25,,,, +US-MA-01748,US,MA,01748,6.25,,,, +US-MA-01749,US,MA,01749,6.25,,,, +US-MA-01752,US,MA,01752,6.25,,,, +US-MA-01754,US,MA,01754,6.25,,,, +US-MA-01756,US,MA,01756,6.25,,,, +US-MA-01757,US,MA,01757,6.25,,,, +US-MA-01760,US,MA,01760,6.25,,,, +US-MA-01770,US,MA,01770,6.25,,,, +US-MA-01772,US,MA,01772,6.25,,,, +US-MA-01773,US,MA,01773,6.25,,,, +US-MA-01775,US,MA,01775,6.25,,,, +US-MA-01776,US,MA,01776,6.25,,,, +US-MA-01778,US,MA,01778,6.25,,,, +US-MA-01784,US,MA,01784,6.25,,,, +US-MA-01801,US,MA,01801,6.25,,,, +US-MA-01803,US,MA,01803,6.25,,,, +US-MA-01805,US,MA,01805,6.25,,,, +US-MA-01810,US,MA,01810,6.25,,,, +US-MA-01812,US,MA,01812,6.25,,,, +US-MA-01813,US,MA,01813,6.25,,,, +US-MA-01815,US,MA,01815,6.25,,,, +US-MA-01821,US,MA,01821,6.25,,,, +US-MA-01822,US,MA,01822,6.25,,,, +US-MA-01824,US,MA,01824,6.25,,,, +US-MA-01826,US,MA,01826,6.25,,,, +US-MA-01827,US,MA,01827,6.25,,,, +US-MA-01830,US,MA,01830,6.25,,,, +US-MA-01831,US,MA,01831,6.25,,,, +US-MA-01832,US,MA,01832,6.25,,,, +US-MA-01833,US,MA,01833,6.25,,,, +US-MA-01834,US,MA,01834,6.25,,,, +US-MA-01835,US,MA,01835,6.25,,,, +US-MA-01840,US,MA,01840,6.25,,,, +US-MA-01841,US,MA,01841,6.25,,,, +US-MA-01842,US,MA,01842,6.25,,,, +US-MA-01843,US,MA,01843,6.25,,,, +US-MA-01844,US,MA,01844,6.25,,,, +US-MA-01845,US,MA,01845,6.25,,,, +US-MA-01850,US,MA,01850,6.25,,,, +US-MA-01851,US,MA,01851,6.25,,,, +US-MA-01852,US,MA,01852,6.25,,,, +US-MA-01853,US,MA,01853,6.25,,,, +US-MA-01854,US,MA,01854,6.25,,,, +US-MA-01860,US,MA,01860,6.25,,,, +US-MA-01862,US,MA,01862,6.25,,,, +US-MA-01863,US,MA,01863,6.25,,,, +US-MA-01864,US,MA,01864,6.25,,,, +US-MA-01865,US,MA,01865,6.25,,,, +US-MA-01866,US,MA,01866,6.25,,,, +US-MA-01867,US,MA,01867,6.25,,,, +US-MA-01876,US,MA,01876,6.25,,,, +US-MA-01879,US,MA,01879,6.25,,,, +US-MA-01880,US,MA,01880,6.25,,,, +US-MA-01885,US,MA,01885,6.25,,,, +US-MA-01886,US,MA,01886,6.25,,,, +US-MA-01887,US,MA,01887,6.25,,,, +US-MA-01888,US,MA,01888,6.25,,,, +US-MA-01889,US,MA,01889,6.25,,,, +US-MA-01890,US,MA,01890,6.25,,,, +US-MA-01899,US,MA,01899,6.25,,,, +US-MA-01901,US,MA,01901,6.25,,,, +US-MA-01902,US,MA,01902,6.25,,,, +US-MA-01903,US,MA,01903,6.25,,,, +US-MA-01904,US,MA,01904,6.25,,,, +US-MA-01905,US,MA,01905,6.25,,,, +US-MA-01906,US,MA,01906,6.25,,,, +US-MA-01907,US,MA,01907,6.25,,,, +US-MA-01908,US,MA,01908,6.25,,,, +US-MA-01910,US,MA,01910,6.25,,,, +US-MA-01913,US,MA,01913,6.25,,,, +US-MA-01915,US,MA,01915,6.25,,,, +US-MA-01921,US,MA,01921,6.25,,,, +US-MA-01922,US,MA,01922,6.25,,,, +US-MA-01923,US,MA,01923,6.25,,,, +US-MA-01929,US,MA,01929,6.25,,,, +US-MA-01930,US,MA,01930,6.25,,,, +US-MA-01931,US,MA,01931,6.25,,,, +US-MA-01936,US,MA,01936,6.25,,,, +US-MA-01937,US,MA,01937,6.25,,,, +US-MA-01938,US,MA,01938,6.25,,,, +US-MA-01940,US,MA,01940,6.25,,,, +US-MA-01944,US,MA,01944,6.25,,,, +US-MA-01945,US,MA,01945,6.25,,,, +US-MA-01949,US,MA,01949,6.25,,,, +US-MA-01950,US,MA,01950,6.25,,,, +US-MA-01951,US,MA,01951,6.25,,,, +US-MA-01952,US,MA,01952,6.25,,,, +US-MA-01960,US,MA,01960,6.25,,,, +US-MA-01961,US,MA,01961,6.25,,,, +US-MA-01965,US,MA,01965,6.25,,,, +US-MA-01966,US,MA,01966,6.25,,,, +US-MA-01969,US,MA,01969,6.25,,,, +US-MA-01970,US,MA,01970,6.25,,,, +US-MA-01971,US,MA,01971,6.25,,,, +US-MA-01982,US,MA,01982,6.25,,,, +US-MA-01983,US,MA,01983,6.25,,,, +US-MA-01984,US,MA,01984,6.25,,,, +US-MA-01985,US,MA,01985,6.25,,,, +US-MA-02018,US,MA,02018,6.25,,,, +US-MA-02019,US,MA,02019,6.25,,,, +US-MA-02020,US,MA,02020,6.25,,,, +US-MA-02021,US,MA,02021,6.25,,,, +US-MA-02025,US,MA,02025,6.25,,,, +US-MA-02026,US,MA,02026,6.25,,,, +US-MA-02027,US,MA,02027,6.25,,,, +US-MA-02030,US,MA,02030,6.25,,,, +US-MA-02032,US,MA,02032,6.25,,,, +US-MA-02035,US,MA,02035,6.25,,,, +US-MA-02038,US,MA,02038,6.25,,,, +US-MA-02040,US,MA,02040,6.25,,,, +US-MA-02041,US,MA,02041,6.25,,,, +US-MA-02043,US,MA,02043,6.25,,,, +US-MA-02044,US,MA,02044,6.25,,,, +US-MA-02045,US,MA,02045,6.25,,,, +US-MA-02047,US,MA,02047,6.25,,,, +US-MA-02048,US,MA,02048,6.25,,,, +US-MA-02050,US,MA,02050,6.25,,,, +US-MA-02051,US,MA,02051,6.25,,,, +US-MA-02052,US,MA,02052,6.25,,,, +US-MA-02053,US,MA,02053,6.25,,,, +US-MA-02054,US,MA,02054,6.25,,,, +US-MA-02055,US,MA,02055,6.25,,,, +US-MA-02056,US,MA,02056,6.25,,,, +US-MA-02059,US,MA,02059,6.25,,,, +US-MA-02060,US,MA,02060,6.25,,,, +US-MA-02061,US,MA,02061,6.25,,,, +US-MA-02062,US,MA,02062,6.25,,,, +US-MA-02065,US,MA,02065,6.25,,,, +US-MA-02066,US,MA,02066,6.25,,,, +US-MA-02067,US,MA,02067,6.25,,,, +US-MA-02070,US,MA,02070,6.25,,,, +US-MA-02071,US,MA,02071,6.25,,,, +US-MA-02072,US,MA,02072,6.25,,,, +US-MA-02081,US,MA,02081,6.25,,,, +US-MA-02090,US,MA,02090,6.25,,,, +US-MA-02093,US,MA,02093,6.25,,,, +US-MA-02108,US,MA,02108,6.25,,,, +US-MA-02109,US,MA,02109,6.25,,,, +US-MA-02110,US,MA,02110,6.25,,,, +US-MA-02111,US,MA,02111,6.25,,,, +US-MA-02112,US,MA,02112,6.25,,,, +US-MA-02113,US,MA,02113,6.25,,,, +US-MA-02114,US,MA,02114,6.25,,,, +US-MA-02115,US,MA,02115,6.25,,,, +US-MA-02116,US,MA,02116,6.25,,,, +US-MA-02117,US,MA,02117,6.25,,,, +US-MA-02118,US,MA,02118,6.25,,,, +US-MA-02119,US,MA,02119,6.25,,,, +US-MA-02120,US,MA,02120,6.25,,,, +US-MA-02121,US,MA,02121,6.25,,,, +US-MA-02122,US,MA,02122,6.25,,,, +US-MA-02123,US,MA,02123,6.25,,,, +US-MA-02124,US,MA,02124,6.25,,,, +US-MA-02125,US,MA,02125,6.25,,,, +US-MA-02126,US,MA,02126,6.25,,,, +US-MA-02127,US,MA,02127,6.25,,,, +US-MA-02128,US,MA,02128,6.25,,,, +US-MA-02129,US,MA,02129,6.25,,,, +US-MA-02130,US,MA,02130,6.25,,,, +US-MA-02131,US,MA,02131,6.25,,,, +US-MA-02132,US,MA,02132,6.25,,,, +US-MA-02133,US,MA,02133,6.25,,,, +US-MA-02134,US,MA,02134,6.25,,,, +US-MA-02135,US,MA,02135,6.25,,,, +US-MA-02136,US,MA,02136,6.25,,,, +US-MA-02137,US,MA,02137,6.25,,,, +US-MA-02138,US,MA,02138,6.25,,,, +US-MA-02139,US,MA,02139,6.25,,,, +US-MA-02140,US,MA,02140,6.25,,,, +US-MA-02141,US,MA,02141,6.25,,,, +US-MA-02142,US,MA,02142,6.25,,,, +US-MA-02143,US,MA,02143,6.25,,,, +US-MA-02144,US,MA,02144,6.25,,,, +US-MA-02145,US,MA,02145,6.25,,,, +US-MA-02148,US,MA,02148,6.25,,,, +US-MA-02149,US,MA,02149,6.25,,,, +US-MA-02150,US,MA,02150,6.25,,,, +US-MA-02151,US,MA,02151,6.25,,,, +US-MA-02152,US,MA,02152,6.25,,,, +US-MA-02153,US,MA,02153,6.25,,,, +US-MA-02155,US,MA,02155,6.25,,,, +US-MA-02156,US,MA,02156,6.25,,,, +US-MA-02163,US,MA,02163,6.25,,,, +US-MA-02169,US,MA,02169,6.25,,,, +US-MA-02170,US,MA,02170,6.25,,,, +US-MA-02171,US,MA,02171,6.25,,,, +US-MA-02176,US,MA,02176,6.25,,,, +US-MA-02180,US,MA,02180,6.25,,,, +US-MA-02184,US,MA,02184,6.25,,,, +US-MA-02185,US,MA,02185,6.25,,,, +US-MA-02186,US,MA,02186,6.25,,,, +US-MA-02187,US,MA,02187,6.25,,,, +US-MA-02188,US,MA,02188,6.25,,,, +US-MA-02189,US,MA,02189,6.25,,,, +US-MA-02190,US,MA,02190,6.25,,,, +US-MA-02191,US,MA,02191,6.25,,,, +US-MA-02196,US,MA,02196,6.25,,,, +US-MA-02199,US,MA,02199,6.25,,,, +US-MA-02201,US,MA,02201,6.25,,,, +US-MA-02203,US,MA,02203,6.25,,,, +US-MA-02204,US,MA,02204,6.25,,,, +US-MA-02205,US,MA,02205,6.25,,,, +US-MA-02206,US,MA,02206,6.25,,,, +US-MA-02210,US,MA,02210,6.25,,,, +US-MA-02211,US,MA,02211,6.25,,,, +US-MA-02212,US,MA,02212,6.25,,,, +US-MA-02215,US,MA,02215,6.25,,,, +US-MA-02217,US,MA,02217,6.25,,,, +US-MA-02222,US,MA,02222,6.25,,,, +US-MA-02228,US,MA,02228,6.25,,,, +US-MA-02238,US,MA,02238,6.25,,,, +US-MA-02241,US,MA,02241,6.25,,,, +US-MA-02266,US,MA,02266,6.25,,,, +US-MA-02269,US,MA,02269,6.25,,,, +US-MA-02283,US,MA,02283,6.25,,,, +US-MA-02284,US,MA,02284,6.25,,,, +US-MA-02293,US,MA,02293,6.25,,,, +US-MA-02297,US,MA,02297,6.25,,,, +US-MA-02298,US,MA,02298,6.25,,,, +US-MA-02301,US,MA,02301,6.25,,,, +US-MA-02302,US,MA,02302,6.25,,,, +US-MA-02303,US,MA,02303,6.25,,,, +US-MA-02304,US,MA,02304,6.25,,,, +US-MA-02305,US,MA,02305,6.25,,,, +US-MA-02322,US,MA,02322,6.25,,,, +US-MA-02324,US,MA,02324,6.25,,,, +US-MA-02325,US,MA,02325,6.25,,,, +US-MA-02327,US,MA,02327,6.25,,,, +US-MA-02330,US,MA,02330,6.25,,,, +US-MA-02331,US,MA,02331,6.25,,,, +US-MA-02332,US,MA,02332,6.25,,,, +US-MA-02333,US,MA,02333,6.25,,,, +US-MA-02334,US,MA,02334,6.25,,,, +US-MA-02337,US,MA,02337,6.25,,,, +US-MA-02338,US,MA,02338,6.25,,,, +US-MA-02339,US,MA,02339,6.25,,,, +US-MA-02340,US,MA,02340,6.25,,,, +US-MA-02341,US,MA,02341,6.25,,,, +US-MA-02343,US,MA,02343,6.25,,,, +US-MA-02344,US,MA,02344,6.25,,,, +US-MA-02345,US,MA,02345,6.25,,,, +US-MA-02346,US,MA,02346,6.25,,,, +US-MA-02347,US,MA,02347,6.25,,,, +US-MA-02348,US,MA,02348,6.25,,,, +US-MA-02349,US,MA,02349,6.25,,,, +US-MA-02350,US,MA,02350,6.25,,,, +US-MA-02351,US,MA,02351,6.25,,,, +US-MA-02355,US,MA,02355,6.25,,,, +US-MA-02356,US,MA,02356,6.25,,,, +US-MA-02357,US,MA,02357,6.25,,,, +US-MA-02358,US,MA,02358,6.25,,,, +US-MA-02359,US,MA,02359,6.25,,,, +US-MA-02360,US,MA,02360,6.25,,,, +US-MA-02361,US,MA,02361,6.25,,,, +US-MA-02362,US,MA,02362,6.25,,,, +US-MA-02364,US,MA,02364,6.25,,,, +US-MA-02366,US,MA,02366,6.25,,,, +US-MA-02367,US,MA,02367,6.25,,,, +US-MA-02368,US,MA,02368,6.25,,,, +US-MA-02370,US,MA,02370,6.25,,,, +US-MA-02375,US,MA,02375,6.25,,,, +US-MA-02379,US,MA,02379,6.25,,,, +US-MA-02381,US,MA,02381,6.25,,,, +US-MA-02382,US,MA,02382,6.25,,,, +US-MA-02420,US,MA,02420,6.25,,,, +US-MA-02421,US,MA,02421,6.25,,,, +US-MA-02445,US,MA,02445,6.25,,,, +US-MA-02446,US,MA,02446,6.25,,,, +US-MA-02447,US,MA,02447,6.25,,,, +US-MA-02451,US,MA,02451,6.25,,,, +US-MA-02452,US,MA,02452,6.25,,,, +US-MA-02453,US,MA,02453,6.25,,,, +US-MA-02454,US,MA,02454,6.25,,,, +US-MA-02455,US,MA,02455,6.25,,,, +US-MA-02456,US,MA,02456,6.25,,,, +US-MA-02457,US,MA,02457,6.25,,,, +US-MA-02458,US,MA,02458,6.25,,,, +US-MA-02459,US,MA,02459,6.25,,,, +US-MA-02460,US,MA,02460,6.25,,,, +US-MA-02461,US,MA,02461,6.25,,,, +US-MA-02462,US,MA,02462,6.25,,,, +US-MA-02464,US,MA,02464,6.25,,,, +US-MA-02465,US,MA,02465,6.25,,,, +US-MA-02466,US,MA,02466,6.25,,,, +US-MA-02467,US,MA,02467,6.25,,,, +US-MA-02468,US,MA,02468,6.25,,,, +US-MA-02471,US,MA,02471,6.25,,,, +US-MA-02472,US,MA,02472,6.25,,,, +US-MA-02474,US,MA,02474,6.25,,,, +US-MA-02475,US,MA,02475,6.25,,,, +US-MA-02476,US,MA,02476,6.25,,,, +US-MA-02477,US,MA,02477,6.25,,,, +US-MA-02478,US,MA,02478,6.25,,,, +US-MA-02479,US,MA,02479,6.25,,,, +US-MA-02481,US,MA,02481,6.25,,,, +US-MA-02482,US,MA,02482,6.25,,,, +US-MA-02492,US,MA,02492,6.25,,,, +US-MA-02493,US,MA,02493,6.25,,,, +US-MA-02494,US,MA,02494,6.25,,,, +US-MA-02495,US,MA,02495,6.25,,,, +US-MA-02532,US,MA,02532,6.25,,,, +US-MA-02534,US,MA,02534,6.25,,,, +US-MA-02535,US,MA,02535,6.25,,,, +US-MA-02536,US,MA,02536,6.25,,,, +US-MA-02537,US,MA,02537,6.25,,,, +US-MA-02538,US,MA,02538,6.25,,,, +US-MA-02539,US,MA,02539,6.25,,,, +US-MA-02540,US,MA,02540,6.25,,,, +US-MA-02541,US,MA,02541,6.25,,,, +US-MA-02542,US,MA,02542,6.25,,,, +US-MA-02543,US,MA,02543,6.25,,,, +US-MA-02552,US,MA,02552,6.25,,,, +US-MA-02553,US,MA,02553,6.25,,,, +US-MA-02554,US,MA,02554,6.25,,,, +US-MA-02556,US,MA,02556,6.25,,,, +US-MA-02557,US,MA,02557,6.25,,,, +US-MA-02558,US,MA,02558,6.25,,,, +US-MA-02559,US,MA,02559,6.25,,,, +US-MA-02561,US,MA,02561,6.25,,,, +US-MA-02562,US,MA,02562,6.25,,,, +US-MA-02563,US,MA,02563,6.25,,,, +US-MA-02564,US,MA,02564,6.25,,,, +US-MA-02565,US,MA,02565,6.25,,,, +US-MA-02568,US,MA,02568,6.25,,,, +US-MA-02571,US,MA,02571,6.25,,,, +US-MA-02573,US,MA,02573,6.25,,,, +US-MA-02574,US,MA,02574,6.25,,,, +US-MA-02575,US,MA,02575,6.25,,,, +US-MA-02576,US,MA,02576,6.25,,,, +US-MA-02584,US,MA,02584,6.25,,,, +US-MA-02601,US,MA,02601,6.25,,,, +US-MA-02630,US,MA,02630,6.25,,,, +US-MA-02631,US,MA,02631,6.25,,,, +US-MA-02632,US,MA,02632,6.25,,,, +US-MA-02633,US,MA,02633,6.25,,,, +US-MA-02634,US,MA,02634,6.25,,,, +US-MA-02635,US,MA,02635,6.25,,,, +US-MA-02637,US,MA,02637,6.25,,,, +US-MA-02638,US,MA,02638,6.25,,,, +US-MA-02639,US,MA,02639,6.25,,,, +US-MA-02641,US,MA,02641,6.25,,,, +US-MA-02642,US,MA,02642,6.25,,,, +US-MA-02643,US,MA,02643,6.25,,,, +US-MA-02644,US,MA,02644,6.25,,,, +US-MA-02645,US,MA,02645,6.25,,,, +US-MA-02646,US,MA,02646,6.25,,,, +US-MA-02647,US,MA,02647,6.25,,,, +US-MA-02648,US,MA,02648,6.25,,,, +US-MA-02649,US,MA,02649,6.25,,,, +US-MA-02650,US,MA,02650,6.25,,,, +US-MA-02651,US,MA,02651,6.25,,,, +US-MA-02652,US,MA,02652,6.25,,,, +US-MA-02653,US,MA,02653,6.25,,,, +US-MA-02655,US,MA,02655,6.25,,,, +US-MA-02657,US,MA,02657,6.25,,,, +US-MA-02659,US,MA,02659,6.25,,,, +US-MA-02660,US,MA,02660,6.25,,,, +US-MA-02661,US,MA,02661,6.25,,,, +US-MA-02662,US,MA,02662,6.25,,,, +US-MA-02663,US,MA,02663,6.25,,,, +US-MA-02664,US,MA,02664,6.25,,,, +US-MA-02666,US,MA,02666,6.25,,,, +US-MA-02667,US,MA,02667,6.25,,,, +US-MA-02668,US,MA,02668,6.25,,,, +US-MA-02669,US,MA,02669,6.25,,,, +US-MA-02670,US,MA,02670,6.25,,,, +US-MA-02671,US,MA,02671,6.25,,,, +US-MA-02672,US,MA,02672,6.25,,,, +US-MA-02673,US,MA,02673,6.25,,,, +US-MA-02675,US,MA,02675,6.25,,,, +US-MA-02702,US,MA,02702,6.25,,,, +US-MA-02703,US,MA,02703,6.25,,,, +US-MA-02712,US,MA,02712,6.25,,,, +US-MA-02713,US,MA,02713,6.25,,,, +US-MA-02714,US,MA,02714,6.25,,,, +US-MA-02715,US,MA,02715,6.25,,,, +US-MA-02717,US,MA,02717,6.25,,,, +US-MA-02718,US,MA,02718,6.25,,,, +US-MA-02719,US,MA,02719,6.25,,,, +US-MA-02720,US,MA,02720,6.25,,,, +US-MA-02721,US,MA,02721,6.25,,,, +US-MA-02722,US,MA,02722,6.25,,,, +US-MA-02723,US,MA,02723,6.25,,,, +US-MA-02724,US,MA,02724,6.25,,,, +US-MA-02725,US,MA,02725,6.25,,,, +US-MA-02726,US,MA,02726,6.25,,,, +US-MA-02738,US,MA,02738,6.25,,,, +US-MA-02739,US,MA,02739,6.25,,,, +US-MA-02740,US,MA,02740,6.25,,,, +US-MA-02741,US,MA,02741,6.25,,,, +US-MA-02742,US,MA,02742,6.25,,,, +US-MA-02743,US,MA,02743,6.25,,,, +US-MA-02744,US,MA,02744,6.25,,,, +US-MA-02745,US,MA,02745,6.25,,,, +US-MA-02746,US,MA,02746,6.25,,,, +US-MA-02747,US,MA,02747,6.25,,,, +US-MA-02748,US,MA,02748,6.25,,,, +US-MA-02760,US,MA,02760,6.25,,,, +US-MA-02761,US,MA,02761,6.25,,,, +US-MA-02762,US,MA,02762,6.25,,,, +US-MA-02763,US,MA,02763,6.25,,,, +US-MA-02764,US,MA,02764,6.25,,,, +US-MA-02766,US,MA,02766,6.25,,,, +US-MA-02767,US,MA,02767,6.25,,,, +US-MA-02768,US,MA,02768,6.25,,,, +US-MA-02769,US,MA,02769,6.25,,,, +US-MA-02770,US,MA,02770,6.25,,,, +US-MA-02771,US,MA,02771,6.25,,,, +US-MA-02777,US,MA,02777,6.25,,,, +US-MA-02779,US,MA,02779,6.25,,,, +US-MA-02780,US,MA,02780,6.25,,,, +US-MA-02783,US,MA,02783,6.25,,,, +US-MA-02790,US,MA,02790,6.25,,,, +US-MA-02791,US,MA,02791,6.25,,,, +US-MA-05501,US,MA,05501,6.25,,,, +US-MA-05544,US,MA,05544,6.25,,,, +US-MD-20601,US,MD,20601,6,,,, +US-MD-20602,US,MD,20602,6,,,, +US-MD-20603,US,MD,20603,6,,,, +US-MD-20604,US,MD,20604,6,,,, +US-MD-20606,US,MD,20606,6,,,, +US-MD-20607,US,MD,20607,6,,,, +US-MD-20608,US,MD,20608,6,,,, +US-MD-20609,US,MD,20609,6,,,, +US-MD-20610,US,MD,20610,6,,,, +US-MD-20611,US,MD,20611,6,,,, +US-MD-20612,US,MD,20612,6,,,, +US-MD-20613,US,MD,20613,6,,,, +US-MD-20615,US,MD,20615,6,,,, +US-MD-20616,US,MD,20616,6,,,, +US-MD-20617,US,MD,20617,6,,,, +US-MD-20618,US,MD,20618,6,,,, +US-MD-20619,US,MD,20619,6,,,, +US-MD-20620,US,MD,20620,6,,,, +US-MD-20621,US,MD,20621,6,,,, +US-MD-20622,US,MD,20622,6,,,, +US-MD-20623,US,MD,20623,6,,,, +US-MD-20624,US,MD,20624,6,,,, +US-MD-20625,US,MD,20625,6,,,, +US-MD-20626,US,MD,20626,6,,,, +US-MD-20627,US,MD,20627,6,,,, +US-MD-20628,US,MD,20628,6,,,, +US-MD-20629,US,MD,20629,6,,,, +US-MD-20630,US,MD,20630,6,,,, +US-MD-20632,US,MD,20632,6,,,, +US-MD-20634,US,MD,20634,6,,,, +US-MD-20635,US,MD,20635,6,,,, +US-MD-20636,US,MD,20636,6,,,, +US-MD-20637,US,MD,20637,6,,,, +US-MD-20639,US,MD,20639,6,,,, +US-MD-20640,US,MD,20640,6,,,, +US-MD-20643,US,MD,20643,6,,,, +US-MD-20645,US,MD,20645,6,,,, +US-MD-20646,US,MD,20646,6,,,, +US-MD-20650,US,MD,20650,6,,,, +US-MD-20653,US,MD,20653,6,,,, +US-MD-20656,US,MD,20656,6,,,, +US-MD-20657,US,MD,20657,6,,,, +US-MD-20658,US,MD,20658,6,,,, +US-MD-20659,US,MD,20659,6,,,, +US-MD-20660,US,MD,20660,6,,,, +US-MD-20661,US,MD,20661,6,,,, +US-MD-20662,US,MD,20662,6,,,, +US-MD-20664,US,MD,20664,6,,,, +US-MD-20667,US,MD,20667,6,,,, +US-MD-20670,US,MD,20670,6,,,, +US-MD-20674,US,MD,20674,6,,,, +US-MD-20675,US,MD,20675,6,,,, +US-MD-20676,US,MD,20676,6,,,, +US-MD-20677,US,MD,20677,6,,,, +US-MD-20678,US,MD,20678,6,,,, +US-MD-20680,US,MD,20680,6,,,, +US-MD-20682,US,MD,20682,6,,,, +US-MD-20684,US,MD,20684,6,,,, +US-MD-20685,US,MD,20685,6,,,, +US-MD-20686,US,MD,20686,6,,,, +US-MD-20687,US,MD,20687,6,,,, +US-MD-20688,US,MD,20688,6,,,, +US-MD-20689,US,MD,20689,6,,,, +US-MD-20690,US,MD,20690,6,,,, +US-MD-20692,US,MD,20692,6,,,, +US-MD-20693,US,MD,20693,6,,,, +US-MD-20695,US,MD,20695,6,,,, +US-MD-20697,US,MD,20697,6,,,, +US-MD-20701,US,MD,20701,6,,,, +US-MD-20703,US,MD,20703,6,,,, +US-MD-20704,US,MD,20704,6,,,, +US-MD-20705,US,MD,20705,6,,,, +US-MD-20706,US,MD,20706,6,,,, +US-MD-20707,US,MD,20707,6,,,, +US-MD-20708,US,MD,20708,6,,,, +US-MD-20709,US,MD,20709,6,,,, +US-MD-20710,US,MD,20710,6,,,, +US-MD-20711,US,MD,20711,6,,,, +US-MD-20712,US,MD,20712,6,,,, +US-MD-20714,US,MD,20714,6,,,, +US-MD-20715,US,MD,20715,6,,,, +US-MD-20716,US,MD,20716,6,,,, +US-MD-20717,US,MD,20717,6,,,, +US-MD-20718,US,MD,20718,6,,,, +US-MD-20719,US,MD,20719,6,,,, +US-MD-20720,US,MD,20720,6,,,, +US-MD-20721,US,MD,20721,6,,,, +US-MD-20722,US,MD,20722,6,,,, +US-MD-20723,US,MD,20723,6,,,, +US-MD-20724,US,MD,20724,6,,,, +US-MD-20725,US,MD,20725,6,,,, +US-MD-20726,US,MD,20726,6,,,, +US-MD-20731,US,MD,20731,6,,,, +US-MD-20732,US,MD,20732,6,,,, +US-MD-20733,US,MD,20733,6,,,, +US-MD-20735,US,MD,20735,6,,,, +US-MD-20736,US,MD,20736,6,,,, +US-MD-20737,US,MD,20737,6,,,, +US-MD-20738,US,MD,20738,6,,,, +US-MD-20740,US,MD,20740,6,,,, +US-MD-20741,US,MD,20741,6,,,, +US-MD-20742,US,MD,20742,6,,,, +US-MD-20743,US,MD,20743,6,,,, +US-MD-20744,US,MD,20744,6,,,, +US-MD-20745,US,MD,20745,6,,,, +US-MD-20746,US,MD,20746,6,,,, +US-MD-20747,US,MD,20747,6,,,, +US-MD-20748,US,MD,20748,6,,,, +US-MD-20749,US,MD,20749,6,,,, +US-MD-20750,US,MD,20750,6,,,, +US-MD-20751,US,MD,20751,6,,,, +US-MD-20752,US,MD,20752,6,,,, +US-MD-20753,US,MD,20753,6,,,, +US-MD-20754,US,MD,20754,6,,,, +US-MD-20755,US,MD,20755,6,,,, +US-MD-20757,US,MD,20757,6,,,, +US-MD-20758,US,MD,20758,6,,,, +US-MD-20759,US,MD,20759,6,,,, +US-MD-20762,US,MD,20762,6,,,, +US-MD-20763,US,MD,20763,6,,,, +US-MD-20764,US,MD,20764,6,,,, +US-MD-20765,US,MD,20765,6,,,, +US-MD-20768,US,MD,20768,6,,,, +US-MD-20769,US,MD,20769,6,,,, +US-MD-20770,US,MD,20770,6,,,, +US-MD-20771,US,MD,20771,6,,,, +US-MD-20772,US,MD,20772,6,,,, +US-MD-20773,US,MD,20773,6,,,, +US-MD-20774,US,MD,20774,6,,,, +US-MD-20775,US,MD,20775,6,,,, +US-MD-20776,US,MD,20776,6,,,, +US-MD-20777,US,MD,20777,6,,,, +US-MD-20778,US,MD,20778,6,,,, +US-MD-20779,US,MD,20779,6,,,, +US-MD-20781,US,MD,20781,6,,,, +US-MD-20782,US,MD,20782,6,,,, +US-MD-20783,US,MD,20783,6,,,, +US-MD-20784,US,MD,20784,6,,,, +US-MD-20785,US,MD,20785,6,,,, +US-MD-20787,US,MD,20787,6,,,, +US-MD-20788,US,MD,20788,6,,,, +US-MD-20790,US,MD,20790,6,,,, +US-MD-20791,US,MD,20791,6,,,, +US-MD-20792,US,MD,20792,6,,,, +US-MD-20794,US,MD,20794,6,,,, +US-MD-20797,US,MD,20797,6,,,, +US-MD-20799,US,MD,20799,6,,,, +US-MD-20810,US,MD,20810,6,,,, +US-MD-20811,US,MD,20811,6,,,, +US-MD-20812,US,MD,20812,6,,,, +US-MD-20813,US,MD,20813,6,,,, +US-MD-20814,US,MD,20814,6,,,, +US-MD-20815,US,MD,20815,6,,,, +US-MD-20816,US,MD,20816,6,,,, +US-MD-20817,US,MD,20817,6,,,, +US-MD-20818,US,MD,20818,6,,,, +US-MD-20824,US,MD,20824,6,,,, +US-MD-20825,US,MD,20825,6,,,, +US-MD-20827,US,MD,20827,6,,,, +US-MD-20830,US,MD,20830,6,,,, +US-MD-20832,US,MD,20832,6,,,, +US-MD-20833,US,MD,20833,6,,,, +US-MD-20837,US,MD,20837,6,,,, +US-MD-20838,US,MD,20838,6,,,, +US-MD-20839,US,MD,20839,6,,,, +US-MD-20841,US,MD,20841,6,,,, +US-MD-20842,US,MD,20842,6,,,, +US-MD-20847,US,MD,20847,6,,,, +US-MD-20848,US,MD,20848,6,,,, +US-MD-20849,US,MD,20849,6,,,, +US-MD-20850,US,MD,20850,6,,,, +US-MD-20851,US,MD,20851,6,,,, +US-MD-20852,US,MD,20852,6,,,, +US-MD-20853,US,MD,20853,6,,,, +US-MD-20854,US,MD,20854,6,,,, +US-MD-20855,US,MD,20855,6,,,, +US-MD-20857,US,MD,20857,6,,,, +US-MD-20859,US,MD,20859,6,,,, +US-MD-20860,US,MD,20860,6,,,, +US-MD-20861,US,MD,20861,6,,,, +US-MD-20862,US,MD,20862,6,,,, +US-MD-20866,US,MD,20866,6,,,, +US-MD-20868,US,MD,20868,6,,,, +US-MD-20871,US,MD,20871,6,,,, +US-MD-20872,US,MD,20872,6,,,, +US-MD-20874,US,MD,20874,6,,,, +US-MD-20875,US,MD,20875,6,,,, +US-MD-20876,US,MD,20876,6,,,, +US-MD-20877,US,MD,20877,6,,,, +US-MD-20878,US,MD,20878,6,,,, +US-MD-20879,US,MD,20879,6,,,, +US-MD-20880,US,MD,20880,6,,,, +US-MD-20882,US,MD,20882,6,,,, +US-MD-20883,US,MD,20883,6,,,, +US-MD-20884,US,MD,20884,6,,,, +US-MD-20885,US,MD,20885,6,,,, +US-MD-20886,US,MD,20886,6,,,, +US-MD-20889,US,MD,20889,6,,,, +US-MD-20891,US,MD,20891,6,,,, +US-MD-20892,US,MD,20892,6,,,, +US-MD-20894,US,MD,20894,6,,,, +US-MD-20895,US,MD,20895,6,,,, +US-MD-20896,US,MD,20896,6,,,, +US-MD-20897,US,MD,20897,6,,,, +US-MD-20898,US,MD,20898,6,,,, +US-MD-20899,US,MD,20899,6,,,, +US-MD-20901,US,MD,20901,6,,,, +US-MD-20902,US,MD,20902,6,,,, +US-MD-20903,US,MD,20903,6,,,, +US-MD-20904,US,MD,20904,6,,,, +US-MD-20905,US,MD,20905,6,,,, +US-MD-20906,US,MD,20906,6,,,, +US-MD-20907,US,MD,20907,6,,,, +US-MD-20908,US,MD,20908,6,,,, +US-MD-20910,US,MD,20910,6,,,, +US-MD-20911,US,MD,20911,6,,,, +US-MD-20912,US,MD,20912,6,,,, +US-MD-20913,US,MD,20913,6,,,, +US-MD-20914,US,MD,20914,6,,,, +US-MD-20915,US,MD,20915,6,,,, +US-MD-20916,US,MD,20916,6,,,, +US-MD-20918,US,MD,20918,6,,,, +US-MD-20993,US,MD,20993,6,,,, +US-MD-20997,US,MD,20997,6,,,, +US-MD-21001,US,MD,21001,6,,,, +US-MD-21005,US,MD,21005,6,,,, +US-MD-21009,US,MD,21009,6,,,, +US-MD-21010,US,MD,21010,6,,,, +US-MD-21012,US,MD,21012,6,,,, +US-MD-21013,US,MD,21013,6,,,, +US-MD-21014,US,MD,21014,6,,,, +US-MD-21015,US,MD,21015,6,,,, +US-MD-21017,US,MD,21017,6,,,, +US-MD-21018,US,MD,21018,6,,,, +US-MD-21020,US,MD,21020,6,,,, +US-MD-21022,US,MD,21022,6,,,, +US-MD-21023,US,MD,21023,6,,,, +US-MD-21027,US,MD,21027,6,,,, +US-MD-21028,US,MD,21028,6,,,, +US-MD-21029,US,MD,21029,6,,,, +US-MD-21030,US,MD,21030,6,,,, +US-MD-21031,US,MD,21031,6,,,, +US-MD-21032,US,MD,21032,6,,,, +US-MD-21034,US,MD,21034,6,,,, +US-MD-21035,US,MD,21035,6,,,, +US-MD-21036,US,MD,21036,6,,,, +US-MD-21037,US,MD,21037,6,,,, +US-MD-21040,US,MD,21040,6,,,, +US-MD-21041,US,MD,21041,6,,,, +US-MD-21042,US,MD,21042,6,,,, +US-MD-21043,US,MD,21043,6,,,, +US-MD-21044,US,MD,21044,6,,,, +US-MD-21045,US,MD,21045,6,,,, +US-MD-21046,US,MD,21046,6,,,, +US-MD-21047,US,MD,21047,6,,,, +US-MD-21048,US,MD,21048,6,,,, +US-MD-21050,US,MD,21050,6,,,, +US-MD-21051,US,MD,21051,6,,,, +US-MD-21052,US,MD,21052,6,,,, +US-MD-21053,US,MD,21053,6,,,, +US-MD-21054,US,MD,21054,6,,,, +US-MD-21056,US,MD,21056,6,,,, +US-MD-21057,US,MD,21057,6,,,, +US-MD-21060,US,MD,21060,6,,,, +US-MD-21061,US,MD,21061,6,,,, +US-MD-21062,US,MD,21062,6,,,, +US-MD-21065,US,MD,21065,6,,,, +US-MD-21071,US,MD,21071,6,,,, +US-MD-21074,US,MD,21074,6,,,, +US-MD-21075,US,MD,21075,6,,,, +US-MD-21076,US,MD,21076,6,,,, +US-MD-21077,US,MD,21077,6,,,, +US-MD-21078,US,MD,21078,6,,,, +US-MD-21082,US,MD,21082,6,,,, +US-MD-21084,US,MD,21084,6,,,, +US-MD-21085,US,MD,21085,6,,,, +US-MD-21087,US,MD,21087,6,,,, +US-MD-21088,US,MD,21088,6,,,, +US-MD-21090,US,MD,21090,6,,,, +US-MD-21092,US,MD,21092,6,,,, +US-MD-21093,US,MD,21093,6,,,, +US-MD-21094,US,MD,21094,6,,,, +US-MD-21102,US,MD,21102,6,,,, +US-MD-21104,US,MD,21104,6,,,, +US-MD-21105,US,MD,21105,6,,,, +US-MD-21106,US,MD,21106,6,,,, +US-MD-21108,US,MD,21108,6,,,, +US-MD-21111,US,MD,21111,6,,,, +US-MD-21113,US,MD,21113,6,,,, +US-MD-21114,US,MD,21114,6,,,, +US-MD-21117,US,MD,21117,6,,,, +US-MD-21120,US,MD,21120,6,,,, +US-MD-21122,US,MD,21122,6,,,, +US-MD-21123,US,MD,21123,6,,,, +US-MD-21128,US,MD,21128,6,,,, +US-MD-21130,US,MD,21130,6,,,, +US-MD-21131,US,MD,21131,6,,,, +US-MD-21132,US,MD,21132,6,,,, +US-MD-21133,US,MD,21133,6,,,, +US-MD-21136,US,MD,21136,6,,,, +US-MD-21139,US,MD,21139,6,,,, +US-MD-21140,US,MD,21140,6,,,, +US-MD-21144,US,MD,21144,6,,,, +US-MD-21146,US,MD,21146,6,,,, +US-MD-21150,US,MD,21150,6,,,, +US-MD-21152,US,MD,21152,6,,,, +US-MD-21153,US,MD,21153,6,,,, +US-MD-21154,US,MD,21154,6,,,, +US-MD-21155,US,MD,21155,6,,,, +US-MD-21156,US,MD,21156,6,,,, +US-MD-21157,US,MD,21157,6,,,, +US-MD-21158,US,MD,21158,6,,,, +US-MD-21160,US,MD,21160,6,,,, +US-MD-21161,US,MD,21161,6,,,, +US-MD-21162,US,MD,21162,6,,,, +US-MD-21163,US,MD,21163,6,,,, +US-MD-21201,US,MD,21201,6,,,, +US-MD-21202,US,MD,21202,6,,,, +US-MD-21203,US,MD,21203,6,,,, +US-MD-21204,US,MD,21204,6,,,, +US-MD-21205,US,MD,21205,6,,,, +US-MD-21206,US,MD,21206,6,,,, +US-MD-21207,US,MD,21207,6,,,, +US-MD-21208,US,MD,21208,6,,,, +US-MD-21209,US,MD,21209,6,,,, +US-MD-21210,US,MD,21210,6,,,, +US-MD-21211,US,MD,21211,6,,,, +US-MD-21212,US,MD,21212,6,,,, +US-MD-21213,US,MD,21213,6,,,, +US-MD-21214,US,MD,21214,6,,,, +US-MD-21215,US,MD,21215,6,,,, +US-MD-21216,US,MD,21216,6,,,, +US-MD-21217,US,MD,21217,6,,,, +US-MD-21218,US,MD,21218,6,,,, +US-MD-21219,US,MD,21219,6,,,, +US-MD-21220,US,MD,21220,6,,,, +US-MD-21221,US,MD,21221,6,,,, +US-MD-21222,US,MD,21222,6,,,, +US-MD-21223,US,MD,21223,6,,,, +US-MD-21224,US,MD,21224,6,,,, +US-MD-21225,US,MD,21225,6,,,, +US-MD-21226,US,MD,21226,6,,,, +US-MD-21227,US,MD,21227,6,,,, +US-MD-21228,US,MD,21228,6,,,, +US-MD-21229,US,MD,21229,6,,,, +US-MD-21230,US,MD,21230,6,,,, +US-MD-21231,US,MD,21231,6,,,, +US-MD-21233,US,MD,21233,6,,,, +US-MD-21234,US,MD,21234,6,,,, +US-MD-21235,US,MD,21235,6,,,, +US-MD-21236,US,MD,21236,6,,,, +US-MD-21237,US,MD,21237,6,,,, +US-MD-21239,US,MD,21239,6,,,, +US-MD-21240,US,MD,21240,6,,,, +US-MD-21241,US,MD,21241,6,,,, +US-MD-21244,US,MD,21244,6,,,, +US-MD-21250,US,MD,21250,6,,,, +US-MD-21251,US,MD,21251,6,,,, +US-MD-21252,US,MD,21252,6,,,, +US-MD-21263,US,MD,21263,6,,,, +US-MD-21264,US,MD,21264,6,,,, +US-MD-21270,US,MD,21270,6,,,, +US-MD-21273,US,MD,21273,6,,,, +US-MD-21275,US,MD,21275,6,,,, +US-MD-21278,US,MD,21278,6,,,, +US-MD-21279,US,MD,21279,6,,,, +US-MD-21280,US,MD,21280,6,,,, +US-MD-21281,US,MD,21281,6,,,, +US-MD-21282,US,MD,21282,6,,,, +US-MD-21284,US,MD,21284,6,,,, +US-MD-21285,US,MD,21285,6,,,, +US-MD-21286,US,MD,21286,6,,,, +US-MD-21287,US,MD,21287,6,,,, +US-MD-21288,US,MD,21288,6,,,, +US-MD-21289,US,MD,21289,6,,,, +US-MD-21290,US,MD,21290,6,,,, +US-MD-21297,US,MD,21297,6,,,, +US-MD-21298,US,MD,21298,6,,,, +US-MD-21401,US,MD,21401,6,,,, +US-MD-21402,US,MD,21402,6,,,, +US-MD-21403,US,MD,21403,6,,,, +US-MD-21404,US,MD,21404,6,,,, +US-MD-21405,US,MD,21405,6,,,, +US-MD-21409,US,MD,21409,6,,,, +US-MD-21411,US,MD,21411,6,,,, +US-MD-21412,US,MD,21412,6,,,, +US-MD-21501,US,MD,21501,6,,,, +US-MD-21502,US,MD,21502,6,,,, +US-MD-21503,US,MD,21503,6,,,, +US-MD-21504,US,MD,21504,6,,,, +US-MD-21505,US,MD,21505,6,,,, +US-MD-21520,US,MD,21520,6,,,, +US-MD-21521,US,MD,21521,6,,,, +US-MD-21522,US,MD,21522,6,,,, +US-MD-21523,US,MD,21523,6,,,, +US-MD-21524,US,MD,21524,6,,,, +US-MD-21528,US,MD,21528,6,,,, +US-MD-21529,US,MD,21529,6,,,, +US-MD-21530,US,MD,21530,6,,,, +US-MD-21531,US,MD,21531,6,,,, +US-MD-21532,US,MD,21532,6,,,, +US-MD-21536,US,MD,21536,6,,,, +US-MD-21538,US,MD,21538,6,,,, +US-MD-21539,US,MD,21539,6,,,, +US-MD-21540,US,MD,21540,6,,,, +US-MD-21541,US,MD,21541,6,,,, +US-MD-21542,US,MD,21542,6,,,, +US-MD-21543,US,MD,21543,6,,,, +US-MD-21545,US,MD,21545,6,,,, +US-MD-21550,US,MD,21550,6,,,, +US-MD-21555,US,MD,21555,6,,,, +US-MD-21556,US,MD,21556,6,,,, +US-MD-21557,US,MD,21557,6,,,, +US-MD-21560,US,MD,21560,6,,,, +US-MD-21561,US,MD,21561,6,,,, +US-MD-21562,US,MD,21562,6,,,, +US-MD-21601,US,MD,21601,6,,,, +US-MD-21607,US,MD,21607,6,,,, +US-MD-21609,US,MD,21609,6,,,, +US-MD-21610,US,MD,21610,6,,,, +US-MD-21612,US,MD,21612,6,,,, +US-MD-21613,US,MD,21613,6,,,, +US-MD-21617,US,MD,21617,6,,,, +US-MD-21619,US,MD,21619,6,,,, +US-MD-21620,US,MD,21620,6,,,, +US-MD-21622,US,MD,21622,6,,,, +US-MD-21623,US,MD,21623,6,,,, +US-MD-21624,US,MD,21624,6,,,, +US-MD-21625,US,MD,21625,6,,,, +US-MD-21626,US,MD,21626,6,,,, +US-MD-21627,US,MD,21627,6,,,, +US-MD-21628,US,MD,21628,6,,,, +US-MD-21629,US,MD,21629,6,,,, +US-MD-21631,US,MD,21631,6,,,, +US-MD-21632,US,MD,21632,6,,,, +US-MD-21634,US,MD,21634,6,,,, +US-MD-21635,US,MD,21635,6,,,, +US-MD-21636,US,MD,21636,6,,,, +US-MD-21638,US,MD,21638,6,,,, +US-MD-21639,US,MD,21639,6,,,, +US-MD-21640,US,MD,21640,6,,,, +US-MD-21641,US,MD,21641,6,,,, +US-MD-21643,US,MD,21643,6,,,, +US-MD-21644,US,MD,21644,6,,,, +US-MD-21645,US,MD,21645,6,,,, +US-MD-21647,US,MD,21647,6,,,, +US-MD-21648,US,MD,21648,6,,,, +US-MD-21649,US,MD,21649,6,,,, +US-MD-21650,US,MD,21650,6,,,, +US-MD-21651,US,MD,21651,6,,,, +US-MD-21652,US,MD,21652,6,,,, +US-MD-21653,US,MD,21653,6,,,, +US-MD-21654,US,MD,21654,6,,,, +US-MD-21655,US,MD,21655,6,,,, +US-MD-21656,US,MD,21656,6,,,, +US-MD-21657,US,MD,21657,6,,,, +US-MD-21658,US,MD,21658,6,,,, +US-MD-21659,US,MD,21659,6,,,, +US-MD-21660,US,MD,21660,6,,,, +US-MD-21661,US,MD,21661,6,,,, +US-MD-21662,US,MD,21662,6,,,, +US-MD-21663,US,MD,21663,6,,,, +US-MD-21664,US,MD,21664,6,,,, +US-MD-21665,US,MD,21665,6,,,, +US-MD-21666,US,MD,21666,6,,,, +US-MD-21667,US,MD,21667,6,,,, +US-MD-21668,US,MD,21668,6,,,, +US-MD-21669,US,MD,21669,6,,,, +US-MD-21670,US,MD,21670,6,,,, +US-MD-21671,US,MD,21671,6,,,, +US-MD-21672,US,MD,21672,6,,,, +US-MD-21673,US,MD,21673,6,,,, +US-MD-21675,US,MD,21675,6,,,, +US-MD-21676,US,MD,21676,6,,,, +US-MD-21677,US,MD,21677,6,,,, +US-MD-21678,US,MD,21678,6,,,, +US-MD-21679,US,MD,21679,6,,,, +US-MD-21690,US,MD,21690,6,,,, +US-MD-21701,US,MD,21701,6,,,, +US-MD-21702,US,MD,21702,6,,,, +US-MD-21703,US,MD,21703,6,,,, +US-MD-21704,US,MD,21704,6,,,, +US-MD-21705,US,MD,21705,6,,,, +US-MD-21709,US,MD,21709,6,,,, +US-MD-21710,US,MD,21710,6,,,, +US-MD-21711,US,MD,21711,6,,,, +US-MD-21713,US,MD,21713,6,,,, +US-MD-21714,US,MD,21714,6,,,, +US-MD-21715,US,MD,21715,6,,,, +US-MD-21716,US,MD,21716,6,,,, +US-MD-21717,US,MD,21717,6,,,, +US-MD-21718,US,MD,21718,6,,,, +US-MD-21719,US,MD,21719,6,,,, +US-MD-21720,US,MD,21720,6,,,, +US-MD-21721,US,MD,21721,6,,,, +US-MD-21722,US,MD,21722,6,,,, +US-MD-21723,US,MD,21723,6,,,, +US-MD-21727,US,MD,21727,6,,,, +US-MD-21733,US,MD,21733,6,,,, +US-MD-21734,US,MD,21734,6,,,, +US-MD-21737,US,MD,21737,6,,,, +US-MD-21738,US,MD,21738,6,,,, +US-MD-21740,US,MD,21740,6,,,, +US-MD-21741,US,MD,21741,6,,,, +US-MD-21742,US,MD,21742,6,,,, +US-MD-21746,US,MD,21746,6,,,, +US-MD-21747,US,MD,21747,6,,,, +US-MD-21749,US,MD,21749,6,,,, +US-MD-21750,US,MD,21750,6,,,, +US-MD-21754,US,MD,21754,6,,,, +US-MD-21755,US,MD,21755,6,,,, +US-MD-21756,US,MD,21756,6,,,, +US-MD-21757,US,MD,21757,6,,,, +US-MD-21758,US,MD,21758,6,,,, +US-MD-21759,US,MD,21759,6,,,, +US-MD-21762,US,MD,21762,6,,,, +US-MD-21765,US,MD,21765,6,,,, +US-MD-21766,US,MD,21766,6,,,, +US-MD-21767,US,MD,21767,6,,,, +US-MD-21769,US,MD,21769,6,,,, +US-MD-21770,US,MD,21770,6,,,, +US-MD-21771,US,MD,21771,6,,,, +US-MD-21773,US,MD,21773,6,,,, +US-MD-21774,US,MD,21774,6,,,, +US-MD-21775,US,MD,21775,6,,,, +US-MD-21776,US,MD,21776,6,,,, +US-MD-21777,US,MD,21777,6,,,, +US-MD-21778,US,MD,21778,6,,,, +US-MD-21779,US,MD,21779,6,,,, +US-MD-21780,US,MD,21780,6,,,, +US-MD-21781,US,MD,21781,6,,,, +US-MD-21782,US,MD,21782,6,,,, +US-MD-21783,US,MD,21783,6,,,, +US-MD-21784,US,MD,21784,6,,,, +US-MD-21787,US,MD,21787,6,,,, +US-MD-21788,US,MD,21788,6,,,, +US-MD-21790,US,MD,21790,6,,,, +US-MD-21791,US,MD,21791,6,,,, +US-MD-21792,US,MD,21792,6,,,, +US-MD-21793,US,MD,21793,6,,,, +US-MD-21794,US,MD,21794,6,,,, +US-MD-21795,US,MD,21795,6,,,, +US-MD-21797,US,MD,21797,6,,,, +US-MD-21798,US,MD,21798,6,,,, +US-MD-21801,US,MD,21801,6,,,, +US-MD-21802,US,MD,21802,6,,,, +US-MD-21803,US,MD,21803,6,,,, +US-MD-21804,US,MD,21804,6,,,, +US-MD-21810,US,MD,21810,6,,,, +US-MD-21811,US,MD,21811,6,,,, +US-MD-21813,US,MD,21813,6,,,, +US-MD-21814,US,MD,21814,6,,,, +US-MD-21817,US,MD,21817,6,,,, +US-MD-21821,US,MD,21821,6,,,, +US-MD-21822,US,MD,21822,6,,,, +US-MD-21824,US,MD,21824,6,,,, +US-MD-21826,US,MD,21826,6,,,, +US-MD-21829,US,MD,21829,6,,,, +US-MD-21830,US,MD,21830,6,,,, +US-MD-21835,US,MD,21835,6,,,, +US-MD-21836,US,MD,21836,6,,,, +US-MD-21837,US,MD,21837,6,,,, +US-MD-21838,US,MD,21838,6,,,, +US-MD-21840,US,MD,21840,6,,,, +US-MD-21841,US,MD,21841,6,,,, +US-MD-21842,US,MD,21842,6,,,, +US-MD-21843,US,MD,21843,6,,,, +US-MD-21849,US,MD,21849,6,,,, +US-MD-21850,US,MD,21850,6,,,, +US-MD-21851,US,MD,21851,6,,,, +US-MD-21852,US,MD,21852,6,,,, +US-MD-21853,US,MD,21853,6,,,, +US-MD-21856,US,MD,21856,6,,,, +US-MD-21857,US,MD,21857,6,,,, +US-MD-21861,US,MD,21861,6,,,, +US-MD-21862,US,MD,21862,6,,,, +US-MD-21863,US,MD,21863,6,,,, +US-MD-21864,US,MD,21864,6,,,, +US-MD-21865,US,MD,21865,6,,,, +US-MD-21866,US,MD,21866,6,,,, +US-MD-21867,US,MD,21867,6,,,, +US-MD-21869,US,MD,21869,6,,,, +US-MD-21871,US,MD,21871,6,,,, +US-MD-21872,US,MD,21872,6,,,, +US-MD-21874,US,MD,21874,6,,,, +US-MD-21875,US,MD,21875,6,,,, +US-MD-21890,US,MD,21890,6,,,, +US-MD-21901,US,MD,21901,6,,,, +US-MD-21902,US,MD,21902,6,,,, +US-MD-21903,US,MD,21903,6,,,, +US-MD-21904,US,MD,21904,6,,,, +US-MD-21911,US,MD,21911,6,,,, +US-MD-21912,US,MD,21912,6,,,, +US-MD-21913,US,MD,21913,6,,,, +US-MD-21914,US,MD,21914,6,,,, +US-MD-21915,US,MD,21915,6,,,, +US-MD-21916,US,MD,21916,6,,,, +US-MD-21917,US,MD,21917,6,,,, +US-MD-21918,US,MD,21918,6,,,, +US-MD-21919,US,MD,21919,6,,,, +US-MD-21920,US,MD,21920,6,,,, +US-MD-21921,US,MD,21921,6,,,, +US-MD-21922,US,MD,21922,6,,,, +US-MD-21930,US,MD,21930,6,,,, +US-ME-03901,US,ME,03901,5.5,,,, +US-ME-03902,US,ME,03902,5.5,,,, +US-ME-03903,US,ME,03903,5.5,,,, +US-ME-03904,US,ME,03904,5.5,,,, +US-ME-03905,US,ME,03905,5.5,,,, +US-ME-03906,US,ME,03906,5.5,,,, +US-ME-03907,US,ME,03907,5.5,,,, +US-ME-03908,US,ME,03908,5.5,,,, +US-ME-03909,US,ME,03909,5.5,,,, +US-ME-03910,US,ME,03910,5.5,,,, +US-ME-03911,US,ME,03911,5.5,,,, +US-ME-04001,US,ME,04001,5.5,,,, +US-ME-04002,US,ME,04002,5.5,,,, +US-ME-04003,US,ME,04003,5.5,,,, +US-ME-04004,US,ME,04004,5.5,,,, +US-ME-04005,US,ME,04005,5.5,,,, +US-ME-04006,US,ME,04006,5.5,,,, +US-ME-04007,US,ME,04007,5.5,,,, +US-ME-04008,US,ME,04008,5.5,,,, +US-ME-04009,US,ME,04009,5.5,,,, +US-ME-04010,US,ME,04010,5.5,,,, +US-ME-04011,US,ME,04011,5.5,,,, +US-ME-04013,US,ME,04013,5.5,,,, +US-ME-04014,US,ME,04014,5.5,,,, +US-ME-04015,US,ME,04015,5.5,,,, +US-ME-04016,US,ME,04016,5.5,,,, +US-ME-04017,US,ME,04017,5.5,,,, +US-ME-04019,US,ME,04019,5.5,,,, +US-ME-04020,US,ME,04020,5.5,,,, +US-ME-04021,US,ME,04021,5.5,,,, +US-ME-04022,US,ME,04022,5.5,,,, +US-ME-04024,US,ME,04024,5.5,,,, +US-ME-04027,US,ME,04027,5.5,,,, +US-ME-04028,US,ME,04028,5.5,,,, +US-ME-04029,US,ME,04029,5.5,,,, +US-ME-04030,US,ME,04030,5.5,,,, +US-ME-04032,US,ME,04032,5.5,,,, +US-ME-04033,US,ME,04033,5.5,,,, +US-ME-04034,US,ME,04034,5.5,,,, +US-ME-04037,US,ME,04037,5.5,,,, +US-ME-04038,US,ME,04038,5.5,,,, +US-ME-04039,US,ME,04039,5.5,,,, +US-ME-04040,US,ME,04040,5.5,,,, +US-ME-04041,US,ME,04041,5.5,,,, +US-ME-04042,US,ME,04042,5.5,,,, +US-ME-04043,US,ME,04043,5.5,,,, +US-ME-04046,US,ME,04046,5.5,,,, +US-ME-04047,US,ME,04047,5.5,,,, +US-ME-04048,US,ME,04048,5.5,,,, +US-ME-04049,US,ME,04049,5.5,,,, +US-ME-04050,US,ME,04050,5.5,,,, +US-ME-04051,US,ME,04051,5.5,,,, +US-ME-04054,US,ME,04054,5.5,,,, +US-ME-04055,US,ME,04055,5.5,,,, +US-ME-04056,US,ME,04056,5.5,,,, +US-ME-04057,US,ME,04057,5.5,,,, +US-ME-04061,US,ME,04061,5.5,,,, +US-ME-04062,US,ME,04062,5.5,,,, +US-ME-04063,US,ME,04063,5.5,,,, +US-ME-04064,US,ME,04064,5.5,,,, +US-ME-04066,US,ME,04066,5.5,,,, +US-ME-04068,US,ME,04068,5.5,,,, +US-ME-04069,US,ME,04069,5.5,,,, +US-ME-04070,US,ME,04070,5.5,,,, +US-ME-04071,US,ME,04071,5.5,,,, +US-ME-04072,US,ME,04072,5.5,,,, +US-ME-04073,US,ME,04073,5.5,,,, +US-ME-04074,US,ME,04074,5.5,,,, +US-ME-04076,US,ME,04076,5.5,,,, +US-ME-04077,US,ME,04077,5.5,,,, +US-ME-04078,US,ME,04078,5.5,,,, +US-ME-04079,US,ME,04079,5.5,,,, +US-ME-04082,US,ME,04082,5.5,,,, +US-ME-04083,US,ME,04083,5.5,,,, +US-ME-04084,US,ME,04084,5.5,,,, +US-ME-04085,US,ME,04085,5.5,,,, +US-ME-04086,US,ME,04086,5.5,,,, +US-ME-04087,US,ME,04087,5.5,,,, +US-ME-04088,US,ME,04088,5.5,,,, +US-ME-04090,US,ME,04090,5.5,,,, +US-ME-04091,US,ME,04091,5.5,,,, +US-ME-04092,US,ME,04092,5.5,,,, +US-ME-04093,US,ME,04093,5.5,,,, +US-ME-04094,US,ME,04094,5.5,,,, +US-ME-04095,US,ME,04095,5.5,,,, +US-ME-04096,US,ME,04096,5.5,,,, +US-ME-04097,US,ME,04097,5.5,,,, +US-ME-04098,US,ME,04098,5.5,,,, +US-ME-04101,US,ME,04101,5.5,,,, +US-ME-04102,US,ME,04102,5.5,,,, +US-ME-04103,US,ME,04103,5.5,,,, +US-ME-04104,US,ME,04104,5.5,,,, +US-ME-04105,US,ME,04105,5.5,,,, +US-ME-04106,US,ME,04106,5.5,,,, +US-ME-04107,US,ME,04107,5.5,,,, +US-ME-04108,US,ME,04108,5.5,,,, +US-ME-04109,US,ME,04109,5.5,,,, +US-ME-04110,US,ME,04110,5.5,,,, +US-ME-04112,US,ME,04112,5.5,,,, +US-ME-04116,US,ME,04116,5.5,,,, +US-ME-04122,US,ME,04122,5.5,,,, +US-ME-04123,US,ME,04123,5.5,,,, +US-ME-04124,US,ME,04124,5.5,,,, +US-ME-04210,US,ME,04210,5.5,,,, +US-ME-04211,US,ME,04211,5.5,,,, +US-ME-04212,US,ME,04212,5.5,,,, +US-ME-04216,US,ME,04216,5.5,,,, +US-ME-04217,US,ME,04217,5.5,,,, +US-ME-04219,US,ME,04219,5.5,,,, +US-ME-04220,US,ME,04220,5.5,,,, +US-ME-04221,US,ME,04221,5.5,,,, +US-ME-04222,US,ME,04222,5.5,,,, +US-ME-04223,US,ME,04223,5.5,,,, +US-ME-04224,US,ME,04224,5.5,,,, +US-ME-04225,US,ME,04225,5.5,,,, +US-ME-04226,US,ME,04226,5.5,,,, +US-ME-04227,US,ME,04227,5.5,,,, +US-ME-04228,US,ME,04228,5.5,,,, +US-ME-04230,US,ME,04230,5.5,,,, +US-ME-04231,US,ME,04231,5.5,,,, +US-ME-04234,US,ME,04234,5.5,,,, +US-ME-04236,US,ME,04236,5.5,,,, +US-ME-04237,US,ME,04237,5.5,,,, +US-ME-04238,US,ME,04238,5.5,,,, +US-ME-04239,US,ME,04239,5.5,,,, +US-ME-04240,US,ME,04240,5.5,,,, +US-ME-04241,US,ME,04241,5.5,,,, +US-ME-04243,US,ME,04243,5.5,,,, +US-ME-04250,US,ME,04250,5.5,,,, +US-ME-04252,US,ME,04252,5.5,,,, +US-ME-04253,US,ME,04253,5.5,,,, +US-ME-04254,US,ME,04254,5.5,,,, +US-ME-04255,US,ME,04255,5.5,,,, +US-ME-04256,US,ME,04256,5.5,,,, +US-ME-04257,US,ME,04257,5.5,,,, +US-ME-04258,US,ME,04258,5.5,,,, +US-ME-04259,US,ME,04259,5.5,,,, +US-ME-04260,US,ME,04260,5.5,,,, +US-ME-04261,US,ME,04261,5.5,,,, +US-ME-04262,US,ME,04262,5.5,,,, +US-ME-04263,US,ME,04263,5.5,,,, +US-ME-04265,US,ME,04265,5.5,,,, +US-ME-04266,US,ME,04266,5.5,,,, +US-ME-04267,US,ME,04267,5.5,,,, +US-ME-04268,US,ME,04268,5.5,,,, +US-ME-04270,US,ME,04270,5.5,,,, +US-ME-04271,US,ME,04271,5.5,,,, +US-ME-04274,US,ME,04274,5.5,,,, +US-ME-04275,US,ME,04275,5.5,,,, +US-ME-04276,US,ME,04276,5.5,,,, +US-ME-04280,US,ME,04280,5.5,,,, +US-ME-04281,US,ME,04281,5.5,,,, +US-ME-04282,US,ME,04282,5.5,,,, +US-ME-04284,US,ME,04284,5.5,,,, +US-ME-04285,US,ME,04285,5.5,,,, +US-ME-04286,US,ME,04286,5.5,,,, +US-ME-04287,US,ME,04287,5.5,,,, +US-ME-04288,US,ME,04288,5.5,,,, +US-ME-04289,US,ME,04289,5.5,,,, +US-ME-04290,US,ME,04290,5.5,,,, +US-ME-04291,US,ME,04291,5.5,,,, +US-ME-04292,US,ME,04292,5.5,,,, +US-ME-04294,US,ME,04294,5.5,,,, +US-ME-04330,US,ME,04330,5.5,,,, +US-ME-04332,US,ME,04332,5.5,,,, +US-ME-04333,US,ME,04333,5.5,,,, +US-ME-04336,US,ME,04336,5.5,,,, +US-ME-04338,US,ME,04338,5.5,,,, +US-ME-04341,US,ME,04341,5.5,,,, +US-ME-04342,US,ME,04342,5.5,,,, +US-ME-04343,US,ME,04343,5.5,,,, +US-ME-04344,US,ME,04344,5.5,,,, +US-ME-04345,US,ME,04345,5.5,,,, +US-ME-04346,US,ME,04346,5.5,,,, +US-ME-04347,US,ME,04347,5.5,,,, +US-ME-04348,US,ME,04348,5.5,,,, +US-ME-04349,US,ME,04349,5.5,,,, +US-ME-04350,US,ME,04350,5.5,,,, +US-ME-04351,US,ME,04351,5.5,,,, +US-ME-04352,US,ME,04352,5.5,,,, +US-ME-04353,US,ME,04353,5.5,,,, +US-ME-04354,US,ME,04354,5.5,,,, +US-ME-04355,US,ME,04355,5.5,,,, +US-ME-04357,US,ME,04357,5.5,,,, +US-ME-04358,US,ME,04358,5.5,,,, +US-ME-04359,US,ME,04359,5.5,,,, +US-ME-04360,US,ME,04360,5.5,,,, +US-ME-04363,US,ME,04363,5.5,,,, +US-ME-04364,US,ME,04364,5.5,,,, +US-ME-04401,US,ME,04401,5.5,,,, +US-ME-04402,US,ME,04402,5.5,,,, +US-ME-04406,US,ME,04406,5.5,,,, +US-ME-04408,US,ME,04408,5.5,,,, +US-ME-04410,US,ME,04410,5.5,,,, +US-ME-04411,US,ME,04411,5.5,,,, +US-ME-04412,US,ME,04412,5.5,,,, +US-ME-04413,US,ME,04413,5.5,,,, +US-ME-04414,US,ME,04414,5.5,,,, +US-ME-04415,US,ME,04415,5.5,,,, +US-ME-04416,US,ME,04416,5.5,,,, +US-ME-04417,US,ME,04417,5.5,,,, +US-ME-04418,US,ME,04418,5.5,,,, +US-ME-04419,US,ME,04419,5.5,,,, +US-ME-04420,US,ME,04420,5.5,,,, +US-ME-04421,US,ME,04421,5.5,,,, +US-ME-04422,US,ME,04422,5.5,,,, +US-ME-04424,US,ME,04424,5.5,,,, +US-ME-04426,US,ME,04426,5.5,,,, +US-ME-04427,US,ME,04427,5.5,,,, +US-ME-04428,US,ME,04428,5.5,,,, +US-ME-04429,US,ME,04429,5.5,,,, +US-ME-04430,US,ME,04430,5.5,,,, +US-ME-04431,US,ME,04431,5.5,,,, +US-ME-04434,US,ME,04434,5.5,,,, +US-ME-04435,US,ME,04435,5.5,,,, +US-ME-04438,US,ME,04438,5.5,,,, +US-ME-04441,US,ME,04441,5.5,,,, +US-ME-04442,US,ME,04442,5.5,,,, +US-ME-04443,US,ME,04443,5.5,,,, +US-ME-04444,US,ME,04444,5.5,,,, +US-ME-04448,US,ME,04448,5.5,,,, +US-ME-04449,US,ME,04449,5.5,,,, +US-ME-04450,US,ME,04450,5.5,,,, +US-ME-04451,US,ME,04451,5.5,,,, +US-ME-04453,US,ME,04453,5.5,,,, +US-ME-04454,US,ME,04454,5.5,,,, +US-ME-04455,US,ME,04455,5.5,,,, +US-ME-04456,US,ME,04456,5.5,,,, +US-ME-04457,US,ME,04457,5.5,,,, +US-ME-04459,US,ME,04459,5.5,,,, +US-ME-04460,US,ME,04460,5.5,,,, +US-ME-04461,US,ME,04461,5.5,,,, +US-ME-04462,US,ME,04462,5.5,,,, +US-ME-04463,US,ME,04463,5.5,,,, +US-ME-04464,US,ME,04464,5.5,,,, +US-ME-04468,US,ME,04468,5.5,,,, +US-ME-04469,US,ME,04469,5.5,,,, +US-ME-04471,US,ME,04471,5.5,,,, +US-ME-04472,US,ME,04472,5.5,,,, +US-ME-04473,US,ME,04473,5.5,,,, +US-ME-04474,US,ME,04474,5.5,,,, +US-ME-04475,US,ME,04475,5.5,,,, +US-ME-04476,US,ME,04476,5.5,,,, +US-ME-04478,US,ME,04478,5.5,,,, +US-ME-04479,US,ME,04479,5.5,,,, +US-ME-04481,US,ME,04481,5.5,,,, +US-ME-04485,US,ME,04485,5.5,,,, +US-ME-04487,US,ME,04487,5.5,,,, +US-ME-04488,US,ME,04488,5.5,,,, +US-ME-04489,US,ME,04489,5.5,,,, +US-ME-04490,US,ME,04490,5.5,,,, +US-ME-04491,US,ME,04491,5.5,,,, +US-ME-04492,US,ME,04492,5.5,,,, +US-ME-04493,US,ME,04493,5.5,,,, +US-ME-04495,US,ME,04495,5.5,,,, +US-ME-04496,US,ME,04496,5.5,,,, +US-ME-04497,US,ME,04497,5.5,,,, +US-ME-04530,US,ME,04530,5.5,,,, +US-ME-04535,US,ME,04535,5.5,,,, +US-ME-04537,US,ME,04537,5.5,,,, +US-ME-04538,US,ME,04538,5.5,,,, +US-ME-04539,US,ME,04539,5.5,,,, +US-ME-04541,US,ME,04541,5.5,,,, +US-ME-04543,US,ME,04543,5.5,,,, +US-ME-04544,US,ME,04544,5.5,,,, +US-ME-04547,US,ME,04547,5.5,,,, +US-ME-04548,US,ME,04548,5.5,,,, +US-ME-04549,US,ME,04549,5.5,,,, +US-ME-04551,US,ME,04551,5.5,,,, +US-ME-04553,US,ME,04553,5.5,,,, +US-ME-04554,US,ME,04554,5.5,,,, +US-ME-04555,US,ME,04555,5.5,,,, +US-ME-04556,US,ME,04556,5.5,,,, +US-ME-04558,US,ME,04558,5.5,,,, +US-ME-04562,US,ME,04562,5.5,,,, +US-ME-04563,US,ME,04563,5.5,,,, +US-ME-04564,US,ME,04564,5.5,,,, +US-ME-04565,US,ME,04565,5.5,,,, +US-ME-04568,US,ME,04568,5.5,,,, +US-ME-04570,US,ME,04570,5.5,,,, +US-ME-04571,US,ME,04571,5.5,,,, +US-ME-04572,US,ME,04572,5.5,,,, +US-ME-04573,US,ME,04573,5.5,,,, +US-ME-04574,US,ME,04574,5.5,,,, +US-ME-04575,US,ME,04575,5.5,,,, +US-ME-04576,US,ME,04576,5.5,,,, +US-ME-04578,US,ME,04578,5.5,,,, +US-ME-04579,US,ME,04579,5.5,,,, +US-ME-04605,US,ME,04605,5.5,,,, +US-ME-04606,US,ME,04606,5.5,,,, +US-ME-04607,US,ME,04607,5.5,,,, +US-ME-04609,US,ME,04609,5.5,,,, +US-ME-04611,US,ME,04611,5.5,,,, +US-ME-04612,US,ME,04612,5.5,,,, +US-ME-04613,US,ME,04613,5.5,,,, +US-ME-04614,US,ME,04614,5.5,,,, +US-ME-04616,US,ME,04616,5.5,,,, +US-ME-04617,US,ME,04617,5.5,,,, +US-ME-04619,US,ME,04619,5.5,,,, +US-ME-04622,US,ME,04622,5.5,,,, +US-ME-04623,US,ME,04623,5.5,,,, +US-ME-04624,US,ME,04624,5.5,,,, +US-ME-04625,US,ME,04625,5.5,,,, +US-ME-04626,US,ME,04626,5.5,,,, +US-ME-04627,US,ME,04627,5.5,,,, +US-ME-04628,US,ME,04628,5.5,,,, +US-ME-04629,US,ME,04629,5.5,,,, +US-ME-04630,US,ME,04630,5.5,,,, +US-ME-04631,US,ME,04631,5.5,,,, +US-ME-04634,US,ME,04634,5.5,,,, +US-ME-04635,US,ME,04635,5.5,,,, +US-ME-04637,US,ME,04637,5.5,,,, +US-ME-04640,US,ME,04640,5.5,,,, +US-ME-04642,US,ME,04642,5.5,,,, +US-ME-04643,US,ME,04643,5.5,,,, +US-ME-04644,US,ME,04644,5.5,,,, +US-ME-04645,US,ME,04645,5.5,,,, +US-ME-04646,US,ME,04646,5.5,,,, +US-ME-04648,US,ME,04648,5.5,,,, +US-ME-04649,US,ME,04649,5.5,,,, +US-ME-04650,US,ME,04650,5.5,,,, +US-ME-04652,US,ME,04652,5.5,,,, +US-ME-04653,US,ME,04653,5.5,,,, +US-ME-04654,US,ME,04654,5.5,,,, +US-ME-04655,US,ME,04655,5.5,,,, +US-ME-04657,US,ME,04657,5.5,,,, +US-ME-04658,US,ME,04658,5.5,,,, +US-ME-04660,US,ME,04660,5.5,,,, +US-ME-04662,US,ME,04662,5.5,,,, +US-ME-04664,US,ME,04664,5.5,,,, +US-ME-04666,US,ME,04666,5.5,,,, +US-ME-04667,US,ME,04667,5.5,,,, +US-ME-04668,US,ME,04668,5.5,,,, +US-ME-04669,US,ME,04669,5.5,,,, +US-ME-04671,US,ME,04671,5.5,,,, +US-ME-04672,US,ME,04672,5.5,,,, +US-ME-04673,US,ME,04673,5.5,,,, +US-ME-04674,US,ME,04674,5.5,,,, +US-ME-04675,US,ME,04675,5.5,,,, +US-ME-04676,US,ME,04676,5.5,,,, +US-ME-04677,US,ME,04677,5.5,,,, +US-ME-04679,US,ME,04679,5.5,,,, +US-ME-04680,US,ME,04680,5.5,,,, +US-ME-04681,US,ME,04681,5.5,,,, +US-ME-04683,US,ME,04683,5.5,,,, +US-ME-04684,US,ME,04684,5.5,,,, +US-ME-04685,US,ME,04685,5.5,,,, +US-ME-04686,US,ME,04686,5.5,,,, +US-ME-04691,US,ME,04691,5.5,,,, +US-ME-04693,US,ME,04693,5.5,,,, +US-ME-04694,US,ME,04694,5.5,,,, +US-ME-04730,US,ME,04730,5.5,,,, +US-ME-04732,US,ME,04732,5.5,,,, +US-ME-04733,US,ME,04733,5.5,,,, +US-ME-04734,US,ME,04734,5.5,,,, +US-ME-04735,US,ME,04735,5.5,,,, +US-ME-04736,US,ME,04736,5.5,,,, +US-ME-04737,US,ME,04737,5.5,,,, +US-ME-04738,US,ME,04738,5.5,,,, +US-ME-04739,US,ME,04739,5.5,,,, +US-ME-04740,US,ME,04740,5.5,,,, +US-ME-04741,US,ME,04741,5.5,,,, +US-ME-04742,US,ME,04742,5.5,,,, +US-ME-04743,US,ME,04743,5.5,,,, +US-ME-04744,US,ME,04744,5.5,,,, +US-ME-04745,US,ME,04745,5.5,,,, +US-ME-04746,US,ME,04746,5.5,,,, +US-ME-04747,US,ME,04747,5.5,,,, +US-ME-04750,US,ME,04750,5.5,,,, +US-ME-04751,US,ME,04751,5.5,,,, +US-ME-04756,US,ME,04756,5.5,,,, +US-ME-04757,US,ME,04757,5.5,,,, +US-ME-04758,US,ME,04758,5.5,,,, +US-ME-04760,US,ME,04760,5.5,,,, +US-ME-04761,US,ME,04761,5.5,,,, +US-ME-04762,US,ME,04762,5.5,,,, +US-ME-04763,US,ME,04763,5.5,,,, +US-ME-04764,US,ME,04764,5.5,,,, +US-ME-04765,US,ME,04765,5.5,,,, +US-ME-04766,US,ME,04766,5.5,,,, +US-ME-04768,US,ME,04768,5.5,,,, +US-ME-04769,US,ME,04769,5.5,,,, +US-ME-04772,US,ME,04772,5.5,,,, +US-ME-04773,US,ME,04773,5.5,,,, +US-ME-04774,US,ME,04774,5.5,,,, +US-ME-04775,US,ME,04775,5.5,,,, +US-ME-04776,US,ME,04776,5.5,,,, +US-ME-04777,US,ME,04777,5.5,,,, +US-ME-04779,US,ME,04779,5.5,,,, +US-ME-04780,US,ME,04780,5.5,,,, +US-ME-04781,US,ME,04781,5.5,,,, +US-ME-04783,US,ME,04783,5.5,,,, +US-ME-04785,US,ME,04785,5.5,,,, +US-ME-04786,US,ME,04786,5.5,,,, +US-ME-04787,US,ME,04787,5.5,,,, +US-ME-04841,US,ME,04841,5.5,,,, +US-ME-04843,US,ME,04843,5.5,,,, +US-ME-04846,US,ME,04846,5.5,,,, +US-ME-04847,US,ME,04847,5.5,,,, +US-ME-04848,US,ME,04848,5.5,,,, +US-ME-04849,US,ME,04849,5.5,,,, +US-ME-04850,US,ME,04850,5.5,,,, +US-ME-04851,US,ME,04851,5.5,,,, +US-ME-04852,US,ME,04852,5.5,,,, +US-ME-04853,US,ME,04853,5.5,,,, +US-ME-04854,US,ME,04854,5.5,,,, +US-ME-04855,US,ME,04855,5.5,,,, +US-ME-04856,US,ME,04856,5.5,,,, +US-ME-04858,US,ME,04858,5.5,,,, +US-ME-04859,US,ME,04859,5.5,,,, +US-ME-04860,US,ME,04860,5.5,,,, +US-ME-04861,US,ME,04861,5.5,,,, +US-ME-04862,US,ME,04862,5.5,,,, +US-ME-04863,US,ME,04863,5.5,,,, +US-ME-04864,US,ME,04864,5.5,,,, +US-ME-04865,US,ME,04865,5.5,,,, +US-ME-04901,US,ME,04901,5.5,,,, +US-ME-04903,US,ME,04903,5.5,,,, +US-ME-04910,US,ME,04910,5.5,,,, +US-ME-04911,US,ME,04911,5.5,,,, +US-ME-04912,US,ME,04912,5.5,,,, +US-ME-04915,US,ME,04915,5.5,,,, +US-ME-04917,US,ME,04917,5.5,,,, +US-ME-04918,US,ME,04918,5.5,,,, +US-ME-04920,US,ME,04920,5.5,,,, +US-ME-04921,US,ME,04921,5.5,,,, +US-ME-04922,US,ME,04922,5.5,,,, +US-ME-04923,US,ME,04923,5.5,,,, +US-ME-04924,US,ME,04924,5.5,,,, +US-ME-04925,US,ME,04925,5.5,,,, +US-ME-04926,US,ME,04926,5.5,,,, +US-ME-04927,US,ME,04927,5.5,,,, +US-ME-04928,US,ME,04928,5.5,,,, +US-ME-04929,US,ME,04929,5.5,,,, +US-ME-04930,US,ME,04930,5.5,,,, +US-ME-04932,US,ME,04932,5.5,,,, +US-ME-04933,US,ME,04933,5.5,,,, +US-ME-04935,US,ME,04935,5.5,,,, +US-ME-04936,US,ME,04936,5.5,,,, +US-ME-04937,US,ME,04937,5.5,,,, +US-ME-04938,US,ME,04938,5.5,,,, +US-ME-04939,US,ME,04939,5.5,,,, +US-ME-04940,US,ME,04940,5.5,,,, +US-ME-04941,US,ME,04941,5.5,,,, +US-ME-04942,US,ME,04942,5.5,,,, +US-ME-04943,US,ME,04943,5.5,,,, +US-ME-04944,US,ME,04944,5.5,,,, +US-ME-04945,US,ME,04945,5.5,,,, +US-ME-04947,US,ME,04947,5.5,,,, +US-ME-04949,US,ME,04949,5.5,,,, +US-ME-04950,US,ME,04950,5.5,,,, +US-ME-04951,US,ME,04951,5.5,,,, +US-ME-04952,US,ME,04952,5.5,,,, +US-ME-04953,US,ME,04953,5.5,,,, +US-ME-04954,US,ME,04954,5.5,,,, +US-ME-04955,US,ME,04955,5.5,,,, +US-ME-04956,US,ME,04956,5.5,,,, +US-ME-04957,US,ME,04957,5.5,,,, +US-ME-04958,US,ME,04958,5.5,,,, +US-ME-04961,US,ME,04961,5.5,,,, +US-ME-04962,US,ME,04962,5.5,,,, +US-ME-04963,US,ME,04963,5.5,,,, +US-ME-04964,US,ME,04964,5.5,,,, +US-ME-04965,US,ME,04965,5.5,,,, +US-ME-04966,US,ME,04966,5.5,,,, +US-ME-04967,US,ME,04967,5.5,,,, +US-ME-04969,US,ME,04969,5.5,,,, +US-ME-04970,US,ME,04970,5.5,,,, +US-ME-04971,US,ME,04971,5.5,,,, +US-ME-04972,US,ME,04972,5.5,,,, +US-ME-04973,US,ME,04973,5.5,,,, +US-ME-04974,US,ME,04974,5.5,,,, +US-ME-04975,US,ME,04975,5.5,,,, +US-ME-04976,US,ME,04976,5.5,,,, +US-ME-04978,US,ME,04978,5.5,,,, +US-ME-04979,US,ME,04979,5.5,,,, +US-ME-04981,US,ME,04981,5.5,,,, +US-ME-04982,US,ME,04982,5.5,,,, +US-ME-04983,US,ME,04983,5.5,,,, +US-ME-04984,US,ME,04984,5.5,,,, +US-ME-04985,US,ME,04985,5.5,,,, +US-ME-04986,US,ME,04986,5.5,,,, +US-ME-04987,US,ME,04987,5.5,,,, +US-ME-04988,US,ME,04988,5.5,,,, +US-ME-04989,US,ME,04989,5.5,,,, +US-ME-04992,US,ME,04992,5.5,,,, +US-MI-48001,US,MI,48001,6,,,, +US-MI-48002,US,MI,48002,6,,,, +US-MI-48003,US,MI,48003,6,,,, +US-MI-48004,US,MI,48004,6,,,, +US-MI-48005,US,MI,48005,6,,,, +US-MI-48006,US,MI,48006,6,,,, +US-MI-48007,US,MI,48007,6,,,, +US-MI-48009,US,MI,48009,6,,,, +US-MI-48012,US,MI,48012,6,,,, +US-MI-48014,US,MI,48014,6,,,, +US-MI-48015,US,MI,48015,6,,,, +US-MI-48017,US,MI,48017,6,,,, +US-MI-48021,US,MI,48021,6,,,, +US-MI-48022,US,MI,48022,6,,,, +US-MI-48023,US,MI,48023,6,,,, +US-MI-48025,US,MI,48025,6,,,, +US-MI-48026,US,MI,48026,6,,,, +US-MI-48027,US,MI,48027,6,,,, +US-MI-48028,US,MI,48028,6,,,, +US-MI-48030,US,MI,48030,6,,,, +US-MI-48032,US,MI,48032,6,,,, +US-MI-48033,US,MI,48033,6,,,, +US-MI-48034,US,MI,48034,6,,,, +US-MI-48035,US,MI,48035,6,,,, +US-MI-48036,US,MI,48036,6,,,, +US-MI-48037,US,MI,48037,6,,,, +US-MI-48038,US,MI,48038,6,,,, +US-MI-48039,US,MI,48039,6,,,, +US-MI-48040,US,MI,48040,6,,,, +US-MI-48041,US,MI,48041,6,,,, +US-MI-48042,US,MI,48042,6,,,, +US-MI-48043,US,MI,48043,6,,,, +US-MI-48044,US,MI,48044,6,,,, +US-MI-48045,US,MI,48045,6,,,, +US-MI-48046,US,MI,48046,6,,,, +US-MI-48047,US,MI,48047,6,,,, +US-MI-48048,US,MI,48048,6,,,, +US-MI-48049,US,MI,48049,6,,,, +US-MI-48050,US,MI,48050,6,,,, +US-MI-48051,US,MI,48051,6,,,, +US-MI-48054,US,MI,48054,6,,,, +US-MI-48059,US,MI,48059,6,,,, +US-MI-48060,US,MI,48060,6,,,, +US-MI-48061,US,MI,48061,6,,,, +US-MI-48062,US,MI,48062,6,,,, +US-MI-48063,US,MI,48063,6,,,, +US-MI-48064,US,MI,48064,6,,,, +US-MI-48065,US,MI,48065,6,,,, +US-MI-48066,US,MI,48066,6,,,, +US-MI-48067,US,MI,48067,6,,,, +US-MI-48068,US,MI,48068,6,,,, +US-MI-48069,US,MI,48069,6,,,, +US-MI-48070,US,MI,48070,6,,,, +US-MI-48071,US,MI,48071,6,,,, +US-MI-48072,US,MI,48072,6,,,, +US-MI-48073,US,MI,48073,6,,,, +US-MI-48074,US,MI,48074,6,,,, +US-MI-48075,US,MI,48075,6,,,, +US-MI-48076,US,MI,48076,6,,,, +US-MI-48079,US,MI,48079,6,,,, +US-MI-48080,US,MI,48080,6,,,, +US-MI-48081,US,MI,48081,6,,,, +US-MI-48082,US,MI,48082,6,,,, +US-MI-48083,US,MI,48083,6,,,, +US-MI-48084,US,MI,48084,6,,,, +US-MI-48085,US,MI,48085,6,,,, +US-MI-48086,US,MI,48086,6,,,, +US-MI-48088,US,MI,48088,6,,,, +US-MI-48089,US,MI,48089,6,,,, +US-MI-48090,US,MI,48090,6,,,, +US-MI-48091,US,MI,48091,6,,,, +US-MI-48092,US,MI,48092,6,,,, +US-MI-48093,US,MI,48093,6,,,, +US-MI-48094,US,MI,48094,6,,,, +US-MI-48095,US,MI,48095,6,,,, +US-MI-48096,US,MI,48096,6,,,, +US-MI-48097,US,MI,48097,6,,,, +US-MI-48098,US,MI,48098,6,,,, +US-MI-48099,US,MI,48099,6,,,, +US-MI-48101,US,MI,48101,6,,,, +US-MI-48103,US,MI,48103,6,,,, +US-MI-48104,US,MI,48104,6,,,, +US-MI-48105,US,MI,48105,6,,,, +US-MI-48106,US,MI,48106,6,,,, +US-MI-48107,US,MI,48107,6,,,, +US-MI-48108,US,MI,48108,6,,,, +US-MI-48109,US,MI,48109,6,,,, +US-MI-48110,US,MI,48110,6,,,, +US-MI-48111,US,MI,48111,6,,,, +US-MI-48112,US,MI,48112,6,,,, +US-MI-48113,US,MI,48113,6,,,, +US-MI-48114,US,MI,48114,6,,,, +US-MI-48115,US,MI,48115,6,,,, +US-MI-48116,US,MI,48116,6,,,, +US-MI-48117,US,MI,48117,6,,,, +US-MI-48118,US,MI,48118,6,,,, +US-MI-48120,US,MI,48120,6,,,, +US-MI-48121,US,MI,48121,6,,,, +US-MI-48122,US,MI,48122,6,,,, +US-MI-48123,US,MI,48123,6,,,, +US-MI-48124,US,MI,48124,6,,,, +US-MI-48125,US,MI,48125,6,,,, +US-MI-48126,US,MI,48126,6,,,, +US-MI-48127,US,MI,48127,6,,,, +US-MI-48128,US,MI,48128,6,,,, +US-MI-48130,US,MI,48130,6,,,, +US-MI-48131,US,MI,48131,6,,,, +US-MI-48133,US,MI,48133,6,,,, +US-MI-48134,US,MI,48134,6,,,, +US-MI-48135,US,MI,48135,6,,,, +US-MI-48136,US,MI,48136,6,,,, +US-MI-48137,US,MI,48137,6,,,, +US-MI-48138,US,MI,48138,6,,,, +US-MI-48139,US,MI,48139,6,,,, +US-MI-48140,US,MI,48140,6,,,, +US-MI-48141,US,MI,48141,6,,,, +US-MI-48143,US,MI,48143,6,,,, +US-MI-48144,US,MI,48144,6,,,, +US-MI-48145,US,MI,48145,6,,,, +US-MI-48146,US,MI,48146,6,,,, +US-MI-48150,US,MI,48150,6,,,, +US-MI-48151,US,MI,48151,6,,,, +US-MI-48152,US,MI,48152,6,,,, +US-MI-48153,US,MI,48153,6,,,, +US-MI-48154,US,MI,48154,6,,,, +US-MI-48157,US,MI,48157,6,,,, +US-MI-48158,US,MI,48158,6,,,, +US-MI-48159,US,MI,48159,6,,,, +US-MI-48160,US,MI,48160,6,,,, +US-MI-48161,US,MI,48161,6,,,, +US-MI-48162,US,MI,48162,6,,,, +US-MI-48164,US,MI,48164,6,,,, +US-MI-48165,US,MI,48165,6,,,, +US-MI-48166,US,MI,48166,6,,,, +US-MI-48167,US,MI,48167,6,,,, +US-MI-48168,US,MI,48168,6,,,, +US-MI-48169,US,MI,48169,6,,,, +US-MI-48170,US,MI,48170,6,,,, +US-MI-48173,US,MI,48173,6,,,, +US-MI-48174,US,MI,48174,6,,,, +US-MI-48175,US,MI,48175,6,,,, +US-MI-48176,US,MI,48176,6,,,, +US-MI-48177,US,MI,48177,6,,,, +US-MI-48178,US,MI,48178,6,,,, +US-MI-48179,US,MI,48179,6,,,, +US-MI-48180,US,MI,48180,6,,,, +US-MI-48182,US,MI,48182,6,,,, +US-MI-48183,US,MI,48183,6,,,, +US-MI-48184,US,MI,48184,6,,,, +US-MI-48185,US,MI,48185,6,,,, +US-MI-48186,US,MI,48186,6,,,, +US-MI-48187,US,MI,48187,6,,,, +US-MI-48188,US,MI,48188,6,,,, +US-MI-48189,US,MI,48189,6,,,, +US-MI-48190,US,MI,48190,6,,,, +US-MI-48191,US,MI,48191,6,,,, +US-MI-48192,US,MI,48192,6,,,, +US-MI-48193,US,MI,48193,6,,,, +US-MI-48195,US,MI,48195,6,,,, +US-MI-48197,US,MI,48197,6,,,, +US-MI-48198,US,MI,48198,6,,,, +US-MI-48201,US,MI,48201,6,,,, +US-MI-48202,US,MI,48202,6,,,, +US-MI-48203,US,MI,48203,6,,,, +US-MI-48204,US,MI,48204,6,,,, +US-MI-48205,US,MI,48205,6,,,, +US-MI-48206,US,MI,48206,6,,,, +US-MI-48207,US,MI,48207,6,,,, +US-MI-48208,US,MI,48208,6,,,, +US-MI-48209,US,MI,48209,6,,,, +US-MI-48210,US,MI,48210,6,,,, +US-MI-48211,US,MI,48211,6,,,, +US-MI-48212,US,MI,48212,6,,,, +US-MI-48213,US,MI,48213,6,,,, +US-MI-48214,US,MI,48214,6,,,, +US-MI-48215,US,MI,48215,6,,,, +US-MI-48216,US,MI,48216,6,,,, +US-MI-48217,US,MI,48217,6,,,, +US-MI-48218,US,MI,48218,6,,,, +US-MI-48219,US,MI,48219,6,,,, +US-MI-48220,US,MI,48220,6,,,, +US-MI-48221,US,MI,48221,6,,,, +US-MI-48222,US,MI,48222,6,,,, +US-MI-48223,US,MI,48223,6,,,, +US-MI-48224,US,MI,48224,6,,,, +US-MI-48225,US,MI,48225,6,,,, +US-MI-48226,US,MI,48226,6,,,, +US-MI-48227,US,MI,48227,6,,,, +US-MI-48228,US,MI,48228,6,,,, +US-MI-48229,US,MI,48229,6,,,, +US-MI-48230,US,MI,48230,6,,,, +US-MI-48231,US,MI,48231,6,,,, +US-MI-48232,US,MI,48232,6,,,, +US-MI-48233,US,MI,48233,6,,,, +US-MI-48234,US,MI,48234,6,,,, +US-MI-48235,US,MI,48235,6,,,, +US-MI-48236,US,MI,48236,6,,,, +US-MI-48237,US,MI,48237,6,,,, +US-MI-48238,US,MI,48238,6,,,, +US-MI-48239,US,MI,48239,6,,,, +US-MI-48240,US,MI,48240,6,,,, +US-MI-48242,US,MI,48242,6,,,, +US-MI-48243,US,MI,48243,6,,,, +US-MI-48244,US,MI,48244,6,,,, +US-MI-48255,US,MI,48255,6,,,, +US-MI-48260,US,MI,48260,6,,,, +US-MI-48264,US,MI,48264,6,,,, +US-MI-48265,US,MI,48265,6,,,, +US-MI-48266,US,MI,48266,6,,,, +US-MI-48267,US,MI,48267,6,,,, +US-MI-48268,US,MI,48268,6,,,, +US-MI-48269,US,MI,48269,6,,,, +US-MI-48272,US,MI,48272,6,,,, +US-MI-48275,US,MI,48275,6,,,, +US-MI-48277,US,MI,48277,6,,,, +US-MI-48278,US,MI,48278,6,,,, +US-MI-48279,US,MI,48279,6,,,, +US-MI-48288,US,MI,48288,6,,,, +US-MI-48301,US,MI,48301,6,,,, +US-MI-48302,US,MI,48302,6,,,, +US-MI-48303,US,MI,48303,6,,,, +US-MI-48304,US,MI,48304,6,,,, +US-MI-48306,US,MI,48306,6,,,, +US-MI-48307,US,MI,48307,6,,,, +US-MI-48308,US,MI,48308,6,,,, +US-MI-48309,US,MI,48309,6,,,, +US-MI-48310,US,MI,48310,6,,,, +US-MI-48311,US,MI,48311,6,,,, +US-MI-48312,US,MI,48312,6,,,, +US-MI-48313,US,MI,48313,6,,,, +US-MI-48314,US,MI,48314,6,,,, +US-MI-48315,US,MI,48315,6,,,, +US-MI-48316,US,MI,48316,6,,,, +US-MI-48317,US,MI,48317,6,,,, +US-MI-48318,US,MI,48318,6,,,, +US-MI-48320,US,MI,48320,6,,,, +US-MI-48321,US,MI,48321,6,,,, +US-MI-48322,US,MI,48322,6,,,, +US-MI-48323,US,MI,48323,6,,,, +US-MI-48324,US,MI,48324,6,,,, +US-MI-48325,US,MI,48325,6,,,, +US-MI-48326,US,MI,48326,6,,,, +US-MI-48327,US,MI,48327,6,,,, +US-MI-48328,US,MI,48328,6,,,, +US-MI-48329,US,MI,48329,6,,,, +US-MI-48330,US,MI,48330,6,,,, +US-MI-48331,US,MI,48331,6,,,, +US-MI-48332,US,MI,48332,6,,,, +US-MI-48333,US,MI,48333,6,,,, +US-MI-48334,US,MI,48334,6,,,, +US-MI-48335,US,MI,48335,6,,,, +US-MI-48336,US,MI,48336,6,,,, +US-MI-48340,US,MI,48340,6,,,, +US-MI-48341,US,MI,48341,6,,,, +US-MI-48342,US,MI,48342,6,,,, +US-MI-48343,US,MI,48343,6,,,, +US-MI-48346,US,MI,48346,6,,,, +US-MI-48347,US,MI,48347,6,,,, +US-MI-48348,US,MI,48348,6,,,, +US-MI-48350,US,MI,48350,6,,,, +US-MI-48353,US,MI,48353,6,,,, +US-MI-48356,US,MI,48356,6,,,, +US-MI-48357,US,MI,48357,6,,,, +US-MI-48359,US,MI,48359,6,,,, +US-MI-48360,US,MI,48360,6,,,, +US-MI-48361,US,MI,48361,6,,,, +US-MI-48362,US,MI,48362,6,,,, +US-MI-48363,US,MI,48363,6,,,, +US-MI-48366,US,MI,48366,6,,,, +US-MI-48367,US,MI,48367,6,,,, +US-MI-48370,US,MI,48370,6,,,, +US-MI-48371,US,MI,48371,6,,,, +US-MI-48374,US,MI,48374,6,,,, +US-MI-48375,US,MI,48375,6,,,, +US-MI-48376,US,MI,48376,6,,,, +US-MI-48377,US,MI,48377,6,,,, +US-MI-48380,US,MI,48380,6,,,, +US-MI-48381,US,MI,48381,6,,,, +US-MI-48382,US,MI,48382,6,,,, +US-MI-48383,US,MI,48383,6,,,, +US-MI-48386,US,MI,48386,6,,,, +US-MI-48387,US,MI,48387,6,,,, +US-MI-48390,US,MI,48390,6,,,, +US-MI-48391,US,MI,48391,6,,,, +US-MI-48393,US,MI,48393,6,,,, +US-MI-48397,US,MI,48397,6,,,, +US-MI-48401,US,MI,48401,6,,,, +US-MI-48410,US,MI,48410,6,,,, +US-MI-48411,US,MI,48411,6,,,, +US-MI-48412,US,MI,48412,6,,,, +US-MI-48413,US,MI,48413,6,,,, +US-MI-48414,US,MI,48414,6,,,, +US-MI-48415,US,MI,48415,6,,,, +US-MI-48416,US,MI,48416,6,,,, +US-MI-48417,US,MI,48417,6,,,, +US-MI-48418,US,MI,48418,6,,,, +US-MI-48419,US,MI,48419,6,,,, +US-MI-48420,US,MI,48420,6,,,, +US-MI-48421,US,MI,48421,6,,,, +US-MI-48422,US,MI,48422,6,,,, +US-MI-48423,US,MI,48423,6,,,, +US-MI-48426,US,MI,48426,6,,,, +US-MI-48427,US,MI,48427,6,,,, +US-MI-48428,US,MI,48428,6,,,, +US-MI-48429,US,MI,48429,6,,,, +US-MI-48430,US,MI,48430,6,,,, +US-MI-48432,US,MI,48432,6,,,, +US-MI-48433,US,MI,48433,6,,,, +US-MI-48434,US,MI,48434,6,,,, +US-MI-48435,US,MI,48435,6,,,, +US-MI-48436,US,MI,48436,6,,,, +US-MI-48437,US,MI,48437,6,,,, +US-MI-48438,US,MI,48438,6,,,, +US-MI-48439,US,MI,48439,6,,,, +US-MI-48440,US,MI,48440,6,,,, +US-MI-48441,US,MI,48441,6,,,, +US-MI-48442,US,MI,48442,6,,,, +US-MI-48444,US,MI,48444,6,,,, +US-MI-48445,US,MI,48445,6,,,, +US-MI-48446,US,MI,48446,6,,,, +US-MI-48449,US,MI,48449,6,,,, +US-MI-48450,US,MI,48450,6,,,, +US-MI-48451,US,MI,48451,6,,,, +US-MI-48453,US,MI,48453,6,,,, +US-MI-48454,US,MI,48454,6,,,, +US-MI-48455,US,MI,48455,6,,,, +US-MI-48456,US,MI,48456,6,,,, +US-MI-48457,US,MI,48457,6,,,, +US-MI-48458,US,MI,48458,6,,,, +US-MI-48460,US,MI,48460,6,,,, +US-MI-48461,US,MI,48461,6,,,, +US-MI-48462,US,MI,48462,6,,,, +US-MI-48463,US,MI,48463,6,,,, +US-MI-48464,US,MI,48464,6,,,, +US-MI-48465,US,MI,48465,6,,,, +US-MI-48466,US,MI,48466,6,,,, +US-MI-48467,US,MI,48467,6,,,, +US-MI-48468,US,MI,48468,6,,,, +US-MI-48469,US,MI,48469,6,,,, +US-MI-48470,US,MI,48470,6,,,, +US-MI-48471,US,MI,48471,6,,,, +US-MI-48472,US,MI,48472,6,,,, +US-MI-48473,US,MI,48473,6,,,, +US-MI-48475,US,MI,48475,6,,,, +US-MI-48476,US,MI,48476,6,,,, +US-MI-48480,US,MI,48480,6,,,, +US-MI-48501,US,MI,48501,6,,,, +US-MI-48502,US,MI,48502,6,,,, +US-MI-48503,US,MI,48503,6,,,, +US-MI-48504,US,MI,48504,6,,,, +US-MI-48505,US,MI,48505,6,,,, +US-MI-48506,US,MI,48506,6,,,, +US-MI-48507,US,MI,48507,6,,,, +US-MI-48509,US,MI,48509,6,,,, +US-MI-48519,US,MI,48519,6,,,, +US-MI-48529,US,MI,48529,6,,,, +US-MI-48531,US,MI,48531,6,,,, +US-MI-48532,US,MI,48532,6,,,, +US-MI-48550,US,MI,48550,6,,,, +US-MI-48551,US,MI,48551,6,,,, +US-MI-48552,US,MI,48552,6,,,, +US-MI-48553,US,MI,48553,6,,,, +US-MI-48554,US,MI,48554,6,,,, +US-MI-48555,US,MI,48555,6,,,, +US-MI-48556,US,MI,48556,6,,,, +US-MI-48557,US,MI,48557,6,,,, +US-MI-48601,US,MI,48601,6,,,, +US-MI-48602,US,MI,48602,6,,,, +US-MI-48603,US,MI,48603,6,,,, +US-MI-48604,US,MI,48604,6,,,, +US-MI-48605,US,MI,48605,6,,,, +US-MI-48606,US,MI,48606,6,,,, +US-MI-48607,US,MI,48607,6,,,, +US-MI-48608,US,MI,48608,6,,,, +US-MI-48609,US,MI,48609,6,,,, +US-MI-48610,US,MI,48610,6,,,, +US-MI-48611,US,MI,48611,6,,,, +US-MI-48612,US,MI,48612,6,,,, +US-MI-48613,US,MI,48613,6,,,, +US-MI-48614,US,MI,48614,6,,,, +US-MI-48615,US,MI,48615,6,,,, +US-MI-48616,US,MI,48616,6,,,, +US-MI-48617,US,MI,48617,6,,,, +US-MI-48618,US,MI,48618,6,,,, +US-MI-48619,US,MI,48619,6,,,, +US-MI-48620,US,MI,48620,6,,,, +US-MI-48621,US,MI,48621,6,,,, +US-MI-48622,US,MI,48622,6,,,, +US-MI-48623,US,MI,48623,6,,,, +US-MI-48624,US,MI,48624,6,,,, +US-MI-48625,US,MI,48625,6,,,, +US-MI-48626,US,MI,48626,6,,,, +US-MI-48627,US,MI,48627,6,,,, +US-MI-48628,US,MI,48628,6,,,, +US-MI-48629,US,MI,48629,6,,,, +US-MI-48630,US,MI,48630,6,,,, +US-MI-48631,US,MI,48631,6,,,, +US-MI-48632,US,MI,48632,6,,,, +US-MI-48633,US,MI,48633,6,,,, +US-MI-48634,US,MI,48634,6,,,, +US-MI-48635,US,MI,48635,6,,,, +US-MI-48636,US,MI,48636,6,,,, +US-MI-48637,US,MI,48637,6,,,, +US-MI-48638,US,MI,48638,6,,,, +US-MI-48640,US,MI,48640,6,,,, +US-MI-48641,US,MI,48641,6,,,, +US-MI-48642,US,MI,48642,6,,,, +US-MI-48647,US,MI,48647,6,,,, +US-MI-48649,US,MI,48649,6,,,, +US-MI-48650,US,MI,48650,6,,,, +US-MI-48651,US,MI,48651,6,,,, +US-MI-48652,US,MI,48652,6,,,, +US-MI-48653,US,MI,48653,6,,,, +US-MI-48654,US,MI,48654,6,,,, +US-MI-48655,US,MI,48655,6,,,, +US-MI-48656,US,MI,48656,6,,,, +US-MI-48657,US,MI,48657,6,,,, +US-MI-48658,US,MI,48658,6,,,, +US-MI-48659,US,MI,48659,6,,,, +US-MI-48661,US,MI,48661,6,,,, +US-MI-48662,US,MI,48662,6,,,, +US-MI-48663,US,MI,48663,6,,,, +US-MI-48667,US,MI,48667,6,,,, +US-MI-48670,US,MI,48670,6,,,, +US-MI-48674,US,MI,48674,6,,,, +US-MI-48686,US,MI,48686,6,,,, +US-MI-48701,US,MI,48701,6,,,, +US-MI-48703,US,MI,48703,6,,,, +US-MI-48705,US,MI,48705,6,,,, +US-MI-48706,US,MI,48706,6,,,, +US-MI-48707,US,MI,48707,6,,,, +US-MI-48708,US,MI,48708,6,,,, +US-MI-48710,US,MI,48710,6,,,, +US-MI-48720,US,MI,48720,6,,,, +US-MI-48721,US,MI,48721,6,,,, +US-MI-48722,US,MI,48722,6,,,, +US-MI-48723,US,MI,48723,6,,,, +US-MI-48724,US,MI,48724,6,,,, +US-MI-48725,US,MI,48725,6,,,, +US-MI-48726,US,MI,48726,6,,,, +US-MI-48727,US,MI,48727,6,,,, +US-MI-48728,US,MI,48728,6,,,, +US-MI-48729,US,MI,48729,6,,,, +US-MI-48730,US,MI,48730,6,,,, +US-MI-48731,US,MI,48731,6,,,, +US-MI-48732,US,MI,48732,6,,,, +US-MI-48733,US,MI,48733,6,,,, +US-MI-48734,US,MI,48734,6,,,, +US-MI-48735,US,MI,48735,6,,,, +US-MI-48737,US,MI,48737,6,,,, +US-MI-48738,US,MI,48738,6,,,, +US-MI-48739,US,MI,48739,6,,,, +US-MI-48740,US,MI,48740,6,,,, +US-MI-48741,US,MI,48741,6,,,, +US-MI-48742,US,MI,48742,6,,,, +US-MI-48743,US,MI,48743,6,,,, +US-MI-48744,US,MI,48744,6,,,, +US-MI-48745,US,MI,48745,6,,,, +US-MI-48746,US,MI,48746,6,,,, +US-MI-48747,US,MI,48747,6,,,, +US-MI-48748,US,MI,48748,6,,,, +US-MI-48749,US,MI,48749,6,,,, +US-MI-48750,US,MI,48750,6,,,, +US-MI-48754,US,MI,48754,6,,,, +US-MI-48755,US,MI,48755,6,,,, +US-MI-48756,US,MI,48756,6,,,, +US-MI-48757,US,MI,48757,6,,,, +US-MI-48758,US,MI,48758,6,,,, +US-MI-48759,US,MI,48759,6,,,, +US-MI-48760,US,MI,48760,6,,,, +US-MI-48761,US,MI,48761,6,,,, +US-MI-48762,US,MI,48762,6,,,, +US-MI-48763,US,MI,48763,6,,,, +US-MI-48764,US,MI,48764,6,,,, +US-MI-48765,US,MI,48765,6,,,, +US-MI-48766,US,MI,48766,6,,,, +US-MI-48767,US,MI,48767,6,,,, +US-MI-48768,US,MI,48768,6,,,, +US-MI-48770,US,MI,48770,6,,,, +US-MI-48787,US,MI,48787,6,,,, +US-MI-48801,US,MI,48801,6,,,, +US-MI-48804,US,MI,48804,6,,,, +US-MI-48805,US,MI,48805,6,,,, +US-MI-48806,US,MI,48806,6,,,, +US-MI-48807,US,MI,48807,6,,,, +US-MI-48808,US,MI,48808,6,,,, +US-MI-48809,US,MI,48809,6,,,, +US-MI-48811,US,MI,48811,6,,,, +US-MI-48812,US,MI,48812,6,,,, +US-MI-48813,US,MI,48813,6,,,, +US-MI-48815,US,MI,48815,6,,,, +US-MI-48816,US,MI,48816,6,,,, +US-MI-48817,US,MI,48817,6,,,, +US-MI-48818,US,MI,48818,6,,,, +US-MI-48819,US,MI,48819,6,,,, +US-MI-48820,US,MI,48820,6,,,, +US-MI-48821,US,MI,48821,6,,,, +US-MI-48822,US,MI,48822,6,,,, +US-MI-48823,US,MI,48823,6,,,, +US-MI-48824,US,MI,48824,6,,,, +US-MI-48825,US,MI,48825,6,,,, +US-MI-48826,US,MI,48826,6,,,, +US-MI-48827,US,MI,48827,6,,,, +US-MI-48829,US,MI,48829,6,,,, +US-MI-48830,US,MI,48830,6,,,, +US-MI-48831,US,MI,48831,6,,,, +US-MI-48832,US,MI,48832,6,,,, +US-MI-48833,US,MI,48833,6,,,, +US-MI-48834,US,MI,48834,6,,,, +US-MI-48835,US,MI,48835,6,,,, +US-MI-48836,US,MI,48836,6,,,, +US-MI-48837,US,MI,48837,6,,,, +US-MI-48838,US,MI,48838,6,,,, +US-MI-48840,US,MI,48840,6,,,, +US-MI-48841,US,MI,48841,6,,,, +US-MI-48842,US,MI,48842,6,,,, +US-MI-48843,US,MI,48843,6,,,, +US-MI-48844,US,MI,48844,6,,,, +US-MI-48845,US,MI,48845,6,,,, +US-MI-48846,US,MI,48846,6,,,, +US-MI-48847,US,MI,48847,6,,,, +US-MI-48848,US,MI,48848,6,,,, +US-MI-48849,US,MI,48849,6,,,, +US-MI-48850,US,MI,48850,6,,,, +US-MI-48851,US,MI,48851,6,,,, +US-MI-48852,US,MI,48852,6,,,, +US-MI-48853,US,MI,48853,6,,,, +US-MI-48854,US,MI,48854,6,,,, +US-MI-48855,US,MI,48855,6,,,, +US-MI-48856,US,MI,48856,6,,,, +US-MI-48857,US,MI,48857,6,,,, +US-MI-48858,US,MI,48858,6,,,, +US-MI-48859,US,MI,48859,6,,,, +US-MI-48860,US,MI,48860,6,,,, +US-MI-48861,US,MI,48861,6,,,, +US-MI-48862,US,MI,48862,6,,,, +US-MI-48864,US,MI,48864,6,,,, +US-MI-48865,US,MI,48865,6,,,, +US-MI-48866,US,MI,48866,6,,,, +US-MI-48867,US,MI,48867,6,,,, +US-MI-48870,US,MI,48870,6,,,, +US-MI-48871,US,MI,48871,6,,,, +US-MI-48872,US,MI,48872,6,,,, +US-MI-48873,US,MI,48873,6,,,, +US-MI-48874,US,MI,48874,6,,,, +US-MI-48875,US,MI,48875,6,,,, +US-MI-48876,US,MI,48876,6,,,, +US-MI-48877,US,MI,48877,6,,,, +US-MI-48878,US,MI,48878,6,,,, +US-MI-48879,US,MI,48879,6,,,, +US-MI-48880,US,MI,48880,6,,,, +US-MI-48881,US,MI,48881,6,,,, +US-MI-48882,US,MI,48882,6,,,, +US-MI-48883,US,MI,48883,6,,,, +US-MI-48884,US,MI,48884,6,,,, +US-MI-48885,US,MI,48885,6,,,, +US-MI-48886,US,MI,48886,6,,,, +US-MI-48887,US,MI,48887,6,,,, +US-MI-48888,US,MI,48888,6,,,, +US-MI-48889,US,MI,48889,6,,,, +US-MI-48890,US,MI,48890,6,,,, +US-MI-48891,US,MI,48891,6,,,, +US-MI-48892,US,MI,48892,6,,,, +US-MI-48893,US,MI,48893,6,,,, +US-MI-48894,US,MI,48894,6,,,, +US-MI-48895,US,MI,48895,6,,,, +US-MI-48896,US,MI,48896,6,,,, +US-MI-48897,US,MI,48897,6,,,, +US-MI-48901,US,MI,48901,6,,,, +US-MI-48906,US,MI,48906,6,,,, +US-MI-48908,US,MI,48908,6,,,, +US-MI-48909,US,MI,48909,6,,,, +US-MI-48910,US,MI,48910,6,,,, +US-MI-48911,US,MI,48911,6,,,, +US-MI-48912,US,MI,48912,6,,,, +US-MI-48913,US,MI,48913,6,,,, +US-MI-48915,US,MI,48915,6,,,, +US-MI-48916,US,MI,48916,6,,,, +US-MI-48917,US,MI,48917,6,,,, +US-MI-48918,US,MI,48918,6,,,, +US-MI-48919,US,MI,48919,6,,,, +US-MI-48922,US,MI,48922,6,,,, +US-MI-48924,US,MI,48924,6,,,, +US-MI-48929,US,MI,48929,6,,,, +US-MI-48930,US,MI,48930,6,,,, +US-MI-48933,US,MI,48933,6,,,, +US-MI-48937,US,MI,48937,6,,,, +US-MI-48951,US,MI,48951,6,,,, +US-MI-48956,US,MI,48956,6,,,, +US-MI-48980,US,MI,48980,6,,,, +US-MI-49001,US,MI,49001,6,,,, +US-MI-49002,US,MI,49002,6,,,, +US-MI-49003,US,MI,49003,6,,,, +US-MI-49004,US,MI,49004,6,,,, +US-MI-49005,US,MI,49005,6,,,, +US-MI-49006,US,MI,49006,6,,,, +US-MI-49007,US,MI,49007,6,,,, +US-MI-49008,US,MI,49008,6,,,, +US-MI-49009,US,MI,49009,6,,,, +US-MI-49010,US,MI,49010,6,,,, +US-MI-49011,US,MI,49011,6,,,, +US-MI-49012,US,MI,49012,6,,,, +US-MI-49013,US,MI,49013,6,,,, +US-MI-49014,US,MI,49014,6,,,, +US-MI-49015,US,MI,49015,6,,,, +US-MI-49016,US,MI,49016,6,,,, +US-MI-49017,US,MI,49017,6,,,, +US-MI-49018,US,MI,49018,6,,,, +US-MI-49019,US,MI,49019,6,,,, +US-MI-49020,US,MI,49020,6,,,, +US-MI-49021,US,MI,49021,6,,,, +US-MI-49022,US,MI,49022,6,,,, +US-MI-49023,US,MI,49023,6,,,, +US-MI-49024,US,MI,49024,6,,,, +US-MI-49026,US,MI,49026,6,,,, +US-MI-49027,US,MI,49027,6,,,, +US-MI-49028,US,MI,49028,6,,,, +US-MI-49029,US,MI,49029,6,,,, +US-MI-49030,US,MI,49030,6,,,, +US-MI-49031,US,MI,49031,6,,,, +US-MI-49032,US,MI,49032,6,,,, +US-MI-49033,US,MI,49033,6,,,, +US-MI-49034,US,MI,49034,6,,,, +US-MI-49035,US,MI,49035,6,,,, +US-MI-49036,US,MI,49036,6,,,, +US-MI-49037,US,MI,49037,6,,,, +US-MI-49038,US,MI,49038,6,,,, +US-MI-49039,US,MI,49039,6,,,, +US-MI-49040,US,MI,49040,6,,,, +US-MI-49041,US,MI,49041,6,,,, +US-MI-49042,US,MI,49042,6,,,, +US-MI-49043,US,MI,49043,6,,,, +US-MI-49045,US,MI,49045,6,,,, +US-MI-49046,US,MI,49046,6,,,, +US-MI-49047,US,MI,49047,6,,,, +US-MI-49048,US,MI,49048,6,,,, +US-MI-49050,US,MI,49050,6,,,, +US-MI-49051,US,MI,49051,6,,,, +US-MI-49052,US,MI,49052,6,,,, +US-MI-49053,US,MI,49053,6,,,, +US-MI-49055,US,MI,49055,6,,,, +US-MI-49056,US,MI,49056,6,,,, +US-MI-49057,US,MI,49057,6,,,, +US-MI-49058,US,MI,49058,6,,,, +US-MI-49060,US,MI,49060,6,,,, +US-MI-49061,US,MI,49061,6,,,, +US-MI-49062,US,MI,49062,6,,,, +US-MI-49063,US,MI,49063,6,,,, +US-MI-49064,US,MI,49064,6,,,, +US-MI-49065,US,MI,49065,6,,,, +US-MI-49066,US,MI,49066,6,,,, +US-MI-49067,US,MI,49067,6,,,, +US-MI-49068,US,MI,49068,6,,,, +US-MI-49070,US,MI,49070,6,,,, +US-MI-49071,US,MI,49071,6,,,, +US-MI-49072,US,MI,49072,6,,,, +US-MI-49073,US,MI,49073,6,,,, +US-MI-49074,US,MI,49074,6,,,, +US-MI-49075,US,MI,49075,6,,,, +US-MI-49076,US,MI,49076,6,,,, +US-MI-49077,US,MI,49077,6,,,, +US-MI-49078,US,MI,49078,6,,,, +US-MI-49079,US,MI,49079,6,,,, +US-MI-49080,US,MI,49080,6,,,, +US-MI-49081,US,MI,49081,6,,,, +US-MI-49082,US,MI,49082,6,,,, +US-MI-49083,US,MI,49083,6,,,, +US-MI-49084,US,MI,49084,6,,,, +US-MI-49085,US,MI,49085,6,,,, +US-MI-49087,US,MI,49087,6,,,, +US-MI-49088,US,MI,49088,6,,,, +US-MI-49089,US,MI,49089,6,,,, +US-MI-49090,US,MI,49090,6,,,, +US-MI-49091,US,MI,49091,6,,,, +US-MI-49092,US,MI,49092,6,,,, +US-MI-49093,US,MI,49093,6,,,, +US-MI-49094,US,MI,49094,6,,,, +US-MI-49095,US,MI,49095,6,,,, +US-MI-49096,US,MI,49096,6,,,, +US-MI-49097,US,MI,49097,6,,,, +US-MI-49098,US,MI,49098,6,,,, +US-MI-49099,US,MI,49099,6,,,, +US-MI-49101,US,MI,49101,6,,,, +US-MI-49102,US,MI,49102,6,,,, +US-MI-49103,US,MI,49103,6,,,, +US-MI-49104,US,MI,49104,6,,,, +US-MI-49106,US,MI,49106,6,,,, +US-MI-49107,US,MI,49107,6,,,, +US-MI-49111,US,MI,49111,6,,,, +US-MI-49112,US,MI,49112,6,,,, +US-MI-49113,US,MI,49113,6,,,, +US-MI-49115,US,MI,49115,6,,,, +US-MI-49116,US,MI,49116,6,,,, +US-MI-49117,US,MI,49117,6,,,, +US-MI-49119,US,MI,49119,6,,,, +US-MI-49120,US,MI,49120,6,,,, +US-MI-49125,US,MI,49125,6,,,, +US-MI-49126,US,MI,49126,6,,,, +US-MI-49127,US,MI,49127,6,,,, +US-MI-49128,US,MI,49128,6,,,, +US-MI-49129,US,MI,49129,6,,,, +US-MI-49130,US,MI,49130,6,,,, +US-MI-49201,US,MI,49201,6,,,, +US-MI-49202,US,MI,49202,6,,,, +US-MI-49203,US,MI,49203,6,,,, +US-MI-49204,US,MI,49204,6,,,, +US-MI-49220,US,MI,49220,6,,,, +US-MI-49221,US,MI,49221,6,,,, +US-MI-49224,US,MI,49224,6,,,, +US-MI-49227,US,MI,49227,6,,,, +US-MI-49228,US,MI,49228,6,,,, +US-MI-49229,US,MI,49229,6,,,, +US-MI-49230,US,MI,49230,6,,,, +US-MI-49232,US,MI,49232,6,,,, +US-MI-49233,US,MI,49233,6,,,, +US-MI-49234,US,MI,49234,6,,,, +US-MI-49235,US,MI,49235,6,,,, +US-MI-49236,US,MI,49236,6,,,, +US-MI-49237,US,MI,49237,6,,,, +US-MI-49238,US,MI,49238,6,,,, +US-MI-49239,US,MI,49239,6,,,, +US-MI-49240,US,MI,49240,6,,,, +US-MI-49241,US,MI,49241,6,,,, +US-MI-49242,US,MI,49242,6,,,, +US-MI-49245,US,MI,49245,6,,,, +US-MI-49246,US,MI,49246,6,,,, +US-MI-49247,US,MI,49247,6,,,, +US-MI-49248,US,MI,49248,6,,,, +US-MI-49249,US,MI,49249,6,,,, +US-MI-49250,US,MI,49250,6,,,, +US-MI-49251,US,MI,49251,6,,,, +US-MI-49252,US,MI,49252,6,,,, +US-MI-49253,US,MI,49253,6,,,, +US-MI-49254,US,MI,49254,6,,,, +US-MI-49255,US,MI,49255,6,,,, +US-MI-49256,US,MI,49256,6,,,, +US-MI-49257,US,MI,49257,6,,,, +US-MI-49258,US,MI,49258,6,,,, +US-MI-49259,US,MI,49259,6,,,, +US-MI-49261,US,MI,49261,6,,,, +US-MI-49262,US,MI,49262,6,,,, +US-MI-49263,US,MI,49263,6,,,, +US-MI-49264,US,MI,49264,6,,,, +US-MI-49265,US,MI,49265,6,,,, +US-MI-49266,US,MI,49266,6,,,, +US-MI-49267,US,MI,49267,6,,,, +US-MI-49268,US,MI,49268,6,,,, +US-MI-49269,US,MI,49269,6,,,, +US-MI-49270,US,MI,49270,6,,,, +US-MI-49271,US,MI,49271,6,,,, +US-MI-49272,US,MI,49272,6,,,, +US-MI-49274,US,MI,49274,6,,,, +US-MI-49276,US,MI,49276,6,,,, +US-MI-49277,US,MI,49277,6,,,, +US-MI-49279,US,MI,49279,6,,,, +US-MI-49281,US,MI,49281,6,,,, +US-MI-49282,US,MI,49282,6,,,, +US-MI-49283,US,MI,49283,6,,,, +US-MI-49284,US,MI,49284,6,,,, +US-MI-49285,US,MI,49285,6,,,, +US-MI-49286,US,MI,49286,6,,,, +US-MI-49287,US,MI,49287,6,,,, +US-MI-49288,US,MI,49288,6,,,, +US-MI-49289,US,MI,49289,6,,,, +US-MI-49301,US,MI,49301,6,,,, +US-MI-49302,US,MI,49302,6,,,, +US-MI-49303,US,MI,49303,6,,,, +US-MI-49304,US,MI,49304,6,,,, +US-MI-49305,US,MI,49305,6,,,, +US-MI-49306,US,MI,49306,6,,,, +US-MI-49307,US,MI,49307,6,,,, +US-MI-49309,US,MI,49309,6,,,, +US-MI-49310,US,MI,49310,6,,,, +US-MI-49311,US,MI,49311,6,,,, +US-MI-49312,US,MI,49312,6,,,, +US-MI-49314,US,MI,49314,6,,,, +US-MI-49315,US,MI,49315,6,,,, +US-MI-49316,US,MI,49316,6,,,, +US-MI-49317,US,MI,49317,6,,,, +US-MI-49318,US,MI,49318,6,,,, +US-MI-49319,US,MI,49319,6,,,, +US-MI-49320,US,MI,49320,6,,,, +US-MI-49321,US,MI,49321,6,,,, +US-MI-49322,US,MI,49322,6,,,, +US-MI-49323,US,MI,49323,6,,,, +US-MI-49325,US,MI,49325,6,,,, +US-MI-49326,US,MI,49326,6,,,, +US-MI-49327,US,MI,49327,6,,,, +US-MI-49328,US,MI,49328,6,,,, +US-MI-49329,US,MI,49329,6,,,, +US-MI-49330,US,MI,49330,6,,,, +US-MI-49331,US,MI,49331,6,,,, +US-MI-49332,US,MI,49332,6,,,, +US-MI-49333,US,MI,49333,6,,,, +US-MI-49335,US,MI,49335,6,,,, +US-MI-49336,US,MI,49336,6,,,, +US-MI-49337,US,MI,49337,6,,,, +US-MI-49338,US,MI,49338,6,,,, +US-MI-49339,US,MI,49339,6,,,, +US-MI-49340,US,MI,49340,6,,,, +US-MI-49341,US,MI,49341,6,,,, +US-MI-49342,US,MI,49342,6,,,, +US-MI-49343,US,MI,49343,6,,,, +US-MI-49344,US,MI,49344,6,,,, +US-MI-49345,US,MI,49345,6,,,, +US-MI-49346,US,MI,49346,6,,,, +US-MI-49347,US,MI,49347,6,,,, +US-MI-49348,US,MI,49348,6,,,, +US-MI-49349,US,MI,49349,6,,,, +US-MI-49351,US,MI,49351,6,,,, +US-MI-49355,US,MI,49355,6,,,, +US-MI-49356,US,MI,49356,6,,,, +US-MI-49357,US,MI,49357,6,,,, +US-MI-49401,US,MI,49401,6,,,, +US-MI-49402,US,MI,49402,6,,,, +US-MI-49403,US,MI,49403,6,,,, +US-MI-49404,US,MI,49404,6,,,, +US-MI-49405,US,MI,49405,6,,,, +US-MI-49406,US,MI,49406,6,,,, +US-MI-49408,US,MI,49408,6,,,, +US-MI-49409,US,MI,49409,6,,,, +US-MI-49410,US,MI,49410,6,,,, +US-MI-49411,US,MI,49411,6,,,, +US-MI-49412,US,MI,49412,6,,,, +US-MI-49413,US,MI,49413,6,,,, +US-MI-49415,US,MI,49415,6,,,, +US-MI-49416,US,MI,49416,6,,,, +US-MI-49417,US,MI,49417,6,,,, +US-MI-49418,US,MI,49418,6,,,, +US-MI-49419,US,MI,49419,6,,,, +US-MI-49420,US,MI,49420,6,,,, +US-MI-49421,US,MI,49421,6,,,, +US-MI-49422,US,MI,49422,6,,,, +US-MI-49423,US,MI,49423,6,,,, +US-MI-49424,US,MI,49424,6,,,, +US-MI-49425,US,MI,49425,6,,,, +US-MI-49426,US,MI,49426,6,,,, +US-MI-49427,US,MI,49427,6,,,, +US-MI-49428,US,MI,49428,6,,,, +US-MI-49429,US,MI,49429,6,,,, +US-MI-49430,US,MI,49430,6,,,, +US-MI-49431,US,MI,49431,6,,,, +US-MI-49434,US,MI,49434,6,,,, +US-MI-49435,US,MI,49435,6,,,, +US-MI-49436,US,MI,49436,6,,,, +US-MI-49437,US,MI,49437,6,,,, +US-MI-49440,US,MI,49440,6,,,, +US-MI-49441,US,MI,49441,6,,,, +US-MI-49442,US,MI,49442,6,,,, +US-MI-49443,US,MI,49443,6,,,, +US-MI-49444,US,MI,49444,6,,,, +US-MI-49445,US,MI,49445,6,,,, +US-MI-49446,US,MI,49446,6,,,, +US-MI-49448,US,MI,49448,6,,,, +US-MI-49449,US,MI,49449,6,,,, +US-MI-49450,US,MI,49450,6,,,, +US-MI-49451,US,MI,49451,6,,,, +US-MI-49452,US,MI,49452,6,,,, +US-MI-49453,US,MI,49453,6,,,, +US-MI-49454,US,MI,49454,6,,,, +US-MI-49455,US,MI,49455,6,,,, +US-MI-49456,US,MI,49456,6,,,, +US-MI-49457,US,MI,49457,6,,,, +US-MI-49458,US,MI,49458,6,,,, +US-MI-49459,US,MI,49459,6,,,, +US-MI-49460,US,MI,49460,6,,,, +US-MI-49461,US,MI,49461,6,,,, +US-MI-49463,US,MI,49463,6,,,, +US-MI-49464,US,MI,49464,6,,,, +US-MI-49468,US,MI,49468,6,,,, +US-MI-49501,US,MI,49501,6,,,, +US-MI-49502,US,MI,49502,6,,,, +US-MI-49503,US,MI,49503,6,,,, +US-MI-49504,US,MI,49504,6,,,, +US-MI-49505,US,MI,49505,6,,,, +US-MI-49506,US,MI,49506,6,,,, +US-MI-49507,US,MI,49507,6,,,, +US-MI-49508,US,MI,49508,6,,,, +US-MI-49509,US,MI,49509,6,,,, +US-MI-49510,US,MI,49510,6,,,, +US-MI-49512,US,MI,49512,6,,,, +US-MI-49514,US,MI,49514,6,,,, +US-MI-49515,US,MI,49515,6,,,, +US-MI-49516,US,MI,49516,6,,,, +US-MI-49518,US,MI,49518,6,,,, +US-MI-49519,US,MI,49519,6,,,, +US-MI-49523,US,MI,49523,6,,,, +US-MI-49525,US,MI,49525,6,,,, +US-MI-49528,US,MI,49528,6,,,, +US-MI-49530,US,MI,49530,6,,,, +US-MI-49534,US,MI,49534,6,,,, +US-MI-49544,US,MI,49544,6,,,, +US-MI-49546,US,MI,49546,6,,,, +US-MI-49548,US,MI,49548,6,,,, +US-MI-49555,US,MI,49555,6,,,, +US-MI-49560,US,MI,49560,6,,,, +US-MI-49588,US,MI,49588,6,,,, +US-MI-49599,US,MI,49599,6,,,, +US-MI-49601,US,MI,49601,6,,,, +US-MI-49610,US,MI,49610,6,,,, +US-MI-49611,US,MI,49611,6,,,, +US-MI-49612,US,MI,49612,6,,,, +US-MI-49613,US,MI,49613,6,,,, +US-MI-49614,US,MI,49614,6,,,, +US-MI-49615,US,MI,49615,6,,,, +US-MI-49616,US,MI,49616,6,,,, +US-MI-49617,US,MI,49617,6,,,, +US-MI-49618,US,MI,49618,6,,,, +US-MI-49619,US,MI,49619,6,,,, +US-MI-49620,US,MI,49620,6,,,, +US-MI-49621,US,MI,49621,6,,,, +US-MI-49622,US,MI,49622,6,,,, +US-MI-49623,US,MI,49623,6,,,, +US-MI-49625,US,MI,49625,6,,,, +US-MI-49626,US,MI,49626,6,,,, +US-MI-49627,US,MI,49627,6,,,, +US-MI-49628,US,MI,49628,6,,,, +US-MI-49629,US,MI,49629,6,,,, +US-MI-49630,US,MI,49630,6,,,, +US-MI-49631,US,MI,49631,6,,,, +US-MI-49632,US,MI,49632,6,,,, +US-MI-49633,US,MI,49633,6,,,, +US-MI-49634,US,MI,49634,6,,,, +US-MI-49635,US,MI,49635,6,,,, +US-MI-49636,US,MI,49636,6,,,, +US-MI-49637,US,MI,49637,6,,,, +US-MI-49638,US,MI,49638,6,,,, +US-MI-49639,US,MI,49639,6,,,, +US-MI-49640,US,MI,49640,6,,,, +US-MI-49642,US,MI,49642,6,,,, +US-MI-49643,US,MI,49643,6,,,, +US-MI-49644,US,MI,49644,6,,,, +US-MI-49645,US,MI,49645,6,,,, +US-MI-49646,US,MI,49646,6,,,, +US-MI-49648,US,MI,49648,6,,,, +US-MI-49649,US,MI,49649,6,,,, +US-MI-49650,US,MI,49650,6,,,, +US-MI-49651,US,MI,49651,6,,,, +US-MI-49653,US,MI,49653,6,,,, +US-MI-49654,US,MI,49654,6,,,, +US-MI-49655,US,MI,49655,6,,,, +US-MI-49656,US,MI,49656,6,,,, +US-MI-49657,US,MI,49657,6,,,, +US-MI-49659,US,MI,49659,6,,,, +US-MI-49660,US,MI,49660,6,,,, +US-MI-49663,US,MI,49663,6,,,, +US-MI-49664,US,MI,49664,6,,,, +US-MI-49665,US,MI,49665,6,,,, +US-MI-49666,US,MI,49666,6,,,, +US-MI-49667,US,MI,49667,6,,,, +US-MI-49668,US,MI,49668,6,,,, +US-MI-49670,US,MI,49670,6,,,, +US-MI-49673,US,MI,49673,6,,,, +US-MI-49674,US,MI,49674,6,,,, +US-MI-49675,US,MI,49675,6,,,, +US-MI-49676,US,MI,49676,6,,,, +US-MI-49677,US,MI,49677,6,,,, +US-MI-49679,US,MI,49679,6,,,, +US-MI-49680,US,MI,49680,6,,,, +US-MI-49682,US,MI,49682,6,,,, +US-MI-49683,US,MI,49683,6,,,, +US-MI-49684,US,MI,49684,6,,,, +US-MI-49685,US,MI,49685,6,,,, +US-MI-49686,US,MI,49686,6,,,, +US-MI-49688,US,MI,49688,6,,,, +US-MI-49689,US,MI,49689,6,,,, +US-MI-49690,US,MI,49690,6,,,, +US-MI-49696,US,MI,49696,6,,,, +US-MI-49701,US,MI,49701,6,,,, +US-MI-49705,US,MI,49705,6,,,, +US-MI-49706,US,MI,49706,6,,,, +US-MI-49707,US,MI,49707,6,,,, +US-MI-49709,US,MI,49709,6,,,, +US-MI-49710,US,MI,49710,6,,,, +US-MI-49711,US,MI,49711,6,,,, +US-MI-49712,US,MI,49712,6,,,, +US-MI-49713,US,MI,49713,6,,,, +US-MI-49715,US,MI,49715,6,,,, +US-MI-49716,US,MI,49716,6,,,, +US-MI-49717,US,MI,49717,6,,,, +US-MI-49718,US,MI,49718,6,,,, +US-MI-49719,US,MI,49719,6,,,, +US-MI-49720,US,MI,49720,6,,,, +US-MI-49721,US,MI,49721,6,,,, +US-MI-49722,US,MI,49722,6,,,, +US-MI-49723,US,MI,49723,6,,,, +US-MI-49724,US,MI,49724,6,,,, +US-MI-49725,US,MI,49725,6,,,, +US-MI-49726,US,MI,49726,6,,,, +US-MI-49727,US,MI,49727,6,,,, +US-MI-49728,US,MI,49728,6,,,, +US-MI-49729,US,MI,49729,6,,,, +US-MI-49730,US,MI,49730,6,,,, +US-MI-49733,US,MI,49733,6,,,, +US-MI-49734,US,MI,49734,6,,,, +US-MI-49735,US,MI,49735,6,,,, +US-MI-49736,US,MI,49736,6,,,, +US-MI-49737,US,MI,49737,6,,,, +US-MI-49738,US,MI,49738,6,,,, +US-MI-49739,US,MI,49739,6,,,, +US-MI-49740,US,MI,49740,6,,,, +US-MI-49743,US,MI,49743,6,,,, +US-MI-49744,US,MI,49744,6,,,, +US-MI-49745,US,MI,49745,6,,,, +US-MI-49746,US,MI,49746,6,,,, +US-MI-49747,US,MI,49747,6,,,, +US-MI-49748,US,MI,49748,6,,,, +US-MI-49749,US,MI,49749,6,,,, +US-MI-49751,US,MI,49751,6,,,, +US-MI-49752,US,MI,49752,6,,,, +US-MI-49753,US,MI,49753,6,,,, +US-MI-49755,US,MI,49755,6,,,, +US-MI-49756,US,MI,49756,6,,,, +US-MI-49757,US,MI,49757,6,,,, +US-MI-49759,US,MI,49759,6,,,, +US-MI-49760,US,MI,49760,6,,,, +US-MI-49761,US,MI,49761,6,,,, +US-MI-49762,US,MI,49762,6,,,, +US-MI-49764,US,MI,49764,6,,,, +US-MI-49765,US,MI,49765,6,,,, +US-MI-49766,US,MI,49766,6,,,, +US-MI-49768,US,MI,49768,6,,,, +US-MI-49769,US,MI,49769,6,,,, +US-MI-49770,US,MI,49770,6,,,, +US-MI-49774,US,MI,49774,6,,,, +US-MI-49775,US,MI,49775,6,,,, +US-MI-49776,US,MI,49776,6,,,, +US-MI-49777,US,MI,49777,6,,,, +US-MI-49779,US,MI,49779,6,,,, +US-MI-49780,US,MI,49780,6,,,, +US-MI-49781,US,MI,49781,6,,,, +US-MI-49782,US,MI,49782,6,,,, +US-MI-49783,US,MI,49783,6,,,, +US-MI-49784,US,MI,49784,6,,,, +US-MI-49785,US,MI,49785,6,,,, +US-MI-49786,US,MI,49786,6,,,, +US-MI-49788,US,MI,49788,6,,,, +US-MI-49791,US,MI,49791,6,,,, +US-MI-49792,US,MI,49792,6,,,, +US-MI-49793,US,MI,49793,6,,,, +US-MI-49795,US,MI,49795,6,,,, +US-MI-49796,US,MI,49796,6,,,, +US-MI-49797,US,MI,49797,6,,,, +US-MI-49799,US,MI,49799,6,,,, +US-MI-49801,US,MI,49801,6,,,, +US-MI-49802,US,MI,49802,6,,,, +US-MI-49805,US,MI,49805,6,,,, +US-MI-49806,US,MI,49806,6,,,, +US-MI-49807,US,MI,49807,6,,,, +US-MI-49808,US,MI,49808,6,,,, +US-MI-49812,US,MI,49812,6,,,, +US-MI-49814,US,MI,49814,6,,,, +US-MI-49815,US,MI,49815,6,,,, +US-MI-49816,US,MI,49816,6,,,, +US-MI-49817,US,MI,49817,6,,,, +US-MI-49818,US,MI,49818,6,,,, +US-MI-49819,US,MI,49819,6,,,, +US-MI-49820,US,MI,49820,6,,,, +US-MI-49821,US,MI,49821,6,,,, +US-MI-49822,US,MI,49822,6,,,, +US-MI-49825,US,MI,49825,6,,,, +US-MI-49826,US,MI,49826,6,,,, +US-MI-49827,US,MI,49827,6,,,, +US-MI-49829,US,MI,49829,6,,,, +US-MI-49831,US,MI,49831,6,,,, +US-MI-49833,US,MI,49833,6,,,, +US-MI-49834,US,MI,49834,6,,,, +US-MI-49835,US,MI,49835,6,,,, +US-MI-49836,US,MI,49836,6,,,, +US-MI-49837,US,MI,49837,6,,,, +US-MI-49838,US,MI,49838,6,,,, +US-MI-49839,US,MI,49839,6,,,, +US-MI-49840,US,MI,49840,6,,,, +US-MI-49841,US,MI,49841,6,,,, +US-MI-49845,US,MI,49845,6,,,, +US-MI-49847,US,MI,49847,6,,,, +US-MI-49848,US,MI,49848,6,,,, +US-MI-49849,US,MI,49849,6,,,, +US-MI-49852,US,MI,49852,6,,,, +US-MI-49853,US,MI,49853,6,,,, +US-MI-49854,US,MI,49854,6,,,, +US-MI-49855,US,MI,49855,6,,,, +US-MI-49858,US,MI,49858,6,,,, +US-MI-49861,US,MI,49861,6,,,, +US-MI-49862,US,MI,49862,6,,,, +US-MI-49863,US,MI,49863,6,,,, +US-MI-49864,US,MI,49864,6,,,, +US-MI-49865,US,MI,49865,6,,,, +US-MI-49866,US,MI,49866,6,,,, +US-MI-49868,US,MI,49868,6,,,, +US-MI-49870,US,MI,49870,6,,,, +US-MI-49871,US,MI,49871,6,,,, +US-MI-49872,US,MI,49872,6,,,, +US-MI-49873,US,MI,49873,6,,,, +US-MI-49874,US,MI,49874,6,,,, +US-MI-49876,US,MI,49876,6,,,, +US-MI-49877,US,MI,49877,6,,,, +US-MI-49878,US,MI,49878,6,,,, +US-MI-49879,US,MI,49879,6,,,, +US-MI-49880,US,MI,49880,6,,,, +US-MI-49881,US,MI,49881,6,,,, +US-MI-49883,US,MI,49883,6,,,, +US-MI-49884,US,MI,49884,6,,,, +US-MI-49885,US,MI,49885,6,,,, +US-MI-49886,US,MI,49886,6,,,, +US-MI-49887,US,MI,49887,6,,,, +US-MI-49891,US,MI,49891,6,,,, +US-MI-49892,US,MI,49892,6,,,, +US-MI-49893,US,MI,49893,6,,,, +US-MI-49894,US,MI,49894,6,,,, +US-MI-49895,US,MI,49895,6,,,, +US-MI-49896,US,MI,49896,6,,,, +US-MI-49901,US,MI,49901,6,,,, +US-MI-49902,US,MI,49902,6,,,, +US-MI-49903,US,MI,49903,6,,,, +US-MI-49905,US,MI,49905,6,,,, +US-MI-49908,US,MI,49908,6,,,, +US-MI-49910,US,MI,49910,6,,,, +US-MI-49911,US,MI,49911,6,,,, +US-MI-49912,US,MI,49912,6,,,, +US-MI-49913,US,MI,49913,6,,,, +US-MI-49915,US,MI,49915,6,,,, +US-MI-49916,US,MI,49916,6,,,, +US-MI-49917,US,MI,49917,6,,,, +US-MI-49918,US,MI,49918,6,,,, +US-MI-49919,US,MI,49919,6,,,, +US-MI-49920,US,MI,49920,6,,,, +US-MI-49921,US,MI,49921,6,,,, +US-MI-49922,US,MI,49922,6,,,, +US-MI-49925,US,MI,49925,6,,,, +US-MI-49927,US,MI,49927,6,,,, +US-MI-49929,US,MI,49929,6,,,, +US-MI-49930,US,MI,49930,6,,,, +US-MI-49931,US,MI,49931,6,,,, +US-MI-49934,US,MI,49934,6,,,, +US-MI-49935,US,MI,49935,6,,,, +US-MI-49938,US,MI,49938,6,,,, +US-MI-49942,US,MI,49942,6,,,, +US-MI-49945,US,MI,49945,6,,,, +US-MI-49946,US,MI,49946,6,,,, +US-MI-49947,US,MI,49947,6,,,, +US-MI-49948,US,MI,49948,6,,,, +US-MI-49950,US,MI,49950,6,,,, +US-MI-49952,US,MI,49952,6,,,, +US-MI-49953,US,MI,49953,6,,,, +US-MI-49955,US,MI,49955,6,,,, +US-MI-49958,US,MI,49958,6,,,, +US-MI-49959,US,MI,49959,6,,,, +US-MI-49960,US,MI,49960,6,,,, +US-MI-49961,US,MI,49961,6,,,, +US-MI-49962,US,MI,49962,6,,,, +US-MI-49963,US,MI,49963,6,,,, +US-MI-49964,US,MI,49964,6,,,, +US-MI-49965,US,MI,49965,6,,,, +US-MI-49967,US,MI,49967,6,,,, +US-MI-49968,US,MI,49968,6,,,, +US-MI-49969,US,MI,49969,6,,,, +US-MI-49970,US,MI,49970,6,,,, +US-MI-49971,US,MI,49971,6,,,, +US-MN-55001,US,MN,55001,7.125,,,, +US-MN-55002,US,MN,55002,6.875,,,, +US-MN-55003,US,MN,55003,7.125,,,, +US-MN-55005,US,MN,55005,7.125,,,, +US-MN-55006,US,MN,55006,6.875,,,, +US-MN-55007,US,MN,55007,6.875,,,, +US-MN-55008,US,MN,55008,6.875,,,, +US-MN-55009,US,MN,55009,6.875,,,, +US-MN-55010,US,MN,55010,6.875,,,, +US-MN-55011,US,MN,55011,7.125,,,, +US-MN-55012,US,MN,55012,6.875,,,, +US-MN-55013,US,MN,55013,6.875,,,, +US-MN-55014,US,MN,55014,7.125,,,, +US-MN-55016,US,MN,55016,7.125,,,, +US-MN-55017,US,MN,55017,6.875,,,, +US-MN-55018,US,MN,55018,6.875,,,, +US-MN-55019,US,MN,55019,6.875,,,, +US-MN-55020,US,MN,55020,6.875,,,, +US-MN-55021,US,MN,55021,6.875,,,, +US-MN-55024,US,MN,55024,7.125,,,, +US-MN-55025,US,MN,55025,7.125,,,, +US-MN-55026,US,MN,55026,6.875,,,, +US-MN-55027,US,MN,55027,6.875,,,, +US-MN-55029,US,MN,55029,6.875,,,, +US-MN-55030,US,MN,55030,6.875,,,, +US-MN-55031,US,MN,55031,7.125,,,, +US-MN-55032,US,MN,55032,6.875,,,, +US-MN-55033,US,MN,55033,7.125,,,, +US-MN-55036,US,MN,55036,6.875,,,, +US-MN-55037,US,MN,55037,6.875,,,, +US-MN-55038,US,MN,55038,7.125,,,, +US-MN-55040,US,MN,55040,6.875,,,, +US-MN-55041,US,MN,55041,6.875,,,, +US-MN-55042,US,MN,55042,7.125,,,, +US-MN-55043,US,MN,55043,7.125,,,, +US-MN-55044,US,MN,55044,7.125,,,, +US-MN-55045,US,MN,55045,6.875,,,, +US-MN-55046,US,MN,55046,6.875,,,, +US-MN-55047,US,MN,55047,7.125,,,, +US-MN-55049,US,MN,55049,6.875,,,, +US-MN-55051,US,MN,55051,6.875,,,, +US-MN-55052,US,MN,55052,6.875,,,, +US-MN-55053,US,MN,55053,6.875,,,, +US-MN-55054,US,MN,55054,6.875,,,, +US-MN-55055,US,MN,55055,7.125,,,, +US-MN-55056,US,MN,55056,6.875,,,, +US-MN-55057,US,MN,55057,6.875,,,, +US-MN-55060,US,MN,55060,6.875,,,, +US-MN-55063,US,MN,55063,6.875,,,, +US-MN-55065,US,MN,55065,7.125,,,, +US-MN-55066,US,MN,55066,6.875,,,, +US-MN-55067,US,MN,55067,6.875,,,, +US-MN-55068,US,MN,55068,7.125,,,, +US-MN-55069,US,MN,55069,6.875,,,, +US-MN-55070,US,MN,55070,7.125,,,, +US-MN-55071,US,MN,55071,7.125,,,, +US-MN-55072,US,MN,55072,6.875,,,, +US-MN-55073,US,MN,55073,7.125,,,, +US-MN-55074,US,MN,55074,6.875,,,, +US-MN-55075,US,MN,55075,7.125,,,, +US-MN-55076,US,MN,55076,7.125,,,, +US-MN-55077,US,MN,55077,7.125,,,, +US-MN-55078,US,MN,55078,6.875,,,, +US-MN-55079,US,MN,55079,6.875,,,, +US-MN-55080,US,MN,55080,6.875,,,, +US-MN-55082,US,MN,55082,7.125,,,, +US-MN-55083,US,MN,55083,7.125,,,, +US-MN-55084,US,MN,55084,6.875,,,, +US-MN-55085,US,MN,55085,7.125,,,, +US-MN-55087,US,MN,55087,6.875,,,, +US-MN-55088,US,MN,55088,6.875,,,, +US-MN-55089,US,MN,55089,6.875,,,, +US-MN-55090,US,MN,55090,7.125,,,, +US-MN-55092,US,MN,55092,6.875,,,, +US-MN-55101,US,MN,55101,7.625,,,, +US-MN-55102,US,MN,55102,7.625,,,, +US-MN-55103,US,MN,55103,7.625,,,, +US-MN-55104,US,MN,55104,7.625,,,, +US-MN-55105,US,MN,55105,7.625,,,, +US-MN-55106,US,MN,55106,7.625,,,, +US-MN-55107,US,MN,55107,7.625,,,, +US-MN-55108,US,MN,55108,7.625,,,, +US-MN-55109,US,MN,55109,7.125,,,, +US-MN-55110,US,MN,55110,7.125,,,, +US-MN-55111,US,MN,55111,7.275,,,, +US-MN-55112,US,MN,55112,7.125,,,, +US-MN-55113,US,MN,55113,7.125,,,, +US-MN-55114,US,MN,55114,7.625,,,, +US-MN-55115,US,MN,55115,7.125,,,, +US-MN-55116,US,MN,55116,7.625,,,, +US-MN-55117,US,MN,55117,7.625,,,, +US-MN-55118,US,MN,55118,7.125,,,, +US-MN-55119,US,MN,55119,7.625,,,, +US-MN-55120,US,MN,55120,7.125,,,, +US-MN-55121,US,MN,55121,7.125,,,, +US-MN-55122,US,MN,55122,7.125,,,, +US-MN-55123,US,MN,55123,7.125,,,, +US-MN-55124,US,MN,55124,7.125,,,, +US-MN-55125,US,MN,55125,7.125,,,, +US-MN-55126,US,MN,55126,7.125,,,, +US-MN-55127,US,MN,55127,7.125,,,, +US-MN-55128,US,MN,55128,7.125,,,, +US-MN-55129,US,MN,55129,7.125,,,, +US-MN-55130,US,MN,55130,7.625,,,, +US-MN-55133,US,MN,55133,7.125,,,, +US-MN-55144,US,MN,55144,7.125,,,, +US-MN-55145,US,MN,55145,7.625,,,, +US-MN-55146,US,MN,55146,7.625,,,, +US-MN-55150,US,MN,55150,7.125,,,, +US-MN-55155,US,MN,55155,7.625,,,, +US-MN-55164,US,MN,55164,7.125,,,, +US-MN-55165,US,MN,55165,7.625,,,, +US-MN-55166,US,MN,55166,7.125,,,, +US-MN-55168,US,MN,55168,7.625,,,, +US-MN-55170,US,MN,55170,7.125,,,, +US-MN-55171,US,MN,55171,7.125,,,, +US-MN-55172,US,MN,55172,7.125,,,, +US-MN-55175,US,MN,55175,7.625,,,, +US-MN-55187,US,MN,55187,7.125,,,, +US-MN-55188,US,MN,55188,6.875,,,, +US-MN-55301,US,MN,55301,6.875,,,, +US-MN-55302,US,MN,55302,6.875,,,, +US-MN-55303,US,MN,55303,7.125,,,, +US-MN-55304,US,MN,55304,7.125,,,, +US-MN-55305,US,MN,55305,7.275,,,, +US-MN-55306,US,MN,55306,7.125,,,, +US-MN-55307,US,MN,55307,6.875,,,, +US-MN-55308,US,MN,55308,6.875,,,, +US-MN-55309,US,MN,55309,6.875,,,, +US-MN-55310,US,MN,55310,6.875,,,, +US-MN-55311,US,MN,55311,7.275,,,, +US-MN-55312,US,MN,55312,6.875,,,, +US-MN-55313,US,MN,55313,6.875,,,, +US-MN-55314,US,MN,55314,6.875,,,, +US-MN-55315,US,MN,55315,6.875,,,, +US-MN-55316,US,MN,55316,7.275,,,, +US-MN-55317,US,MN,55317,6.875,,,, +US-MN-55318,US,MN,55318,6.875,,,, +US-MN-55319,US,MN,55319,6.875,,,, +US-MN-55320,US,MN,55320,6.875,,,, +US-MN-55321,US,MN,55321,6.875,,,, +US-MN-55322,US,MN,55322,6.875,,,, +US-MN-55323,US,MN,55323,6.875,,,, +US-MN-55324,US,MN,55324,6.875,,,, +US-MN-55325,US,MN,55325,6.875,,,, +US-MN-55327,US,MN,55327,7.275,,,, +US-MN-55328,US,MN,55328,6.875,,,, +US-MN-55329,US,MN,55329,6.875,,,, +US-MN-55330,US,MN,55330,6.875,,,, +US-MN-55331,US,MN,55331,7.275,,,, +US-MN-55332,US,MN,55332,6.875,,,, +US-MN-55333,US,MN,55333,6.875,,,, +US-MN-55334,US,MN,55334,6.875,,,, +US-MN-55335,US,MN,55335,6.875,,,, +US-MN-55336,US,MN,55336,6.875,,,, +US-MN-55337,US,MN,55337,7.125,,,, +US-MN-55338,US,MN,55338,6.875,,,, +US-MN-55339,US,MN,55339,6.875,,,, +US-MN-55340,US,MN,55340,7.275,,,, +US-MN-55341,US,MN,55341,6.875,,,, +US-MN-55342,US,MN,55342,6.875,,,, +US-MN-55343,US,MN,55343,7.275,,,, +US-MN-55344,US,MN,55344,7.275,,,, +US-MN-55345,US,MN,55345,7.275,,,, +US-MN-55346,US,MN,55346,7.275,,,, +US-MN-55347,US,MN,55347,7.275,,,, +US-MN-55348,US,MN,55348,7.275,,,, +US-MN-55349,US,MN,55349,6.875,,,, +US-MN-55350,US,MN,55350,7.375,,,, +US-MN-55352,US,MN,55352,6.875,,,, +US-MN-55353,US,MN,55353,6.875,,,, +US-MN-55354,US,MN,55354,6.875,,,, +US-MN-55355,US,MN,55355,6.875,,,, +US-MN-55356,US,MN,55356,7.275,,,, +US-MN-55357,US,MN,55357,7.275,,,, +US-MN-55358,US,MN,55358,6.875,,,, +US-MN-55359,US,MN,55359,7.275,,,, +US-MN-55360,US,MN,55360,6.875,,,, +US-MN-55361,US,MN,55361,7.275,,,, +US-MN-55362,US,MN,55362,6.875,,,, +US-MN-55363,US,MN,55363,6.875,,,, +US-MN-55364,US,MN,55364,7.275,,,, +US-MN-55365,US,MN,55365,6.875,,,, +US-MN-55366,US,MN,55366,6.875,,,, +US-MN-55367,US,MN,55367,6.875,,,, +US-MN-55368,US,MN,55368,6.875,,,, +US-MN-55369,US,MN,55369,7.275,,,, +US-MN-55370,US,MN,55370,6.875,,,, +US-MN-55371,US,MN,55371,6.875,,,, +US-MN-55372,US,MN,55372,6.875,,,, +US-MN-55373,US,MN,55373,6.875,,,, +US-MN-55374,US,MN,55374,7.275,,,, +US-MN-55375,US,MN,55375,7.275,,,, +US-MN-55376,US,MN,55376,6.875,,,, +US-MN-55377,US,MN,55377,6.875,,,, +US-MN-55378,US,MN,55378,6.875,,,, +US-MN-55379,US,MN,55379,6.875,,,, +US-MN-55380,US,MN,55380,6.875,,,, +US-MN-55381,US,MN,55381,6.875,,,, +US-MN-55382,US,MN,55382,6.875,,,, +US-MN-55383,US,MN,55383,6.875,,,, +US-MN-55384,US,MN,55384,7.275,,,, +US-MN-55385,US,MN,55385,6.875,,,, +US-MN-55386,US,MN,55386,6.875,,,, +US-MN-55387,US,MN,55387,6.875,,,, +US-MN-55388,US,MN,55388,6.875,,,, +US-MN-55389,US,MN,55389,6.875,,,, +US-MN-55390,US,MN,55390,6.875,,,, +US-MN-55391,US,MN,55391,7.275,,,, +US-MN-55392,US,MN,55392,7.275,,,, +US-MN-55393,US,MN,55393,7.275,,,, +US-MN-55394,US,MN,55394,6.875,,,, +US-MN-55395,US,MN,55395,6.875,,,, +US-MN-55396,US,MN,55396,6.875,,,, +US-MN-55397,US,MN,55397,6.875,,,, +US-MN-55398,US,MN,55398,6.875,,,, +US-MN-55399,US,MN,55399,6.875,,,, +US-MN-55401,US,MN,55401,7.775,,,, +US-MN-55402,US,MN,55402,7.775,,,, +US-MN-55403,US,MN,55403,7.775,,,, +US-MN-55404,US,MN,55404,7.775,,,, +US-MN-55405,US,MN,55405,7.775,,,, +US-MN-55406,US,MN,55406,7.775,,,, +US-MN-55407,US,MN,55407,7.775,,,, +US-MN-55408,US,MN,55408,7.775,,,, +US-MN-55409,US,MN,55409,7.775,,,, +US-MN-55410,US,MN,55410,7.775,,,, +US-MN-55411,US,MN,55411,7.775,,,, +US-MN-55412,US,MN,55412,7.775,,,, +US-MN-55413,US,MN,55413,7.775,,,, +US-MN-55414,US,MN,55414,7.775,,,, +US-MN-55415,US,MN,55415,7.775,,,, +US-MN-55416,US,MN,55416,7.275,,,, +US-MN-55417,US,MN,55417,7.775,,,, +US-MN-55418,US,MN,55418,7.775,,,, +US-MN-55419,US,MN,55419,7.775,,,, +US-MN-55420,US,MN,55420,7.275,,,, +US-MN-55421,US,MN,55421,7.125,,,, +US-MN-55422,US,MN,55422,7.275,,,, +US-MN-55423,US,MN,55423,7.275,,,, +US-MN-55424,US,MN,55424,7.275,,,, +US-MN-55425,US,MN,55425,7.275,,,, +US-MN-55426,US,MN,55426,7.275,,,, +US-MN-55427,US,MN,55427,7.275,,,, +US-MN-55428,US,MN,55428,7.275,,,, +US-MN-55429,US,MN,55429,7.275,,,, +US-MN-55430,US,MN,55430,7.275,,,, +US-MN-55431,US,MN,55431,7.275,,,, +US-MN-55432,US,MN,55432,7.125,,,, +US-MN-55433,US,MN,55433,7.125,,,, +US-MN-55434,US,MN,55434,7.125,,,, +US-MN-55435,US,MN,55435,7.275,,,, +US-MN-55436,US,MN,55436,7.275,,,, +US-MN-55437,US,MN,55437,7.275,,,, +US-MN-55438,US,MN,55438,7.275,,,, +US-MN-55439,US,MN,55439,7.275,,,, +US-MN-55440,US,MN,55440,7.775,,,, +US-MN-55441,US,MN,55441,7.275,,,, +US-MN-55442,US,MN,55442,7.275,,,, +US-MN-55443,US,MN,55443,7.275,,,, +US-MN-55444,US,MN,55444,7.275,,,, +US-MN-55445,US,MN,55445,7.275,,,, +US-MN-55446,US,MN,55446,7.275,,,, +US-MN-55447,US,MN,55447,7.275,,,, +US-MN-55448,US,MN,55448,7.125,,,, +US-MN-55449,US,MN,55449,7.125,,,, +US-MN-55450,US,MN,55450,7.275,,,, +US-MN-55454,US,MN,55454,7.775,,,, +US-MN-55455,US,MN,55455,7.775,,,, +US-MN-55458,US,MN,55458,7.775,,,, +US-MN-55459,US,MN,55459,7.775,,,, +US-MN-55460,US,MN,55460,7.775,,,, +US-MN-55467,US,MN,55467,7.775,,,, +US-MN-55470,US,MN,55470,7.775,,,, +US-MN-55472,US,MN,55472,7.775,,,, +US-MN-55473,US,MN,55473,7.775,,,, +US-MN-55474,US,MN,55474,7.775,,,, +US-MN-55478,US,MN,55478,7.775,,,, +US-MN-55479,US,MN,55479,7.775,,,, +US-MN-55480,US,MN,55480,7.775,,,, +US-MN-55483,US,MN,55483,7.775,,,, +US-MN-55484,US,MN,55484,7.775,,,, +US-MN-55485,US,MN,55485,7.775,,,, +US-MN-55486,US,MN,55486,7.775,,,, +US-MN-55487,US,MN,55487,7.775,,,, +US-MN-55488,US,MN,55488,7.775,,,, +US-MN-55550,US,MN,55550,6.875,,,, +US-MN-55551,US,MN,55551,6.875,,,, +US-MN-55552,US,MN,55552,6.875,,,, +US-MN-55553,US,MN,55553,6.875,,,, +US-MN-55554,US,MN,55554,6.875,,,, +US-MN-55556,US,MN,55556,6.875,,,, +US-MN-55557,US,MN,55557,6.875,,,, +US-MN-55558,US,MN,55558,6.875,,,, +US-MN-55559,US,MN,55559,6.875,,,, +US-MN-55560,US,MN,55560,6.875,,,, +US-MN-55562,US,MN,55562,6.875,,,, +US-MN-55564,US,MN,55564,6.875,,,, +US-MN-55565,US,MN,55565,6.875,,,, +US-MN-55566,US,MN,55566,6.875,,,, +US-MN-55567,US,MN,55567,6.875,,,, +US-MN-55568,US,MN,55568,6.875,,,, +US-MN-55569,US,MN,55569,7.275,,,, +US-MN-55570,US,MN,55570,7.275,,,, +US-MN-55571,US,MN,55571,7.275,,,, +US-MN-55572,US,MN,55572,6.875,,,, +US-MN-55573,US,MN,55573,6.875,,,, +US-MN-55574,US,MN,55574,7.275,,,, +US-MN-55575,US,MN,55575,6.875,,,, +US-MN-55576,US,MN,55576,7.275,,,, +US-MN-55577,US,MN,55577,7.275,,,, +US-MN-55578,US,MN,55578,7.275,,,, +US-MN-55579,US,MN,55579,7.275,,,, +US-MN-55580,US,MN,55580,6.875,,,, +US-MN-55581,US,MN,55581,6.875,,,, +US-MN-55582,US,MN,55582,6.875,,,, +US-MN-55583,US,MN,55583,6.875,,,, +US-MN-55584,US,MN,55584,6.875,,,, +US-MN-55585,US,MN,55585,6.875,,,, +US-MN-55586,US,MN,55586,6.875,,,, +US-MN-55587,US,MN,55587,6.875,,,, +US-MN-55588,US,MN,55588,6.875,,,, +US-MN-55589,US,MN,55589,6.875,,,, +US-MN-55590,US,MN,55590,6.875,,,, +US-MN-55591,US,MN,55591,6.875,,,, +US-MN-55592,US,MN,55592,7.275,,,, +US-MN-55593,US,MN,55593,7.275,,,, +US-MN-55594,US,MN,55594,6.875,,,, +US-MN-55595,US,MN,55595,7.275,,,, +US-MN-55596,US,MN,55596,7.275,,,, +US-MN-55597,US,MN,55597,7.275,,,, +US-MN-55598,US,MN,55598,7.275,,,, +US-MN-55599,US,MN,55599,7.275,,,, +US-MN-55601,US,MN,55601,6.875,,,, +US-MN-55602,US,MN,55602,6.875,,,, +US-MN-55603,US,MN,55603,6.875,,,, +US-MN-55604,US,MN,55604,7.875,,,, +US-MN-55605,US,MN,55605,7.875,,,, +US-MN-55606,US,MN,55606,7.875,,,, +US-MN-55607,US,MN,55607,6.875,,,, +US-MN-55609,US,MN,55609,6.875,,,, +US-MN-55612,US,MN,55612,7.875,,,, +US-MN-55613,US,MN,55613,7.875,,,, +US-MN-55614,US,MN,55614,6.875,,,, +US-MN-55615,US,MN,55615,7.875,,,, +US-MN-55616,US,MN,55616,7.375,,,, +US-MN-55701,US,MN,55701,7.875,,,, +US-MN-55702,US,MN,55702,6.875,,,, +US-MN-55703,US,MN,55703,6.875,,,, +US-MN-55704,US,MN,55704,6.875,,,, +US-MN-55705,US,MN,55705,6.875,,,, +US-MN-55706,US,MN,55706,6.875,,,, +US-MN-55707,US,MN,55707,6.875,,,, +US-MN-55708,US,MN,55708,6.875,,,, +US-MN-55709,US,MN,55709,6.875,,,, +US-MN-55710,US,MN,55710,6.875,,,, +US-MN-55711,US,MN,55711,6.875,,,, +US-MN-55712,US,MN,55712,6.875,,,, +US-MN-55713,US,MN,55713,6.875,,,, +US-MN-55716,US,MN,55716,6.875,,,, +US-MN-55717,US,MN,55717,6.875,,,, +US-MN-55718,US,MN,55718,6.875,,,, +US-MN-55719,US,MN,55719,6.875,,,, +US-MN-55720,US,MN,55720,7.375,,,, +US-MN-55721,US,MN,55721,6.875,,,, +US-MN-55722,US,MN,55722,6.875,,,, +US-MN-55723,US,MN,55723,6.875,,,, +US-MN-55724,US,MN,55724,6.875,,,, +US-MN-55725,US,MN,55725,6.875,,,, +US-MN-55726,US,MN,55726,6.875,,,, +US-MN-55730,US,MN,55730,6.875,,,, +US-MN-55731,US,MN,55731,6.875,,,, +US-MN-55732,US,MN,55732,6.875,,,, +US-MN-55733,US,MN,55733,6.875,,,, +US-MN-55734,US,MN,55734,6.875,,,, +US-MN-55735,US,MN,55735,6.875,,,, +US-MN-55736,US,MN,55736,6.875,,,, +US-MN-55738,US,MN,55738,6.875,,,, +US-MN-55741,US,MN,55741,6.875,,,, +US-MN-55742,US,MN,55742,6.875,,,, +US-MN-55744,US,MN,55744,6.875,,,, +US-MN-55745,US,MN,55745,6.875,,,, +US-MN-55746,US,MN,55746,6.875,,,, +US-MN-55747,US,MN,55747,6.875,,,, +US-MN-55748,US,MN,55748,6.875,,,, +US-MN-55749,US,MN,55749,6.875,,,, +US-MN-55750,US,MN,55750,6.875,,,, +US-MN-55751,US,MN,55751,6.875,,,, +US-MN-55752,US,MN,55752,6.875,,,, +US-MN-55753,US,MN,55753,6.875,,,, +US-MN-55756,US,MN,55756,6.875,,,, +US-MN-55757,US,MN,55757,6.875,,,, +US-MN-55758,US,MN,55758,6.875,,,, +US-MN-55760,US,MN,55760,6.875,,,, +US-MN-55763,US,MN,55763,6.875,,,, +US-MN-55764,US,MN,55764,6.875,,,, +US-MN-55765,US,MN,55765,6.875,,,, +US-MN-55766,US,MN,55766,6.875,,,, +US-MN-55767,US,MN,55767,6.875,,,, +US-MN-55768,US,MN,55768,6.875,,,, +US-MN-55769,US,MN,55769,6.875,,,, +US-MN-55771,US,MN,55771,6.875,,,, +US-MN-55772,US,MN,55772,6.875,,,, +US-MN-55775,US,MN,55775,6.875,,,, +US-MN-55777,US,MN,55777,6.875,,,, +US-MN-55779,US,MN,55779,6.875,,,, +US-MN-55780,US,MN,55780,6.875,,,, +US-MN-55781,US,MN,55781,6.875,,,, +US-MN-55782,US,MN,55782,6.875,,,, +US-MN-55783,US,MN,55783,6.875,,,, +US-MN-55784,US,MN,55784,6.875,,,, +US-MN-55785,US,MN,55785,6.875,,,, +US-MN-55786,US,MN,55786,6.875,,,, +US-MN-55787,US,MN,55787,6.875,,,, +US-MN-55790,US,MN,55790,6.875,,,, +US-MN-55791,US,MN,55791,6.875,,,, +US-MN-55792,US,MN,55792,6.875,,,, +US-MN-55793,US,MN,55793,6.875,,,, +US-MN-55795,US,MN,55795,6.875,,,, +US-MN-55796,US,MN,55796,6.875,,,, +US-MN-55797,US,MN,55797,6.875,,,, +US-MN-55798,US,MN,55798,6.875,,,, +US-MN-55801,US,MN,55801,7.875,,,, +US-MN-55802,US,MN,55802,7.875,,,, +US-MN-55803,US,MN,55803,7.875,,,, +US-MN-55804,US,MN,55804,7.875,,,, +US-MN-55805,US,MN,55805,7.875,,,, +US-MN-55806,US,MN,55806,7.875,,,, +US-MN-55807,US,MN,55807,7.875,,,, +US-MN-55808,US,MN,55808,7.875,,,, +US-MN-55810,US,MN,55810,7.375,,,, +US-MN-55811,US,MN,55811,7.875,,,, +US-MN-55812,US,MN,55812,7.875,,,, +US-MN-55814,US,MN,55814,7.875,,,, +US-MN-55815,US,MN,55815,7.875,,,, +US-MN-55816,US,MN,55816,7.875,,,, +US-MN-55901,US,MN,55901,7.375,,,, +US-MN-55902,US,MN,55902,7.375,,,, +US-MN-55903,US,MN,55903,7.375,,,, +US-MN-55904,US,MN,55904,7.375,,,, +US-MN-55905,US,MN,55905,6.875,,,, +US-MN-55906,US,MN,55906,7.375,,,, +US-MN-55909,US,MN,55909,6.875,,,, +US-MN-55910,US,MN,55910,6.875,,,, +US-MN-55912,US,MN,55912,7.375,,,, +US-MN-55917,US,MN,55917,6.875,,,, +US-MN-55918,US,MN,55918,6.875,,,, +US-MN-55919,US,MN,55919,6.875,,,, +US-MN-55920,US,MN,55920,6.875,,,, +US-MN-55921,US,MN,55921,6.875,,,, +US-MN-55922,US,MN,55922,6.875,,,, +US-MN-55923,US,MN,55923,6.875,,,, +US-MN-55924,US,MN,55924,6.875,,,, +US-MN-55925,US,MN,55925,6.875,,,, +US-MN-55926,US,MN,55926,6.875,,,, +US-MN-55927,US,MN,55927,6.875,,,, +US-MN-55929,US,MN,55929,6.875,,,, +US-MN-55931,US,MN,55931,6.875,,,, +US-MN-55932,US,MN,55932,6.875,,,, +US-MN-55933,US,MN,55933,6.875,,,, +US-MN-55934,US,MN,55934,6.875,,,, +US-MN-55935,US,MN,55935,6.875,,,, +US-MN-55936,US,MN,55936,6.875,,,, +US-MN-55939,US,MN,55939,6.875,,,, +US-MN-55940,US,MN,55940,6.875,,,, +US-MN-55941,US,MN,55941,6.875,,,, +US-MN-55942,US,MN,55942,6.875,,,, +US-MN-55943,US,MN,55943,6.875,,,, +US-MN-55944,US,MN,55944,6.875,,,, +US-MN-55945,US,MN,55945,6.875,,,, +US-MN-55946,US,MN,55946,6.875,,,, +US-MN-55947,US,MN,55947,6.875,,,, +US-MN-55949,US,MN,55949,6.875,,,, +US-MN-55950,US,MN,55950,6.875,,,, +US-MN-55951,US,MN,55951,6.875,,,, +US-MN-55952,US,MN,55952,6.875,,,, +US-MN-55953,US,MN,55953,6.875,,,, +US-MN-55954,US,MN,55954,6.875,,,, +US-MN-55955,US,MN,55955,6.875,,,, +US-MN-55956,US,MN,55956,6.875,,,, +US-MN-55957,US,MN,55957,6.875,,,, +US-MN-55959,US,MN,55959,6.875,,,, +US-MN-55960,US,MN,55960,6.875,,,, +US-MN-55961,US,MN,55961,6.875,,,, +US-MN-55962,US,MN,55962,6.875,,,, +US-MN-55963,US,MN,55963,6.875,,,, +US-MN-55964,US,MN,55964,6.875,,,, +US-MN-55965,US,MN,55965,6.875,,,, +US-MN-55967,US,MN,55967,6.875,,,, +US-MN-55968,US,MN,55968,6.875,,,, +US-MN-55969,US,MN,55969,6.875,,,, +US-MN-55970,US,MN,55970,6.875,,,, +US-MN-55971,US,MN,55971,6.875,,,, +US-MN-55972,US,MN,55972,6.875,,,, +US-MN-55973,US,MN,55973,6.875,,,, +US-MN-55974,US,MN,55974,6.875,,,, +US-MN-55975,US,MN,55975,6.875,,,, +US-MN-55976,US,MN,55976,6.875,,,, +US-MN-55977,US,MN,55977,6.875,,,, +US-MN-55979,US,MN,55979,6.875,,,, +US-MN-55981,US,MN,55981,6.875,,,, +US-MN-55982,US,MN,55982,6.875,,,, +US-MN-55983,US,MN,55983,6.875,,,, +US-MN-55985,US,MN,55985,6.875,,,, +US-MN-55987,US,MN,55987,6.875,,,, +US-MN-55988,US,MN,55988,6.875,,,, +US-MN-55990,US,MN,55990,6.875,,,, +US-MN-55991,US,MN,55991,6.875,,,, +US-MN-55992,US,MN,55992,6.875,,,, +US-MN-56001,US,MN,56001,7.375,,,, +US-MN-56002,US,MN,56002,7.375,,,, +US-MN-56003,US,MN,56003,7.375,,,, +US-MN-56006,US,MN,56006,7.375,,,, +US-MN-56007,US,MN,56007,7.375,,,, +US-MN-56009,US,MN,56009,6.875,,,, +US-MN-56010,US,MN,56010,6.875,,,, +US-MN-56011,US,MN,56011,6.875,,,, +US-MN-56013,US,MN,56013,6.875,,,, +US-MN-56014,US,MN,56014,6.875,,,, +US-MN-56016,US,MN,56016,6.875,,,, +US-MN-56017,US,MN,56017,6.875,,,, +US-MN-56019,US,MN,56019,6.875,,,, +US-MN-56020,US,MN,56020,6.875,,,, +US-MN-56021,US,MN,56021,6.875,,,, +US-MN-56022,US,MN,56022,6.875,,,, +US-MN-56023,US,MN,56023,6.875,,,, +US-MN-56024,US,MN,56024,6.875,,,, +US-MN-56025,US,MN,56025,6.875,,,, +US-MN-56026,US,MN,56026,6.875,,,, +US-MN-56027,US,MN,56027,6.875,,,, +US-MN-56028,US,MN,56028,6.875,,,, +US-MN-56029,US,MN,56029,6.875,,,, +US-MN-56030,US,MN,56030,6.875,,,, +US-MN-56031,US,MN,56031,6.875,,,, +US-MN-56032,US,MN,56032,6.875,,,, +US-MN-56033,US,MN,56033,6.875,,,, +US-MN-56034,US,MN,56034,6.875,,,, +US-MN-56035,US,MN,56035,6.875,,,, +US-MN-56036,US,MN,56036,6.875,,,, +US-MN-56037,US,MN,56037,6.875,,,, +US-MN-56039,US,MN,56039,6.875,,,, +US-MN-56041,US,MN,56041,6.875,,,, +US-MN-56042,US,MN,56042,6.875,,,, +US-MN-56043,US,MN,56043,6.875,,,, +US-MN-56044,US,MN,56044,6.875,,,, +US-MN-56045,US,MN,56045,6.875,,,, +US-MN-56046,US,MN,56046,6.875,,,, +US-MN-56047,US,MN,56047,6.875,,,, +US-MN-56048,US,MN,56048,6.875,,,, +US-MN-56050,US,MN,56050,6.875,,,, +US-MN-56051,US,MN,56051,6.875,,,, +US-MN-56052,US,MN,56052,6.875,,,, +US-MN-56054,US,MN,56054,6.875,,,, +US-MN-56055,US,MN,56055,6.875,,,, +US-MN-56056,US,MN,56056,6.875,,,, +US-MN-56057,US,MN,56057,6.875,,,, +US-MN-56058,US,MN,56058,6.875,,,, +US-MN-56060,US,MN,56060,6.875,,,, +US-MN-56062,US,MN,56062,6.875,,,, +US-MN-56063,US,MN,56063,6.875,,,, +US-MN-56065,US,MN,56065,6.875,,,, +US-MN-56068,US,MN,56068,6.875,,,, +US-MN-56069,US,MN,56069,6.875,,,, +US-MN-56071,US,MN,56071,6.875,,,, +US-MN-56072,US,MN,56072,6.875,,,, +US-MN-56073,US,MN,56073,7.375,,,, +US-MN-56074,US,MN,56074,6.875,,,, +US-MN-56075,US,MN,56075,6.875,,,, +US-MN-56078,US,MN,56078,6.875,,,, +US-MN-56080,US,MN,56080,6.875,,,, +US-MN-56081,US,MN,56081,6.875,,,, +US-MN-56082,US,MN,56082,6.875,,,, +US-MN-56083,US,MN,56083,6.875,,,, +US-MN-56084,US,MN,56084,7.375,,,, +US-MN-56085,US,MN,56085,6.875,,,, +US-MN-56087,US,MN,56087,6.875,,,, +US-MN-56088,US,MN,56088,6.875,,,, +US-MN-56089,US,MN,56089,6.875,,,, +US-MN-56090,US,MN,56090,6.875,,,, +US-MN-56091,US,MN,56091,6.875,,,, +US-MN-56093,US,MN,56093,6.875,,,, +US-MN-56096,US,MN,56096,6.875,,,, +US-MN-56097,US,MN,56097,6.875,,,, +US-MN-56098,US,MN,56098,6.875,,,, +US-MN-56101,US,MN,56101,6.875,,,, +US-MN-56110,US,MN,56110,6.875,,,, +US-MN-56111,US,MN,56111,6.875,,,, +US-MN-56113,US,MN,56113,6.875,,,, +US-MN-56114,US,MN,56114,6.875,,,, +US-MN-56115,US,MN,56115,6.875,,,, +US-MN-56116,US,MN,56116,6.875,,,, +US-MN-56117,US,MN,56117,6.875,,,, +US-MN-56118,US,MN,56118,6.875,,,, +US-MN-56119,US,MN,56119,6.875,,,, +US-MN-56120,US,MN,56120,6.875,,,, +US-MN-56121,US,MN,56121,6.875,,,, +US-MN-56122,US,MN,56122,6.875,,,, +US-MN-56123,US,MN,56123,6.875,,,, +US-MN-56125,US,MN,56125,6.875,,,, +US-MN-56127,US,MN,56127,6.875,,,, +US-MN-56128,US,MN,56128,6.875,,,, +US-MN-56129,US,MN,56129,6.875,,,, +US-MN-56131,US,MN,56131,6.875,,,, +US-MN-56132,US,MN,56132,6.875,,,, +US-MN-56134,US,MN,56134,6.875,,,, +US-MN-56136,US,MN,56136,6.875,,,, +US-MN-56137,US,MN,56137,6.875,,,, +US-MN-56138,US,MN,56138,6.875,,,, +US-MN-56139,US,MN,56139,6.875,,,, +US-MN-56140,US,MN,56140,6.875,,,, +US-MN-56141,US,MN,56141,6.875,,,, +US-MN-56142,US,MN,56142,6.875,,,, +US-MN-56143,US,MN,56143,6.875,,,, +US-MN-56144,US,MN,56144,6.875,,,, +US-MN-56145,US,MN,56145,6.875,,,, +US-MN-56146,US,MN,56146,6.875,,,, +US-MN-56147,US,MN,56147,6.875,,,, +US-MN-56149,US,MN,56149,6.875,,,, +US-MN-56150,US,MN,56150,6.875,,,, +US-MN-56151,US,MN,56151,6.875,,,, +US-MN-56152,US,MN,56152,6.875,,,, +US-MN-56153,US,MN,56153,6.875,,,, +US-MN-56155,US,MN,56155,6.875,,,, +US-MN-56156,US,MN,56156,6.875,,,, +US-MN-56157,US,MN,56157,6.875,,,, +US-MN-56158,US,MN,56158,6.875,,,, +US-MN-56159,US,MN,56159,6.875,,,, +US-MN-56160,US,MN,56160,6.875,,,, +US-MN-56161,US,MN,56161,6.875,,,, +US-MN-56162,US,MN,56162,6.875,,,, +US-MN-56164,US,MN,56164,6.875,,,, +US-MN-56165,US,MN,56165,6.875,,,, +US-MN-56166,US,MN,56166,6.875,,,, +US-MN-56167,US,MN,56167,6.875,,,, +US-MN-56168,US,MN,56168,6.875,,,, +US-MN-56169,US,MN,56169,6.875,,,, +US-MN-56170,US,MN,56170,6.875,,,, +US-MN-56171,US,MN,56171,6.875,,,, +US-MN-56172,US,MN,56172,6.875,,,, +US-MN-56173,US,MN,56173,6.875,,,, +US-MN-56174,US,MN,56174,6.875,,,, +US-MN-56175,US,MN,56175,6.875,,,, +US-MN-56176,US,MN,56176,6.875,,,, +US-MN-56177,US,MN,56177,6.875,,,, +US-MN-56178,US,MN,56178,6.875,,,, +US-MN-56180,US,MN,56180,6.875,,,, +US-MN-56181,US,MN,56181,6.875,,,, +US-MN-56183,US,MN,56183,6.875,,,, +US-MN-56185,US,MN,56185,6.875,,,, +US-MN-56186,US,MN,56186,6.875,,,, +US-MN-56187,US,MN,56187,7.375,,,, +US-MN-56201,US,MN,56201,6.875,,,, +US-MN-56207,US,MN,56207,6.875,,,, +US-MN-56208,US,MN,56208,6.875,,,, +US-MN-56209,US,MN,56209,6.875,,,, +US-MN-56210,US,MN,56210,6.875,,,, +US-MN-56211,US,MN,56211,6.875,,,, +US-MN-56212,US,MN,56212,6.875,,,, +US-MN-56214,US,MN,56214,6.875,,,, +US-MN-56215,US,MN,56215,6.875,,,, +US-MN-56216,US,MN,56216,6.875,,,, +US-MN-56218,US,MN,56218,6.875,,,, +US-MN-56219,US,MN,56219,6.875,,,, +US-MN-56220,US,MN,56220,6.875,,,, +US-MN-56221,US,MN,56221,6.875,,,, +US-MN-56222,US,MN,56222,6.875,,,, +US-MN-56223,US,MN,56223,6.875,,,, +US-MN-56224,US,MN,56224,6.875,,,, +US-MN-56225,US,MN,56225,6.875,,,, +US-MN-56226,US,MN,56226,6.875,,,, +US-MN-56227,US,MN,56227,6.875,,,, +US-MN-56228,US,MN,56228,6.875,,,, +US-MN-56229,US,MN,56229,6.875,,,, +US-MN-56230,US,MN,56230,6.875,,,, +US-MN-56231,US,MN,56231,6.875,,,, +US-MN-56232,US,MN,56232,6.875,,,, +US-MN-56235,US,MN,56235,6.875,,,, +US-MN-56236,US,MN,56236,6.875,,,, +US-MN-56237,US,MN,56237,6.875,,,, +US-MN-56239,US,MN,56239,6.875,,,, +US-MN-56240,US,MN,56240,6.875,,,, +US-MN-56241,US,MN,56241,6.875,,,, +US-MN-56243,US,MN,56243,6.875,,,, +US-MN-56244,US,MN,56244,6.875,,,, +US-MN-56245,US,MN,56245,6.875,,,, +US-MN-56248,US,MN,56248,6.875,,,, +US-MN-56249,US,MN,56249,6.875,,,, +US-MN-56251,US,MN,56251,6.875,,,, +US-MN-56252,US,MN,56252,6.875,,,, +US-MN-56253,US,MN,56253,6.875,,,, +US-MN-56255,US,MN,56255,6.875,,,, +US-MN-56256,US,MN,56256,6.875,,,, +US-MN-56257,US,MN,56257,6.875,,,, +US-MN-56258,US,MN,56258,7.375,,,, +US-MN-56260,US,MN,56260,6.875,,,, +US-MN-56262,US,MN,56262,6.875,,,, +US-MN-56263,US,MN,56263,6.875,,,, +US-MN-56264,US,MN,56264,6.875,,,, +US-MN-56265,US,MN,56265,6.875,,,, +US-MN-56266,US,MN,56266,6.875,,,, +US-MN-56267,US,MN,56267,6.875,,,, +US-MN-56270,US,MN,56270,6.875,,,, +US-MN-56271,US,MN,56271,6.875,,,, +US-MN-56273,US,MN,56273,6.875,,,, +US-MN-56274,US,MN,56274,6.875,,,, +US-MN-56276,US,MN,56276,6.875,,,, +US-MN-56277,US,MN,56277,6.875,,,, +US-MN-56278,US,MN,56278,6.875,,,, +US-MN-56279,US,MN,56279,6.875,,,, +US-MN-56280,US,MN,56280,6.875,,,, +US-MN-56281,US,MN,56281,6.875,,,, +US-MN-56282,US,MN,56282,6.875,,,, +US-MN-56283,US,MN,56283,6.875,,,, +US-MN-56284,US,MN,56284,6.875,,,, +US-MN-56285,US,MN,56285,6.875,,,, +US-MN-56287,US,MN,56287,6.875,,,, +US-MN-56288,US,MN,56288,6.875,,,, +US-MN-56289,US,MN,56289,6.875,,,, +US-MN-56291,US,MN,56291,6.875,,,, +US-MN-56292,US,MN,56292,6.875,,,, +US-MN-56293,US,MN,56293,6.875,,,, +US-MN-56294,US,MN,56294,6.875,,,, +US-MN-56295,US,MN,56295,6.875,,,, +US-MN-56296,US,MN,56296,6.875,,,, +US-MN-56297,US,MN,56297,6.875,,,, +US-MN-56301,US,MN,56301,7.375,,,, +US-MN-56302,US,MN,56302,7.375,,,, +US-MN-56303,US,MN,56303,7.375,,,, +US-MN-56304,US,MN,56304,7.375,,,, +US-MN-56307,US,MN,56307,6.875,,,, +US-MN-56308,US,MN,56308,6.875,,,, +US-MN-56309,US,MN,56309,6.875,,,, +US-MN-56310,US,MN,56310,6.875,,,, +US-MN-56311,US,MN,56311,6.875,,,, +US-MN-56312,US,MN,56312,6.875,,,, +US-MN-56313,US,MN,56313,6.875,,,, +US-MN-56314,US,MN,56314,6.875,,,, +US-MN-56315,US,MN,56315,6.875,,,, +US-MN-56316,US,MN,56316,6.875,,,, +US-MN-56317,US,MN,56317,6.875,,,, +US-MN-56318,US,MN,56318,6.875,,,, +US-MN-56319,US,MN,56319,6.875,,,, +US-MN-56320,US,MN,56320,6.875,,,, +US-MN-56321,US,MN,56321,6.875,,,, +US-MN-56323,US,MN,56323,6.875,,,, +US-MN-56324,US,MN,56324,6.875,,,, +US-MN-56325,US,MN,56325,6.875,,,, +US-MN-56326,US,MN,56326,6.875,,,, +US-MN-56327,US,MN,56327,6.875,,,, +US-MN-56328,US,MN,56328,6.875,,,, +US-MN-56329,US,MN,56329,6.875,,,, +US-MN-56330,US,MN,56330,6.875,,,, +US-MN-56331,US,MN,56331,6.875,,,, +US-MN-56332,US,MN,56332,6.875,,,, +US-MN-56333,US,MN,56333,6.875,,,, +US-MN-56334,US,MN,56334,6.875,,,, +US-MN-56335,US,MN,56335,6.875,,,, +US-MN-56336,US,MN,56336,6.875,,,, +US-MN-56338,US,MN,56338,6.875,,,, +US-MN-56339,US,MN,56339,6.875,,,, +US-MN-56340,US,MN,56340,6.875,,,, +US-MN-56341,US,MN,56341,6.875,,,, +US-MN-56342,US,MN,56342,6.875,,,, +US-MN-56343,US,MN,56343,6.875,,,, +US-MN-56344,US,MN,56344,6.875,,,, +US-MN-56345,US,MN,56345,6.875,,,, +US-MN-56347,US,MN,56347,6.875,,,, +US-MN-56349,US,MN,56349,6.875,,,, +US-MN-56350,US,MN,56350,6.875,,,, +US-MN-56352,US,MN,56352,6.875,,,, +US-MN-56353,US,MN,56353,6.875,,,, +US-MN-56354,US,MN,56354,6.875,,,, +US-MN-56355,US,MN,56355,6.875,,,, +US-MN-56356,US,MN,56356,6.875,,,, +US-MN-56357,US,MN,56357,6.875,,,, +US-MN-56358,US,MN,56358,6.875,,,, +US-MN-56359,US,MN,56359,6.875,,,, +US-MN-56360,US,MN,56360,6.875,,,, +US-MN-56361,US,MN,56361,6.875,,,, +US-MN-56362,US,MN,56362,6.875,,,, +US-MN-56363,US,MN,56363,6.875,,,, +US-MN-56364,US,MN,56364,6.875,,,, +US-MN-56367,US,MN,56367,6.875,,,, +US-MN-56368,US,MN,56368,6.875,,,, +US-MN-56369,US,MN,56369,6.875,,,, +US-MN-56371,US,MN,56371,6.875,,,, +US-MN-56372,US,MN,56372,7.375,,,, +US-MN-56373,US,MN,56373,6.875,,,, +US-MN-56374,US,MN,56374,6.875,,,, +US-MN-56375,US,MN,56375,6.875,,,, +US-MN-56376,US,MN,56376,6.875,,,, +US-MN-56377,US,MN,56377,7.375,,,, +US-MN-56378,US,MN,56378,6.875,,,, +US-MN-56379,US,MN,56379,7.375,,,, +US-MN-56381,US,MN,56381,6.875,,,, +US-MN-56382,US,MN,56382,6.875,,,, +US-MN-56384,US,MN,56384,6.875,,,, +US-MN-56385,US,MN,56385,6.875,,,, +US-MN-56386,US,MN,56386,6.875,,,, +US-MN-56387,US,MN,56387,7.375,,,, +US-MN-56388,US,MN,56388,7.375,,,, +US-MN-56389,US,MN,56389,6.875,,,, +US-MN-56393,US,MN,56393,7.375,,,, +US-MN-56395,US,MN,56395,7.375,,,, +US-MN-56396,US,MN,56396,7.375,,,, +US-MN-56397,US,MN,56397,7.375,,,, +US-MN-56398,US,MN,56398,7.375,,,, +US-MN-56399,US,MN,56399,7.375,,,, +US-MN-56401,US,MN,56401,6.875,,,, +US-MN-56425,US,MN,56425,7.375,,,, +US-MN-56430,US,MN,56430,6.875,,,, +US-MN-56431,US,MN,56431,6.875,,,, +US-MN-56433,US,MN,56433,6.875,,,, +US-MN-56434,US,MN,56434,6.875,,,, +US-MN-56435,US,MN,56435,6.875,,,, +US-MN-56436,US,MN,56436,6.875,,,, +US-MN-56437,US,MN,56437,6.875,,,, +US-MN-56438,US,MN,56438,6.875,,,, +US-MN-56440,US,MN,56440,6.875,,,, +US-MN-56441,US,MN,56441,6.875,,,, +US-MN-56442,US,MN,56442,6.875,,,, +US-MN-56443,US,MN,56443,6.875,,,, +US-MN-56444,US,MN,56444,6.875,,,, +US-MN-56446,US,MN,56446,6.875,,,, +US-MN-56447,US,MN,56447,6.875,,,, +US-MN-56448,US,MN,56448,6.875,,,, +US-MN-56449,US,MN,56449,6.875,,,, +US-MN-56450,US,MN,56450,6.875,,,, +US-MN-56452,US,MN,56452,6.875,,,, +US-MN-56453,US,MN,56453,6.875,,,, +US-MN-56455,US,MN,56455,6.875,,,, +US-MN-56456,US,MN,56456,6.875,,,, +US-MN-56458,US,MN,56458,6.875,,,, +US-MN-56459,US,MN,56459,6.875,,,, +US-MN-56461,US,MN,56461,6.875,,,, +US-MN-56464,US,MN,56464,6.875,,,, +US-MN-56465,US,MN,56465,6.875,,,, +US-MN-56466,US,MN,56466,6.875,,,, +US-MN-56467,US,MN,56467,6.875,,,, +US-MN-56468,US,MN,56468,6.875,,,, +US-MN-56469,US,MN,56469,6.875,,,, +US-MN-56470,US,MN,56470,6.875,,,, +US-MN-56472,US,MN,56472,6.875,,,, +US-MN-56473,US,MN,56473,6.875,,,, +US-MN-56474,US,MN,56474,6.875,,,, +US-MN-56475,US,MN,56475,6.875,,,, +US-MN-56477,US,MN,56477,6.875,,,, +US-MN-56478,US,MN,56478,6.875,,,, +US-MN-56479,US,MN,56479,6.875,,,, +US-MN-56481,US,MN,56481,6.875,,,, +US-MN-56482,US,MN,56482,6.875,,,, +US-MN-56484,US,MN,56484,6.875,,,, +US-MN-56501,US,MN,56501,6.875,,,, +US-MN-56502,US,MN,56502,6.875,,,, +US-MN-56510,US,MN,56510,6.875,,,, +US-MN-56511,US,MN,56511,6.875,,,, +US-MN-56514,US,MN,56514,6.875,,,, +US-MN-56515,US,MN,56515,6.875,,,, +US-MN-56516,US,MN,56516,6.875,,,, +US-MN-56517,US,MN,56517,6.875,,,, +US-MN-56518,US,MN,56518,6.875,,,, +US-MN-56519,US,MN,56519,6.875,,,, +US-MN-56520,US,MN,56520,6.875,,,, +US-MN-56521,US,MN,56521,6.875,,,, +US-MN-56522,US,MN,56522,6.875,,,, +US-MN-56523,US,MN,56523,6.875,,,, +US-MN-56524,US,MN,56524,6.875,,,, +US-MN-56525,US,MN,56525,6.875,,,, +US-MN-56527,US,MN,56527,6.875,,,, +US-MN-56528,US,MN,56528,6.875,,,, +US-MN-56529,US,MN,56529,6.875,,,, +US-MN-56531,US,MN,56531,6.875,,,, +US-MN-56533,US,MN,56533,6.875,,,, +US-MN-56534,US,MN,56534,6.875,,,, +US-MN-56535,US,MN,56535,6.875,,,, +US-MN-56536,US,MN,56536,6.875,,,, +US-MN-56537,US,MN,56537,7.375,,,, +US-MN-56538,US,MN,56538,7.375,,,, +US-MN-56540,US,MN,56540,6.875,,,, +US-MN-56541,US,MN,56541,6.875,,,, +US-MN-56542,US,MN,56542,6.875,,,, +US-MN-56543,US,MN,56543,6.875,,,, +US-MN-56544,US,MN,56544,6.875,,,, +US-MN-56545,US,MN,56545,6.875,,,, +US-MN-56546,US,MN,56546,6.875,,,, +US-MN-56547,US,MN,56547,6.875,,,, +US-MN-56548,US,MN,56548,6.875,,,, +US-MN-56549,US,MN,56549,6.875,,,, +US-MN-56550,US,MN,56550,6.875,,,, +US-MN-56551,US,MN,56551,6.875,,,, +US-MN-56552,US,MN,56552,6.875,,,, +US-MN-56553,US,MN,56553,6.875,,,, +US-MN-56554,US,MN,56554,6.875,,,, +US-MN-56556,US,MN,56556,6.875,,,, +US-MN-56557,US,MN,56557,6.875,,,, +US-MN-56560,US,MN,56560,6.875,,,, +US-MN-56561,US,MN,56561,6.875,,,, +US-MN-56562,US,MN,56562,6.875,,,, +US-MN-56563,US,MN,56563,6.875,,,, +US-MN-56565,US,MN,56565,6.875,,,, +US-MN-56566,US,MN,56566,6.875,,,, +US-MN-56567,US,MN,56567,6.875,,,, +US-MN-56568,US,MN,56568,6.875,,,, +US-MN-56569,US,MN,56569,6.875,,,, +US-MN-56570,US,MN,56570,6.875,,,, +US-MN-56571,US,MN,56571,6.875,,,, +US-MN-56572,US,MN,56572,6.875,,,, +US-MN-56573,US,MN,56573,6.875,,,, +US-MN-56574,US,MN,56574,6.875,,,, +US-MN-56575,US,MN,56575,6.875,,,, +US-MN-56576,US,MN,56576,6.875,,,, +US-MN-56577,US,MN,56577,6.875,,,, +US-MN-56578,US,MN,56578,6.875,,,, +US-MN-56579,US,MN,56579,6.875,,,, +US-MN-56580,US,MN,56580,6.875,,,, +US-MN-56581,US,MN,56581,6.875,,,, +US-MN-56583,US,MN,56583,6.875,,,, +US-MN-56584,US,MN,56584,6.875,,,, +US-MN-56585,US,MN,56585,6.875,,,, +US-MN-56586,US,MN,56586,6.875,,,, +US-MN-56587,US,MN,56587,6.875,,,, +US-MN-56588,US,MN,56588,6.875,,,, +US-MN-56589,US,MN,56589,6.875,,,, +US-MN-56590,US,MN,56590,6.875,,,, +US-MN-56591,US,MN,56591,6.875,,,, +US-MN-56592,US,MN,56592,6.875,,,, +US-MN-56593,US,MN,56593,6.875,,,, +US-MN-56594,US,MN,56594,6.875,,,, +US-MN-56601,US,MN,56601,6.875,,,, +US-MN-56619,US,MN,56619,7.375,,,, +US-MN-56621,US,MN,56621,6.875,,,, +US-MN-56623,US,MN,56623,6.875,,,, +US-MN-56626,US,MN,56626,6.875,,,, +US-MN-56627,US,MN,56627,6.875,,,, +US-MN-56628,US,MN,56628,6.875,,,, +US-MN-56629,US,MN,56629,6.875,,,, +US-MN-56630,US,MN,56630,6.875,,,, +US-MN-56631,US,MN,56631,7.375,,,, +US-MN-56633,US,MN,56633,6.875,,,, +US-MN-56634,US,MN,56634,6.875,,,, +US-MN-56636,US,MN,56636,6.875,,,, +US-MN-56637,US,MN,56637,6.875,,,, +US-MN-56639,US,MN,56639,6.875,,,, +US-MN-56641,US,MN,56641,6.875,,,, +US-MN-56644,US,MN,56644,6.875,,,, +US-MN-56646,US,MN,56646,6.875,,,, +US-MN-56647,US,MN,56647,6.875,,,, +US-MN-56649,US,MN,56649,6.875,,,, +US-MN-56650,US,MN,56650,6.875,,,, +US-MN-56651,US,MN,56651,6.875,,,, +US-MN-56652,US,MN,56652,6.875,,,, +US-MN-56653,US,MN,56653,6.875,,,, +US-MN-56654,US,MN,56654,6.875,,,, +US-MN-56655,US,MN,56655,6.875,,,, +US-MN-56657,US,MN,56657,6.875,,,, +US-MN-56658,US,MN,56658,6.875,,,, +US-MN-56659,US,MN,56659,6.875,,,, +US-MN-56660,US,MN,56660,6.875,,,, +US-MN-56661,US,MN,56661,6.875,,,, +US-MN-56662,US,MN,56662,6.875,,,, +US-MN-56663,US,MN,56663,6.875,,,, +US-MN-56666,US,MN,56666,6.875,,,, +US-MN-56667,US,MN,56667,6.875,,,, +US-MN-56668,US,MN,56668,6.875,,,, +US-MN-56669,US,MN,56669,6.875,,,, +US-MN-56670,US,MN,56670,6.875,,,, +US-MN-56671,US,MN,56671,6.875,,,, +US-MN-56672,US,MN,56672,6.875,,,, +US-MN-56673,US,MN,56673,6.875,,,, +US-MN-56676,US,MN,56676,6.875,,,, +US-MN-56678,US,MN,56678,6.875,,,, +US-MN-56679,US,MN,56679,6.875,,,, +US-MN-56680,US,MN,56680,6.875,,,, +US-MN-56681,US,MN,56681,6.875,,,, +US-MN-56682,US,MN,56682,6.875,,,, +US-MN-56683,US,MN,56683,6.875,,,, +US-MN-56684,US,MN,56684,6.875,,,, +US-MN-56685,US,MN,56685,6.875,,,, +US-MN-56686,US,MN,56686,6.875,,,, +US-MN-56687,US,MN,56687,6.875,,,, +US-MN-56688,US,MN,56688,6.875,,,, +US-MN-56701,US,MN,56701,6.875,,,, +US-MN-56710,US,MN,56710,6.875,,,, +US-MN-56711,US,MN,56711,6.875,,,, +US-MN-56713,US,MN,56713,6.875,,,, +US-MN-56714,US,MN,56714,6.875,,,, +US-MN-56715,US,MN,56715,6.875,,,, +US-MN-56716,US,MN,56716,6.875,,,, +US-MN-56720,US,MN,56720,6.875,,,, +US-MN-56721,US,MN,56721,6.875,,,, +US-MN-56722,US,MN,56722,6.875,,,, +US-MN-56723,US,MN,56723,6.875,,,, +US-MN-56724,US,MN,56724,6.875,,,, +US-MN-56725,US,MN,56725,6.875,,,, +US-MN-56726,US,MN,56726,6.875,,,, +US-MN-56727,US,MN,56727,6.875,,,, +US-MN-56728,US,MN,56728,6.875,,,, +US-MN-56729,US,MN,56729,6.875,,,, +US-MN-56731,US,MN,56731,6.875,,,, +US-MN-56732,US,MN,56732,6.875,,,, +US-MN-56733,US,MN,56733,6.875,,,, +US-MN-56734,US,MN,56734,6.875,,,, +US-MN-56735,US,MN,56735,6.875,,,, +US-MN-56736,US,MN,56736,6.875,,,, +US-MN-56737,US,MN,56737,6.875,,,, +US-MN-56738,US,MN,56738,6.875,,,, +US-MN-56740,US,MN,56740,6.875,,,, +US-MN-56741,US,MN,56741,6.875,,,, +US-MN-56742,US,MN,56742,6.875,,,, +US-MN-56744,US,MN,56744,6.875,,,, +US-MN-56748,US,MN,56748,6.875,,,, +US-MN-56750,US,MN,56750,6.875,,,, +US-MN-56751,US,MN,56751,6.875,,,, +US-MN-56754,US,MN,56754,6.875,,,, +US-MN-56755,US,MN,56755,6.875,,,, +US-MN-56756,US,MN,56756,6.875,,,, +US-MN-56757,US,MN,56757,6.875,,,, +US-MN-56758,US,MN,56758,6.875,,,, +US-MN-56759,US,MN,56759,6.875,,,, +US-MN-56760,US,MN,56760,6.875,,,, +US-MN-56761,US,MN,56761,6.875,,,, +US-MN-56762,US,MN,56762,6.875,,,, +US-MN-56763,US,MN,56763,6.875,,,, +US-MO-63005,US,MO,63005,8.113,,,, +US-MO-63006,US,MO,63006,8.113,,,, +US-MO-63010,US,MO,63010,8.35,,,, +US-MO-63011,US,MO,63011,8.113,,,, +US-MO-63012,US,MO,63012,7.1,,,, +US-MO-63013,US,MO,63013,6.475,,,, +US-MO-63014,US,MO,63014,6.475,,,, +US-MO-63015,US,MO,63015,6.475,,,, +US-MO-63016,US,MO,63016,6.85,,,, +US-MO-63017,US,MO,63017,8.113,,,, +US-MO-63019,US,MO,63019,8.6,,,, +US-MO-63020,US,MO,63020,6.35,,,, +US-MO-63021,US,MO,63021,7.113,,,, +US-MO-63022,US,MO,63022,8.113,,,, +US-MO-63023,US,MO,63023,6.85,,,, +US-MO-63024,US,MO,63024,8.113,,,, +US-MO-63025,US,MO,63025,8.113,,,, +US-MO-63026,US,MO,63026,7.113,,,, +US-MO-63028,US,MO,63028,6.85,,,, +US-MO-63030,US,MO,63030,6.35,,,, +US-MO-63031,US,MO,63031,8.113,,,, +US-MO-63032,US,MO,63032,8.113,,,, +US-MO-63033,US,MO,63033,8.113,,,, +US-MO-63034,US,MO,63034,7.113,,,, +US-MO-63036,US,MO,63036,5.975,,,, +US-MO-63037,US,MO,63037,6.475,,,, +US-MO-63038,US,MO,63038,7.613,,,, +US-MO-63039,US,MO,63039,6.475,,,, +US-MO-63040,US,MO,63040,7.613,,,, +US-MO-63041,US,MO,63041,6.975,,,, +US-MO-63042,US,MO,63042,8.613,,,, +US-MO-63043,US,MO,63043,7.613,,,, +US-MO-63044,US,MO,63044,8.113,,,, +US-MO-63045,US,MO,63045,7.113,,,, +US-MO-63047,US,MO,63047,6.85,,,, +US-MO-63048,US,MO,63048,9.35,,,, +US-MO-63049,US,MO,63049,6.85,,,, +US-MO-63050,US,MO,63050,6.35,,,, +US-MO-63051,US,MO,63051,7.35,,,, +US-MO-63052,US,MO,63052,7.1,,,, +US-MO-63053,US,MO,63053,8.6,,,, +US-MO-63055,US,MO,63055,6.475,,,, +US-MO-63056,US,MO,63056,6.475,,,, +US-MO-63057,US,MO,63057,7.1,,,, +US-MO-63060,US,MO,63060,6.975,,,, +US-MO-63061,US,MO,63061,6.975,,,, +US-MO-63065,US,MO,63065,6.85,,,, +US-MO-63066,US,MO,63066,6.85,,,, +US-MO-63068,US,MO,63068,6.475,,,, +US-MO-63069,US,MO,63069,7.975,,,, +US-MO-63070,US,MO,63070,8.85,,,, +US-MO-63071,US,MO,63071,7.225,,,, +US-MO-63072,US,MO,63072,6.475,,,, +US-MO-63073,US,MO,63073,6.475,,,, +US-MO-63074,US,MO,63074,8.863,,,, +US-MO-63077,US,MO,63077,6.975,,,, +US-MO-63079,US,MO,63079,6.475,,,, +US-MO-63080,US,MO,63080,8.475,,,, +US-MO-63084,US,MO,63084,8.475,,,, +US-MO-63087,US,MO,63087,5.975,,,, +US-MO-63088,US,MO,63088,8.113,,,, +US-MO-63089,US,MO,63089,6.475,,,, +US-MO-63090,US,MO,63090,8.35,,,, +US-MO-63091,US,MO,63091,7.6,,,, +US-MO-63099,US,MO,63099,7.113,,,, +US-MO-63101,US,MO,63101,8.679,,,, +US-MO-63102,US,MO,63102,8.679,,,, +US-MO-63103,US,MO,63103,8.679,,,, +US-MO-63104,US,MO,63104,8.679,,,, +US-MO-63105,US,MO,63105,8.363,,,, +US-MO-63106,US,MO,63106,8.679,,,, +US-MO-63107,US,MO,63107,8.679,,,, +US-MO-63108,US,MO,63108,8.679,,,, +US-MO-63109,US,MO,63109,8.679,,,, +US-MO-63110,US,MO,63110,8.679,,,, +US-MO-63111,US,MO,63111,8.679,,,, +US-MO-63112,US,MO,63112,8.679,,,, +US-MO-63113,US,MO,63113,8.679,,,, +US-MO-63114,US,MO,63114,7.863,,,, +US-MO-63115,US,MO,63115,8.679,,,, +US-MO-63116,US,MO,63116,8.679,,,, +US-MO-63117,US,MO,63117,8.613,,,, +US-MO-63118,US,MO,63118,8.679,,,, +US-MO-63119,US,MO,63119,8.613,,,, +US-MO-63120,US,MO,63120,8.679,,,, +US-MO-63121,US,MO,63121,8.613,,,, +US-MO-63122,US,MO,63122,8.363,,,, +US-MO-63123,US,MO,63123,7.113,,,, +US-MO-63124,US,MO,63124,8.363,,,, +US-MO-63125,US,MO,63125,7.113,,,, +US-MO-63126,US,MO,63126,8.613,,,, +US-MO-63127,US,MO,63127,8.363,,,, +US-MO-63128,US,MO,63128,7.113,,,, +US-MO-63129,US,MO,63129,7.113,,,, +US-MO-63130,US,MO,63130,8.613,,,, +US-MO-63131,US,MO,63131,8.613,,,, +US-MO-63132,US,MO,63132,8.613,,,, +US-MO-63133,US,MO,63133,7.863,,,, +US-MO-63134,US,MO,63134,9.113,,,, +US-MO-63135,US,MO,63135,8.613,,,, +US-MO-63136,US,MO,63136,7.113,,,, +US-MO-63137,US,MO,63137,7.613,,,, +US-MO-63138,US,MO,63138,7.113,,,, +US-MO-63139,US,MO,63139,8.679,,,, +US-MO-63140,US,MO,63140,8.363,,,, +US-MO-63141,US,MO,63141,7.863,,,, +US-MO-63143,US,MO,63143,8.613,,,, +US-MO-63144,US,MO,63144,8.613,,,, +US-MO-63145,US,MO,63145,9.113,,,, +US-MO-63146,US,MO,63146,7.113,,,, +US-MO-63147,US,MO,63147,8.679,,,, +US-MO-63150,US,MO,63150,8.679,,,, +US-MO-63151,US,MO,63151,7.113,,,, +US-MO-63155,US,MO,63155,8.679,,,, +US-MO-63156,US,MO,63156,8.679,,,, +US-MO-63157,US,MO,63157,8.679,,,, +US-MO-63158,US,MO,63158,8.679,,,, +US-MO-63160,US,MO,63160,8.679,,,, +US-MO-63163,US,MO,63163,8.679,,,, +US-MO-63166,US,MO,63166,8.679,,,, +US-MO-63167,US,MO,63167,7.863,,,, +US-MO-63169,US,MO,63169,8.679,,,, +US-MO-63171,US,MO,63171,8.679,,,, +US-MO-63177,US,MO,63177,8.679,,,, +US-MO-63178,US,MO,63178,8.679,,,, +US-MO-63179,US,MO,63179,8.679,,,, +US-MO-63180,US,MO,63180,8.679,,,, +US-MO-63182,US,MO,63182,8.679,,,, +US-MO-63188,US,MO,63188,8.679,,,, +US-MO-63195,US,MO,63195,8.679,,,, +US-MO-63197,US,MO,63197,8.679,,,, +US-MO-63199,US,MO,63199,8.679,,,, +US-MO-63301,US,MO,63301,7.45,,,, +US-MO-63302,US,MO,63302,7.45,,,, +US-MO-63303,US,MO,63303,7.45,,,, +US-MO-63304,US,MO,63304,5.95,,,, +US-MO-63330,US,MO,63330,6.225,,,, +US-MO-63332,US,MO,63332,5.95,,,, +US-MO-63333,US,MO,63333,5.975,,,, +US-MO-63334,US,MO,63334,6.225,,,, +US-MO-63336,US,MO,63336,6.225,,,, +US-MO-63338,US,MO,63338,8.95,,,, +US-MO-63339,US,MO,63339,6.225,,,, +US-MO-63341,US,MO,63341,5.95,,,, +US-MO-63342,US,MO,63342,6.225,,,, +US-MO-63343,US,MO,63343,6.475,,,, +US-MO-63344,US,MO,63344,6.225,,,, +US-MO-63345,US,MO,63345,7.6,,,, +US-MO-63346,US,MO,63346,6.95,,,, +US-MO-63347,US,MO,63347,6.475,,,, +US-MO-63348,US,MO,63348,5.95,,,, +US-MO-63349,US,MO,63349,6.475,,,, +US-MO-63350,US,MO,63350,5.975,,,, +US-MO-63351,US,MO,63351,6.225,,,, +US-MO-63352,US,MO,63352,6.6,,,, +US-MO-63353,US,MO,63353,7.725,,,, +US-MO-63357,US,MO,63357,6.225,,,, +US-MO-63359,US,MO,63359,6.225,,,, +US-MO-63361,US,MO,63361,7.475,,,, +US-MO-63362,US,MO,63362,6.475,,,, +US-MO-63363,US,MO,63363,5.975,,,, +US-MO-63365,US,MO,63365,7.95,,,, +US-MO-63366,US,MO,63366,7.95,,,, +US-MO-63367,US,MO,63367,7.45,,,, +US-MO-63368,US,MO,63368,7.95,,,, +US-MO-63369,US,MO,63369,6.475,,,, +US-MO-63370,US,MO,63370,7.475,,,, +US-MO-63373,US,MO,63373,5.95,,,, +US-MO-63376,US,MO,63376,7.95,,,, +US-MO-63377,US,MO,63377,6.475,,,, +US-MO-63378,US,MO,63378,7.725,,,, +US-MO-63379,US,MO,63379,6.475,,,, +US-MO-63381,US,MO,63381,6.225,,,, +US-MO-63382,US,MO,63382,8.1,,,, +US-MO-63383,US,MO,63383,6.225,,,, +US-MO-63384,US,MO,63384,7.725,,,, +US-MO-63385,US,MO,63385,8.45,,,, +US-MO-63386,US,MO,63386,6.95,,,, +US-MO-63387,US,MO,63387,6.475,,,, +US-MO-63388,US,MO,63388,5.725,,,, +US-MO-63389,US,MO,63389,6.475,,,, +US-MO-63390,US,MO,63390,6.225,,,, +US-MO-63401,US,MO,63401,8.6,,,, +US-MO-63430,US,MO,63430,7.225,,,, +US-MO-63431,US,MO,63431,6.35,,,, +US-MO-63432,US,MO,63432,5.475,,,, +US-MO-63433,US,MO,63433,6.225,,,, +US-MO-63434,US,MO,63434,6.725,,,, +US-MO-63435,US,MO,63435,8.975,,,, +US-MO-63436,US,MO,63436,6.225,,,, +US-MO-63437,US,MO,63437,6.725,,,, +US-MO-63438,US,MO,63438,7.35,,,, +US-MO-63439,US,MO,63439,6.725,,,, +US-MO-63440,US,MO,63440,7.35,,,, +US-MO-63441,US,MO,63441,6.225,,,, +US-MO-63443,US,MO,63443,7.725,,,, +US-MO-63445,US,MO,63445,7.225,,,, +US-MO-63446,US,MO,63446,6.225,,,, +US-MO-63447,US,MO,63447,7.35,,,, +US-MO-63448,US,MO,63448,8.35,,,, +US-MO-63450,US,MO,63450,6.725,,,, +US-MO-63451,US,MO,63451,6.725,,,, +US-MO-63452,US,MO,63452,7.35,,,, +US-MO-63453,US,MO,63453,6.225,,,, +US-MO-63454,US,MO,63454,6.35,,,, +US-MO-63456,US,MO,63456,8.225,,,, +US-MO-63457,US,MO,63457,7.35,,,, +US-MO-63458,US,MO,63458,6.225,,,, +US-MO-63459,US,MO,63459,6.225,,,, +US-MO-63460,US,MO,63460,6.225,,,, +US-MO-63461,US,MO,63461,8.1,,,, +US-MO-63462,US,MO,63462,6.225,,,, +US-MO-63463,US,MO,63463,6.35,,,, +US-MO-63464,US,MO,63464,6.225,,,, +US-MO-63465,US,MO,63465,6.225,,,, +US-MO-63466,US,MO,63466,6.225,,,, +US-MO-63467,US,MO,63467,6.225,,,, +US-MO-63468,US,MO,63468,8.475,,,, +US-MO-63469,US,MO,63469,6.725,,,, +US-MO-63471,US,MO,63471,6.35,,,, +US-MO-63472,US,MO,63472,7.225,,,, +US-MO-63473,US,MO,63473,7.35,,,, +US-MO-63474,US,MO,63474,7.225,,,, +US-MO-63501,US,MO,63501,7.85,,,, +US-MO-63530,US,MO,63530,6.35,,,, +US-MO-63531,US,MO,63531,6.225,,,, +US-MO-63532,US,MO,63532,6.35,,,, +US-MO-63533,US,MO,63533,5.6,,,, +US-MO-63534,US,MO,63534,6.35,,,, +US-MO-63535,US,MO,63535,6.225,,,, +US-MO-63536,US,MO,63536,6.225,,,, +US-MO-63537,US,MO,63537,7.225,,,, +US-MO-63538,US,MO,63538,6.35,,,, +US-MO-63539,US,MO,63539,6.35,,,, +US-MO-63540,US,MO,63540,5.6,,,, +US-MO-63541,US,MO,63541,6.225,,,, +US-MO-63543,US,MO,63543,5.475,,,, +US-MO-63544,US,MO,63544,5.6,,,, +US-MO-63545,US,MO,63545,6.975,,,, +US-MO-63546,US,MO,63546,5.6,,,, +US-MO-63547,US,MO,63547,6.225,,,, +US-MO-63548,US,MO,63548,7.225,,,, +US-MO-63549,US,MO,63549,7.85,,,, +US-MO-63551,US,MO,63551,6.225,,,, +US-MO-63552,US,MO,63552,7.85,,,, +US-MO-63555,US,MO,63555,6.475,,,, +US-MO-63556,US,MO,63556,6.975,,,, +US-MO-63557,US,MO,63557,6.225,,,, +US-MO-63558,US,MO,63558,6.35,,,, +US-MO-63559,US,MO,63559,5.6,,,, +US-MO-63560,US,MO,63560,6.975,,,, +US-MO-63561,US,MO,63561,8.725,,,, +US-MO-63563,US,MO,63563,6.475,,,, +US-MO-63565,US,MO,63565,6.225,,,, +US-MO-63566,US,MO,63566,6.975,,,, +US-MO-63567,US,MO,63567,6.225,,,, +US-MO-63601,US,MO,63601,8.475,,,, +US-MO-63620,US,MO,63620,8.225,,,, +US-MO-63621,US,MO,63621,7.475,,,, +US-MO-63622,US,MO,63622,7.225,,,, +US-MO-63623,US,MO,63623,6.225,,,, +US-MO-63624,US,MO,63624,7.475,,,, +US-MO-63625,US,MO,63625,5.225,,,, +US-MO-63626,US,MO,63626,7.225,,,, +US-MO-63627,US,MO,63627,6.725,,,, +US-MO-63628,US,MO,63628,5.975,,,, +US-MO-63629,US,MO,63629,5.225,,,, +US-MO-63630,US,MO,63630,7.225,,,, +US-MO-63631,US,MO,63631,7.225,,,, +US-MO-63632,US,MO,63632,5.725,,,, +US-MO-63633,US,MO,63633,5.225,,,, +US-MO-63636,US,MO,63636,6.225,,,, +US-MO-63637,US,MO,63637,5.975,,,, +US-MO-63638,US,MO,63638,8.225,,,, +US-MO-63640,US,MO,63640,7.975,,,, +US-MO-63645,US,MO,63645,6.225,,,, +US-MO-63648,US,MO,63648,7.225,,,, +US-MO-63650,US,MO,63650,8.225,,,, +US-MO-63651,US,MO,63651,5.975,,,, +US-MO-63653,US,MO,63653,6.975,,,, +US-MO-63654,US,MO,63654,5.225,,,, +US-MO-63655,US,MO,63655,6.225,,,, +US-MO-63656,US,MO,63656,6.225,,,, +US-MO-63660,US,MO,63660,7.225,,,, +US-MO-63662,US,MO,63662,5.85,,,, +US-MO-63663,US,MO,63663,8.225,,,, +US-MO-63664,US,MO,63664,7.225,,,, +US-MO-63665,US,MO,63665,5.225,,,, +US-MO-63666,US,MO,63666,5.225,,,, +US-MO-63670,US,MO,63670,6.725,,,, +US-MO-63673,US,MO,63673,6.725,,,, +US-MO-63674,US,MO,63674,7.225,,,, +US-MO-63675,US,MO,63675,6.225,,,, +US-MO-63701,US,MO,63701,7.975,,,, +US-MO-63702,US,MO,63702,7.975,,,, +US-MO-63703,US,MO,63703,7.975,,,, +US-MO-63730,US,MO,63730,5.225,,,, +US-MO-63732,US,MO,63732,5.225,,,, +US-MO-63735,US,MO,63735,5.225,,,, +US-MO-63736,US,MO,63736,5.225,,,, +US-MO-63737,US,MO,63737,6.1,,,, +US-MO-63738,US,MO,63738,5.225,,,, +US-MO-63739,US,MO,63739,5.225,,,, +US-MO-63740,US,MO,63740,6.975,,,, +US-MO-63742,US,MO,63742,5.225,,,, +US-MO-63743,US,MO,63743,5.225,,,, +US-MO-63744,US,MO,63744,6.725,,,, +US-MO-63745,US,MO,63745,6.225,,,, +US-MO-63746,US,MO,63746,6.1,,,, +US-MO-63747,US,MO,63747,5.225,,,, +US-MO-63748,US,MO,63748,6.1,,,, +US-MO-63750,US,MO,63750,5.85,,,, +US-MO-63751,US,MO,63751,5.85,,,, +US-MO-63752,US,MO,63752,5.725,,,, +US-MO-63755,US,MO,63755,7.225,,,, +US-MO-63758,US,MO,63758,6.225,,,, +US-MO-63760,US,MO,63760,5.85,,,, +US-MO-63763,US,MO,63763,5.725,,,, +US-MO-63764,US,MO,63764,7.85,,,, +US-MO-63766,US,MO,63766,5.225,,,, +US-MO-63767,US,MO,63767,6.225,,,, +US-MO-63769,US,MO,63769,5.225,,,, +US-MO-63770,US,MO,63770,6.1,,,, +US-MO-63771,US,MO,63771,5.225,,,, +US-MO-63774,US,MO,63774,5.225,,,, +US-MO-63775,US,MO,63775,6.1,,,, +US-MO-63776,US,MO,63776,7.975,,,, +US-MO-63779,US,MO,63779,5.225,,,, +US-MO-63780,US,MO,63780,6.975,,,, +US-MO-63781,US,MO,63781,5.85,,,, +US-MO-63782,US,MO,63782,5.85,,,, +US-MO-63783,US,MO,63783,6.1,,,, +US-MO-63784,US,MO,63784,5.225,,,, +US-MO-63785,US,MO,63785,5.225,,,, +US-MO-63787,US,MO,63787,5.85,,,, +US-MO-63801,US,MO,63801,7.725,,,, +US-MO-63820,US,MO,63820,5.975,,,, +US-MO-63821,US,MO,63821,5.225,,,, +US-MO-63822,US,MO,63822,6.725,,,, +US-MO-63823,US,MO,63823,6.975,,,, +US-MO-63824,US,MO,63824,5.225,,,, +US-MO-63825,US,MO,63825,5.225,,,, +US-MO-63826,US,MO,63826,5.475,,,, +US-MO-63827,US,MO,63827,5.475,,,, +US-MO-63828,US,MO,63828,5.475,,,, +US-MO-63829,US,MO,63829,6.225,,,, +US-MO-63830,US,MO,63830,6.975,,,, +US-MO-63833,US,MO,63833,5.225,,,, +US-MO-63834,US,MO,63834,7.475,,,, +US-MO-63837,US,MO,63837,5.225,,,, +US-MO-63839,US,MO,63839,5.475,,,, +US-MO-63840,US,MO,63840,5.475,,,, +US-MO-63841,US,MO,63841,7.1,,,, +US-MO-63845,US,MO,63845,8.475,,,, +US-MO-63846,US,MO,63846,5.225,,,, +US-MO-63847,US,MO,63847,5.225,,,, +US-MO-63848,US,MO,63848,6.475,,,, +US-MO-63849,US,MO,63849,5.225,,,, +US-MO-63850,US,MO,63850,5.225,,,, +US-MO-63851,US,MO,63851,7.725,,,, +US-MO-63852,US,MO,63852,5.225,,,, +US-MO-63853,US,MO,63853,5.475,,,, +US-MO-63855,US,MO,63855,5.225,,,, +US-MO-63857,US,MO,63857,7.975,,,, +US-MO-63860,US,MO,63860,5.475,,,, +US-MO-63862,US,MO,63862,5.475,,,, +US-MO-63863,US,MO,63863,6.975,,,, +US-MO-63866,US,MO,63866,7.975,,,, +US-MO-63867,US,MO,63867,5.475,,,, +US-MO-63868,US,MO,63868,6.475,,,, +US-MO-63869,US,MO,63869,7.975,,,, +US-MO-63870,US,MO,63870,5.475,,,, +US-MO-63873,US,MO,63873,6.975,,,, +US-MO-63874,US,MO,63874,6.475,,,, +US-MO-63876,US,MO,63876,5.225,,,, +US-MO-63877,US,MO,63877,5.475,,,, +US-MO-63878,US,MO,63878,5.475,,,, +US-MO-63879,US,MO,63879,6.725,,,, +US-MO-63880,US,MO,63880,5.225,,,, +US-MO-63881,US,MO,63881,8.475,,,, +US-MO-63882,US,MO,63882,6.975,,,, +US-MO-63901,US,MO,63901,5.225,,,, +US-MO-63902,US,MO,63902,7.725,,,, +US-MO-63931,US,MO,63931,7.225,,,, +US-MO-63932,US,MO,63932,5.225,,,, +US-MO-63933,US,MO,63933,5.225,,,, +US-MO-63935,US,MO,63935,7.225,,,, +US-MO-63936,US,MO,63936,5.225,,,, +US-MO-63937,US,MO,63937,6.725,,,, +US-MO-63938,US,MO,63938,6.725,,,, +US-MO-63939,US,MO,63939,5.725,,,, +US-MO-63940,US,MO,63940,5.225,,,, +US-MO-63941,US,MO,63941,5.225,,,, +US-MO-63943,US,MO,63943,6.225,,,, +US-MO-63944,US,MO,63944,7.725,,,, +US-MO-63945,US,MO,63945,5.225,,,, +US-MO-63950,US,MO,63950,5.725,,,, +US-MO-63951,US,MO,63951,5.725,,,, +US-MO-63952,US,MO,63952,6.725,,,, +US-MO-63953,US,MO,63953,7.725,,,, +US-MO-63954,US,MO,63954,5.225,,,, +US-MO-63955,US,MO,63955,5.725,,,, +US-MO-63956,US,MO,63956,5.725,,,, +US-MO-63957,US,MO,63957,8.225,,,, +US-MO-63960,US,MO,63960,5.225,,,, +US-MO-63961,US,MO,63961,5.225,,,, +US-MO-63962,US,MO,63962,7.725,,,, +US-MO-63964,US,MO,63964,5.725,,,, +US-MO-63965,US,MO,63965,6.725,,,, +US-MO-63966,US,MO,63966,5.225,,,, +US-MO-63967,US,MO,63967,7.225,,,, +US-MO-64001,US,MO,64001,5.85,,,, +US-MO-64002,US,MO,64002,7.725,,,, +US-MO-64011,US,MO,64011,6.35,,,, +US-MO-64012,US,MO,64012,8.725,,,, +US-MO-64013,US,MO,64013,7.975,,,, +US-MO-64014,US,MO,64014,7.975,,,, +US-MO-64015,US,MO,64015,7.975,,,, +US-MO-64016,US,MO,64016,5.475,,,, +US-MO-64017,US,MO,64017,6.225,,,, +US-MO-64018,US,MO,64018,5.6,,,, +US-MO-64019,US,MO,64019,6.475,,,, +US-MO-64020,US,MO,64020,8.1,,,, +US-MO-64021,US,MO,64021,5.85,,,, +US-MO-64022,US,MO,64022,5.85,,,, +US-MO-64024,US,MO,64024,7.725,,,, +US-MO-64028,US,MO,64028,5.6,,,, +US-MO-64029,US,MO,64029,8.475,,,, +US-MO-64030,US,MO,64030,7.975,,,, +US-MO-64034,US,MO,64034,7.475,,,, +US-MO-64035,US,MO,64035,6.225,,,, +US-MO-64036,US,MO,64036,8.225,,,, +US-MO-64037,US,MO,64037,8.1,,,, +US-MO-64040,US,MO,64040,7.975,,,, +US-MO-64048,US,MO,64048,5.225,,,, +US-MO-64050,US,MO,64050,7.725,,,, +US-MO-64051,US,MO,64051,7.725,,,, +US-MO-64052,US,MO,64052,7.725,,,, +US-MO-64053,US,MO,64053,7.725,,,, +US-MO-64054,US,MO,64054,7.475,,,, +US-MO-64055,US,MO,64055,7.725,,,, +US-MO-64056,US,MO,64056,7.725,,,, +US-MO-64057,US,MO,64057,7.725,,,, +US-MO-64058,US,MO,64058,5.475,,,, +US-MO-64060,US,MO,64060,7.225,,,, +US-MO-64061,US,MO,64061,6.475,,,, +US-MO-64062,US,MO,64062,5.725,,,, +US-MO-64063,US,MO,64063,7.725,,,, +US-MO-64064,US,MO,64064,7.725,,,, +US-MO-64065,US,MO,64065,7.725,,,, +US-MO-64066,US,MO,64066,6.475,,,, +US-MO-64067,US,MO,64067,8.35,,,, +US-MO-64068,US,MO,64068,7.725,,,, +US-MO-64069,US,MO,64069,7.725,,,, +US-MO-64070,US,MO,64070,5.475,,,, +US-MO-64071,US,MO,64071,5.85,,,, +US-MO-64072,US,MO,64072,5.225,,,, +US-MO-64073,US,MO,64073,7.725,,,, +US-MO-64074,US,MO,64074,5.85,,,, +US-MO-64075,US,MO,64075,7.975,,,, +US-MO-64076,US,MO,64076,5.85,,,, +US-MO-64077,US,MO,64077,6.725,,,, +US-MO-64078,US,MO,64078,5.975,,,, +US-MO-64079,US,MO,64079,5.6,,,, +US-MO-64080,US,MO,64080,5.975,,,, +US-MO-64081,US,MO,64081,7.725,,,, +US-MO-64082,US,MO,64082,7.725,,,, +US-MO-64083,US,MO,64083,8.975,,,, +US-MO-64084,US,MO,64084,6.225,,,, +US-MO-64085,US,MO,64085,8.225,,,, +US-MO-64086,US,MO,64086,7.725,,,, +US-MO-64088,US,MO,64088,5.475,,,, +US-MO-64089,US,MO,64089,7.225,,,, +US-MO-64090,US,MO,64090,6.975,,,, +US-MO-64092,US,MO,64092,5.6,,,, +US-MO-64093,US,MO,64093,8.35,,,, +US-MO-64096,US,MO,64096,8.35,,,, +US-MO-64097,US,MO,64097,5.85,,,, +US-MO-64098,US,MO,64098,5.6,,,, +US-MO-64101,US,MO,64101,8.35,,,, +US-MO-64102,US,MO,64102,8.35,,,, +US-MO-64105,US,MO,64105,9.35,,,, +US-MO-64106,US,MO,64106,9.35,,,, +US-MO-64108,US,MO,64108,8.35,,,, +US-MO-64109,US,MO,64109,8.35,,,, +US-MO-64110,US,MO,64110,8.35,,,, +US-MO-64111,US,MO,64111,8.35,,,, +US-MO-64112,US,MO,64112,8.35,,,, +US-MO-64113,US,MO,64113,8.35,,,, +US-MO-64114,US,MO,64114,8.35,,,, +US-MO-64116,US,MO,64116,8.1,,,, +US-MO-64117,US,MO,64117,8.1,,,, +US-MO-64118,US,MO,64118,8.1,,,, +US-MO-64119,US,MO,64119,8.1,,,, +US-MO-64120,US,MO,64120,8.35,,,, +US-MO-64121,US,MO,64121,9.35,,,, +US-MO-64123,US,MO,64123,8.35,,,, +US-MO-64124,US,MO,64124,8.35,,,, +US-MO-64125,US,MO,64125,8.35,,,, +US-MO-64126,US,MO,64126,8.35,,,, +US-MO-64127,US,MO,64127,8.35,,,, +US-MO-64128,US,MO,64128,8.35,,,, +US-MO-64129,US,MO,64129,8.35,,,, +US-MO-64130,US,MO,64130,8.35,,,, +US-MO-64131,US,MO,64131,8.35,,,, +US-MO-64132,US,MO,64132,8.35,,,, +US-MO-64133,US,MO,64133,8.225,,,, +US-MO-64134,US,MO,64134,8.35,,,, +US-MO-64136,US,MO,64136,8.35,,,, +US-MO-64137,US,MO,64137,8.35,,,, +US-MO-64138,US,MO,64138,8.35,,,, +US-MO-64139,US,MO,64139,8.35,,,, +US-MO-64141,US,MO,64141,9.35,,,, +US-MO-64144,US,MO,64144,8.1,,,, +US-MO-64145,US,MO,64145,8.35,,,, +US-MO-64146,US,MO,64146,8.35,,,, +US-MO-64147,US,MO,64147,8.35,,,, +US-MO-64148,US,MO,64148,9.35,,,, +US-MO-64149,US,MO,64149,8.35,,,, +US-MO-64150,US,MO,64150,6.6,,,, +US-MO-64151,US,MO,64151,8.475,,,, +US-MO-64152,US,MO,64152,5.6,,,, +US-MO-64153,US,MO,64153,8.475,,,, +US-MO-64154,US,MO,64154,8.475,,,, +US-MO-64155,US,MO,64155,8.1,,,, +US-MO-64156,US,MO,64156,8.1,,,, +US-MO-64157,US,MO,64157,8.1,,,, +US-MO-64158,US,MO,64158,8.1,,,, +US-MO-64161,US,MO,64161,8.1,,,, +US-MO-64163,US,MO,64163,6.6,,,, +US-MO-64164,US,MO,64164,8.475,,,, +US-MO-64165,US,MO,64165,8.1,,,, +US-MO-64166,US,MO,64166,5.725,,,, +US-MO-64167,US,MO,64167,5.725,,,, +US-MO-64168,US,MO,64168,7.725,,,, +US-MO-64170,US,MO,64170,8.35,,,, +US-MO-64171,US,MO,64171,9.35,,,, +US-MO-64179,US,MO,64179,9.35,,,, +US-MO-64180,US,MO,64180,9.35,,,, +US-MO-64184,US,MO,64184,9.35,,,, +US-MO-64187,US,MO,64187,9.35,,,, +US-MO-64188,US,MO,64188,7.725,,,, +US-MO-64190,US,MO,64190,8.475,,,, +US-MO-64191,US,MO,64191,8.35,,,, +US-MO-64195,US,MO,64195,9.475,,,, +US-MO-64196,US,MO,64196,9.35,,,, +US-MO-64197,US,MO,64197,8.35,,,, +US-MO-64198,US,MO,64198,8.35,,,, +US-MO-64199,US,MO,64199,9.35,,,, +US-MO-64401,US,MO,64401,5.325,,,, +US-MO-64402,US,MO,64402,7.225,,,, +US-MO-64420,US,MO,64420,7.1,,,, +US-MO-64421,US,MO,64421,6.425,,,, +US-MO-64422,US,MO,64422,5.725,,,, +US-MO-64423,US,MO,64423,5.725,,,, +US-MO-64424,US,MO,64424,7.35,,,, +US-MO-64426,US,MO,64426,5.475,,,, +US-MO-64427,US,MO,64427,6.425,,,, +US-MO-64428,US,MO,64428,5.725,,,, +US-MO-64429,US,MO,64429,7.475,,,, +US-MO-64430,US,MO,64430,5.725,,,, +US-MO-64431,US,MO,64431,5.725,,,, +US-MO-64432,US,MO,64432,5.725,,,, +US-MO-64433,US,MO,64433,5.725,,,, +US-MO-64434,US,MO,64434,5.725,,,, +US-MO-64436,US,MO,64436,6.425,,,, +US-MO-64437,US,MO,64437,7.725,,,, +US-MO-64438,US,MO,64438,5.225,,,, +US-MO-64439,US,MO,64439,5.6,,,, +US-MO-64440,US,MO,64440,5.325,,,, +US-MO-64441,US,MO,64441,6.1,,,, +US-MO-64442,US,MO,64442,5.475,,,, +US-MO-64443,US,MO,64443,5.325,,,, +US-MO-64444,US,MO,64444,5.6,,,, +US-MO-64445,US,MO,64445,5.725,,,, +US-MO-64446,US,MO,64446,7.475,,,, +US-MO-64448,US,MO,64448,5.325,,,, +US-MO-64449,US,MO,64449,6.425,,,, +US-MO-64451,US,MO,64451,6.725,,,, +US-MO-64453,US,MO,64453,5.225,,,, +US-MO-64454,US,MO,64454,6.475,,,, +US-MO-64455,US,MO,64455,5.725,,,, +US-MO-64456,US,MO,64456,8.1,,,, +US-MO-64457,US,MO,64457,5.725,,,, +US-MO-64458,US,MO,64458,5.475,,,, +US-MO-64459,US,MO,64459,6.425,,,, +US-MO-64461,US,MO,64461,5.725,,,, +US-MO-64463,US,MO,64463,6.725,,,, +US-MO-64465,US,MO,64465,5.225,,,, +US-MO-64466,US,MO,64466,6.725,,,, +US-MO-64467,US,MO,64467,5.475,,,, +US-MO-64468,US,MO,64468,7.975,,,, +US-MO-64469,US,MO,64469,5.725,,,, +US-MO-64470,US,MO,64470,8.225,,,, +US-MO-64471,US,MO,64471,5.475,,,, +US-MO-64473,US,MO,64473,6.725,,,, +US-MO-64474,US,MO,64474,5.725,,,, +US-MO-64475,US,MO,64475,5.725,,,, +US-MO-64476,US,MO,64476,5.725,,,, +US-MO-64477,US,MO,64477,7.225,,,, +US-MO-64479,US,MO,64479,5.725,,,, +US-MO-64480,US,MO,64480,5.925,,,, +US-MO-64481,US,MO,64481,5.975,,,, +US-MO-64482,US,MO,64482,8.225,,,, +US-MO-64483,US,MO,64483,6.425,,,, +US-MO-64484,US,MO,64484,5.325,,,, +US-MO-64485,US,MO,64485,8.425,,,, +US-MO-64486,US,MO,64486,6.1,,,, +US-MO-64487,US,MO,64487,5.725,,,, +US-MO-64489,US,MO,64489,6.225,,,, +US-MO-64490,US,MO,64490,5.225,,,, +US-MO-64491,US,MO,64491,8.475,,,, +US-MO-64492,US,MO,64492,5.225,,,, +US-MO-64493,US,MO,64493,5.225,,,, +US-MO-64494,US,MO,64494,5.725,,,, +US-MO-64496,US,MO,64496,6.475,,,, +US-MO-64497,US,MO,64497,5.725,,,, +US-MO-64498,US,MO,64498,6.475,,,, +US-MO-64499,US,MO,64499,6.1,,,, +US-MO-64501,US,MO,64501,7.7,,,, +US-MO-64502,US,MO,64502,7.7,,,, +US-MO-64503,US,MO,64503,7.7,,,, +US-MO-64504,US,MO,64504,7.7,,,, +US-MO-64505,US,MO,64505,7.7,,,, +US-MO-64506,US,MO,64506,7.7,,,, +US-MO-64507,US,MO,64507,7.7,,,, +US-MO-64508,US,MO,64508,7.7,,,, +US-MO-64601,US,MO,64601,7.225,,,, +US-MO-64620,US,MO,64620,6.225,,,, +US-MO-64622,US,MO,64622,5.475,,,, +US-MO-64623,US,MO,64623,5.475,,,, +US-MO-64624,US,MO,64624,7.725,,,, +US-MO-64625,US,MO,64625,7.725,,,, +US-MO-64628,US,MO,64628,7.975,,,, +US-MO-64630,US,MO,64630,6.225,,,, +US-MO-64631,US,MO,64631,6.225,,,, +US-MO-64632,US,MO,64632,5.975,,,, +US-MO-64633,US,MO,64633,7.225,,,, +US-MO-64635,US,MO,64635,4.975,,,, +US-MO-64636,US,MO,64636,6.725,,,, +US-MO-64637,US,MO,64637,6.725,,,, +US-MO-64638,US,MO,64638,4.975,,,, +US-MO-64639,US,MO,64639,5.475,,,, +US-MO-64640,US,MO,64640,7.6,,,, +US-MO-64641,US,MO,64641,5.725,,,, +US-MO-64642,US,MO,64642,5.975,,,, +US-MO-64643,US,MO,64643,7.475,,,, +US-MO-64644,US,MO,64644,8.725,,,, +US-MO-64645,US,MO,64645,6.975,,,, +US-MO-64646,US,MO,64646,6.975,,,, +US-MO-64647,US,MO,64647,6.225,,,, +US-MO-64648,US,MO,64648,6.225,,,, +US-MO-64649,US,MO,64649,6.725,,,, +US-MO-64650,US,MO,64650,6.725,,,, +US-MO-64651,US,MO,64651,6.225,,,, +US-MO-64652,US,MO,64652,5.725,,,, +US-MO-64653,US,MO,64653,6.225,,,, +US-MO-64654,US,MO,64654,6.225,,,, +US-MO-64655,US,MO,64655,6.225,,,, +US-MO-64656,US,MO,64656,4.975,,,, +US-MO-64657,US,MO,64657,5.225,,,, +US-MO-64658,US,MO,64658,7.725,,,, +US-MO-64659,US,MO,64659,6.225,,,, +US-MO-64660,US,MO,64660,5.975,,,, +US-MO-64661,US,MO,64661,6.475,,,, +US-MO-64664,US,MO,64664,4.975,,,, +US-MO-64667,US,MO,64667,6.975,,,, +US-MO-64668,US,MO,64668,5.475,,,, +US-MO-64670,US,MO,64670,6.725,,,, +US-MO-64671,US,MO,64671,6.725,,,, +US-MO-64672,US,MO,64672,6.225,,,, +US-MO-64673,US,MO,64673,7.475,,,, +US-MO-64674,US,MO,64674,6.225,,,, +US-MO-64676,US,MO,64676,5.975,,,, +US-MO-64679,US,MO,64679,5.725,,,, +US-MO-64680,US,MO,64680,9.35,,,, +US-MO-64681,US,MO,64681,5.975,,,, +US-MO-64682,US,MO,64682,5.475,,,, +US-MO-64683,US,MO,64683,7.725,,,, +US-MO-64686,US,MO,64686,4.975,,,, +US-MO-64688,US,MO,64688,4.975,,,, +US-MO-64689,US,MO,64689,6.225,,,, +US-MO-64701,US,MO,64701,7.85,,,, +US-MO-64720,US,MO,64720,7.975,,,, +US-MO-64722,US,MO,64722,5.225,,,, +US-MO-64723,US,MO,64723,6.225,,,, +US-MO-64724,US,MO,64724,7.1,,,, +US-MO-64725,US,MO,64725,5.975,,,, +US-MO-64726,US,MO,64726,5.225,,,, +US-MO-64728,US,MO,64728,5.225,,,, +US-MO-64730,US,MO,64730,7.85,,,, +US-MO-64733,US,MO,64733,6.475,,,, +US-MO-64734,US,MO,64734,5.975,,,, +US-MO-64735,US,MO,64735,7.475,,,, +US-MO-64738,US,MO,64738,4.725,,,, +US-MO-64739,US,MO,64739,5.975,,,, +US-MO-64740,US,MO,64740,5.225,,,, +US-MO-64741,US,MO,64741,5.225,,,, +US-MO-64742,US,MO,64742,7.975,,,, +US-MO-64743,US,MO,64743,7.475,,,, +US-MO-64744,US,MO,64744,7.725,,,, +US-MO-64745,US,MO,64745,5.225,,,, +US-MO-64746,US,MO,64746,5.975,,,, +US-MO-64747,US,MO,64747,5.975,,,, +US-MO-64748,US,MO,64748,7.6,,,, +US-MO-64750,US,MO,64750,5.225,,,, +US-MO-64752,US,MO,64752,5.225,,,, +US-MO-64755,US,MO,64755,5.2,,,, +US-MO-64756,US,MO,64756,5.725,,,, +US-MO-64759,US,MO,64759,7.725,,,, +US-MO-64761,US,MO,64761,7.975,,,, +US-MO-64762,US,MO,64762,5.725,,,, +US-MO-64763,US,MO,64763,6.975,,,, +US-MO-64765,US,MO,64765,5.225,,,, +US-MO-64766,US,MO,64766,7.725,,,, +US-MO-64767,US,MO,64767,5.225,,,, +US-MO-64769,US,MO,64769,5.725,,,, +US-MO-64770,US,MO,64770,6.725,,,, +US-MO-64771,US,MO,64771,5.225,,,, +US-MO-64772,US,MO,64772,7.725,,,, +US-MO-64776,US,MO,64776,4.725,,,, +US-MO-64778,US,MO,64778,5.225,,,, +US-MO-64779,US,MO,64779,7.225,,,, +US-MO-64780,US,MO,64780,6.225,,,, +US-MO-64781,US,MO,64781,4.725,,,, +US-MO-64783,US,MO,64783,5.225,,,, +US-MO-64784,US,MO,64784,5.225,,,, +US-MO-64788,US,MO,64788,7.225,,,, +US-MO-64790,US,MO,64790,5.225,,,, +US-MO-64801,US,MO,64801,7.825,,,, +US-MO-64802,US,MO,64802,7.825,,,, +US-MO-64803,US,MO,64803,7.825,,,, +US-MO-64804,US,MO,64804,7.825,,,, +US-MO-64830,US,MO,64830,6.2,,,, +US-MO-64831,US,MO,64831,6.225,,,, +US-MO-64832,US,MO,64832,5.2,,,, +US-MO-64833,US,MO,64833,5.2,,,, +US-MO-64834,US,MO,64834,7.7,,,, +US-MO-64835,US,MO,64835,7.2,,,, +US-MO-64836,US,MO,64836,5.2,,,, +US-MO-64840,US,MO,64840,5.35,,,, +US-MO-64841,US,MO,64841,6.95,,,, +US-MO-64842,US,MO,64842,5.35,,,, +US-MO-64843,US,MO,64843,6.225,,,, +US-MO-64844,US,MO,64844,5.35,,,, +US-MO-64847,US,MO,64847,8.225,,,, +US-MO-64848,US,MO,64848,5.725,,,, +US-MO-64849,US,MO,64849,5.2,,,, +US-MO-64850,US,MO,64850,5.35,,,, +US-MO-64853,US,MO,64853,5.35,,,, +US-MO-64854,US,MO,64854,6.225,,,, +US-MO-64855,US,MO,64855,5.2,,,, +US-MO-64856,US,MO,64856,6.225,,,, +US-MO-64857,US,MO,64857,6.2,,,, +US-MO-64858,US,MO,64858,5.35,,,, +US-MO-64859,US,MO,64859,5.2,,,, +US-MO-64861,US,MO,64861,6.225,,,, +US-MO-64862,US,MO,64862,5.2,,,, +US-MO-64863,US,MO,64863,6.225,,,, +US-MO-64864,US,MO,64864,6.35,,,, +US-MO-64865,US,MO,64865,5.35,,,, +US-MO-64866,US,MO,64866,5.35,,,, +US-MO-64867,US,MO,64867,6.225,,,, +US-MO-64868,US,MO,64868,6.225,,,, +US-MO-64870,US,MO,64870,7.7,,,, +US-MO-64873,US,MO,64873,5.725,,,, +US-MO-64874,US,MO,64874,7.1,,,, +US-MO-64999,US,MO,64999,8.35,,,, +US-MO-65001,US,MO,65001,7.475,,,, +US-MO-65010,US,MO,65010,7.475,,,, +US-MO-65011,US,MO,65011,5.725,,,, +US-MO-65013,US,MO,65013,5.891,,,, +US-MO-65014,US,MO,65014,8.1,,,, +US-MO-65016,US,MO,65016,6.475,,,, +US-MO-65017,US,MO,65017,5.725,,,, +US-MO-65018,US,MO,65018,7.975,,,, +US-MO-65020,US,MO,65020,5.475,,,, +US-MO-65023,US,MO,65023,5.725,,,, +US-MO-65024,US,MO,65024,6.475,,,, +US-MO-65025,US,MO,65025,7.475,,,, +US-MO-65026,US,MO,65026,8.125,,,, +US-MO-65032,US,MO,65032,5.725,,,, +US-MO-65034,US,MO,65034,5.725,,,, +US-MO-65035,US,MO,65035,6.475,,,, +US-MO-65036,US,MO,65036,7.1,,,, +US-MO-65037,US,MO,65037,5.725,,,, +US-MO-65038,US,MO,65038,7.225,,,, +US-MO-65039,US,MO,65039,5.975,,,, +US-MO-65040,US,MO,65040,5.725,,,, +US-MO-65041,US,MO,65041,8.1,,,, +US-MO-65042,US,MO,65042,6.475,,,, +US-MO-65043,US,MO,65043,5.725,,,, +US-MO-65046,US,MO,65046,6.475,,,, +US-MO-65047,US,MO,65047,5.725,,,, +US-MO-65048,US,MO,65048,6.475,,,, +US-MO-65049,US,MO,65049,5.475,,,, +US-MO-65050,US,MO,65050,6.475,,,, +US-MO-65051,US,MO,65051,6.475,,,, +US-MO-65052,US,MO,65052,5.475,,,, +US-MO-65053,US,MO,65053,5.725,,,, +US-MO-65054,US,MO,65054,6.475,,,, +US-MO-65055,US,MO,65055,6.475,,,, +US-MO-65058,US,MO,65058,6.975,,,, +US-MO-65059,US,MO,65059,5.725,,,, +US-MO-65061,US,MO,65061,6.475,,,, +US-MO-65062,US,MO,65062,5.975,,,, +US-MO-65063,US,MO,65063,5.725,,,, +US-MO-65064,US,MO,65064,5.725,,,, +US-MO-65065,US,MO,65065,7.475,,,, +US-MO-65066,US,MO,65066,8.35,,,, +US-MO-65067,US,MO,65067,5.725,,,, +US-MO-65068,US,MO,65068,6.225,,,, +US-MO-65069,US,MO,65069,6.475,,,, +US-MO-65072,US,MO,65072,5.725,,,, +US-MO-65074,US,MO,65074,5.725,,,, +US-MO-65075,US,MO,65075,5.725,,,, +US-MO-65076,US,MO,65076,5.725,,,, +US-MO-65077,US,MO,65077,5.725,,,, +US-MO-65078,US,MO,65078,5.725,,,, +US-MO-65079,US,MO,65079,5.975,,,, +US-MO-65080,US,MO,65080,5.725,,,, +US-MO-65081,US,MO,65081,7.725,,,, +US-MO-65082,US,MO,65082,5.725,,,, +US-MO-65083,US,MO,65083,5.725,,,, +US-MO-65084,US,MO,65084,5.725,,,, +US-MO-65085,US,MO,65085,6.475,,,, +US-MO-65101,US,MO,65101,7.725,,,, +US-MO-65102,US,MO,65102,7.725,,,, +US-MO-65103,US,MO,65103,7.725,,,, +US-MO-65104,US,MO,65104,7.725,,,, +US-MO-65105,US,MO,65105,7.725,,,, +US-MO-65106,US,MO,65106,7.725,,,, +US-MO-65107,US,MO,65107,7.725,,,, +US-MO-65108,US,MO,65108,7.725,,,, +US-MO-65109,US,MO,65109,7.725,,,, +US-MO-65110,US,MO,65110,7.725,,,, +US-MO-65111,US,MO,65111,7.725,,,, +US-MO-65201,US,MO,65201,7.975,,,, +US-MO-65202,US,MO,65202,7.975,,,, +US-MO-65203,US,MO,65203,7.975,,,, +US-MO-65205,US,MO,65205,8.475,,,, +US-MO-65211,US,MO,65211,7.975,,,, +US-MO-65212,US,MO,65212,7.975,,,, +US-MO-65215,US,MO,65215,7.975,,,, +US-MO-65216,US,MO,65216,7.975,,,, +US-MO-65217,US,MO,65217,7.975,,,, +US-MO-65218,US,MO,65218,7.975,,,, +US-MO-65230,US,MO,65230,6.85,,,, +US-MO-65231,US,MO,65231,5.725,,,, +US-MO-65232,US,MO,65232,6.6,,,, +US-MO-65233,US,MO,65233,8.225,,,, +US-MO-65236,US,MO,65236,7.475,,,, +US-MO-65237,US,MO,65237,6.225,,,, +US-MO-65239,US,MO,65239,5.725,,,, +US-MO-65240,US,MO,65240,7.975,,,, +US-MO-65243,US,MO,65243,5.725,,,, +US-MO-65244,US,MO,65244,5.725,,,, +US-MO-65246,US,MO,65246,5.975,,,, +US-MO-65247,US,MO,65247,6.35,,,, +US-MO-65248,US,MO,65248,6.85,,,, +US-MO-65250,US,MO,65250,6.85,,,, +US-MO-65251,US,MO,65251,5.725,,,, +US-MO-65254,US,MO,65254,6.85,,,, +US-MO-65255,US,MO,65255,5.975,,,, +US-MO-65256,US,MO,65256,5.975,,,, +US-MO-65257,US,MO,65257,5.725,,,, +US-MO-65258,US,MO,65258,5.725,,,, +US-MO-65259,US,MO,65259,5.725,,,, +US-MO-65260,US,MO,65260,5.725,,,, +US-MO-65261,US,MO,65261,6.975,,,, +US-MO-65262,US,MO,65262,5.725,,,, +US-MO-65263,US,MO,65263,5.725,,,, +US-MO-65264,US,MO,65264,8.1,,,, +US-MO-65265,US,MO,65265,8.6,,,, +US-MO-65270,US,MO,65270,8.225,,,, +US-MO-65274,US,MO,65274,6.85,,,, +US-MO-65275,US,MO,65275,5.725,,,, +US-MO-65276,US,MO,65276,6.225,,,, +US-MO-65278,US,MO,65278,5.725,,,, +US-MO-65279,US,MO,65279,5.975,,,, +US-MO-65280,US,MO,65280,6.6,,,, +US-MO-65281,US,MO,65281,7.35,,,, +US-MO-65282,US,MO,65282,5.725,,,, +US-MO-65283,US,MO,65283,6.225,,,, +US-MO-65284,US,MO,65284,5.975,,,, +US-MO-65285,US,MO,65285,6.1,,,, +US-MO-65286,US,MO,65286,5.975,,,, +US-MO-65287,US,MO,65287,6.225,,,, +US-MO-65299,US,MO,65299,5.975,,,, +US-MO-65301,US,MO,65301,8.1,,,, +US-MO-65302,US,MO,65302,8.1,,,, +US-MO-65305,US,MO,65305,6.475,,,, +US-MO-65320,US,MO,65320,8.35,,,, +US-MO-65321,US,MO,65321,6.35,,,, +US-MO-65322,US,MO,65322,6.225,,,, +US-MO-65323,US,MO,65323,7.225,,,, +US-MO-65324,US,MO,65324,5.475,,,, +US-MO-65325,US,MO,65325,7.6,,,, +US-MO-65326,US,MO,65326,6.1,,,, +US-MO-65327,US,MO,65327,6.85,,,, +US-MO-65329,US,MO,65329,5.725,,,, +US-MO-65330,US,MO,65330,6.975,,,, +US-MO-65332,US,MO,65332,7.725,,,, +US-MO-65333,US,MO,65333,5.225,,,, +US-MO-65334,US,MO,65334,5.725,,,, +US-MO-65335,US,MO,65335,6.1,,,, +US-MO-65336,US,MO,65336,8.475,,,, +US-MO-65337,US,MO,65337,7.725,,,, +US-MO-65338,US,MO,65338,6.1,,,, +US-MO-65339,US,MO,65339,6.85,,,, +US-MO-65340,US,MO,65340,7.35,,,, +US-MO-65344,US,MO,65344,5.85,,,, +US-MO-65345,US,MO,65345,6.1,,,, +US-MO-65347,US,MO,65347,5.85,,,, +US-MO-65348,US,MO,65348,7.225,,,, +US-MO-65349,US,MO,65349,7.85,,,, +US-MO-65350,US,MO,65350,5.725,,,, +US-MO-65351,US,MO,65351,8.35,,,, +US-MO-65354,US,MO,65354,5.725,,,, +US-MO-65355,US,MO,65355,6.1,,,, +US-MO-65360,US,MO,65360,6.725,,,, +US-MO-65401,US,MO,65401,7.85,,,, +US-MO-65402,US,MO,65402,7.85,,,, +US-MO-65409,US,MO,65409,7.85,,,, +US-MO-65436,US,MO,65436,5.35,,,, +US-MO-65438,US,MO,65438,7.225,,,, +US-MO-65439,US,MO,65439,5.725,,,, +US-MO-65440,US,MO,65440,5.225,,,, +US-MO-65441,US,MO,65441,6.975,,,, +US-MO-65443,US,MO,65443,6.391,,,, +US-MO-65444,US,MO,65444,5.725,,,, +US-MO-65446,US,MO,65446,5.975,,,, +US-MO-65449,US,MO,65449,5.975,,,, +US-MO-65452,US,MO,65452,5.475,,,, +US-MO-65453,US,MO,65453,6.475,,,, +US-MO-65456,US,MO,65456,5.975,,,, +US-MO-65457,US,MO,65457,5.475,,,, +US-MO-65459,US,MO,65459,4.975,,,, +US-MO-65461,US,MO,65461,5.35,,,, +US-MO-65462,US,MO,65462,5.35,,,, +US-MO-65463,US,MO,65463,5.225,,,, +US-MO-65464,US,MO,65464,5.725,,,, +US-MO-65466,US,MO,65466,7.225,,,, +US-MO-65468,US,MO,65468,5.725,,,, +US-MO-65470,US,MO,65470,5.225,,,, +US-MO-65473,US,MO,65473,4.975,,,, +US-MO-65479,US,MO,65479,5.725,,,, +US-MO-65483,US,MO,65483,7.35,,,, +US-MO-65484,US,MO,65484,5.725,,,, +US-MO-65486,US,MO,65486,5.725,,,, +US-MO-65501,US,MO,65501,5.225,,,, +US-MO-65529,US,MO,65529,5.35,,,, +US-MO-65532,US,MO,65532,5.225,,,, +US-MO-65534,US,MO,65534,5.475,,,, +US-MO-65535,US,MO,65535,6.475,,,, +US-MO-65536,US,MO,65536,5.225,,,, +US-MO-65541,US,MO,65541,5.225,,,, +US-MO-65542,US,MO,65542,5.725,,,, +US-MO-65543,US,MO,65543,5.225,,,, +US-MO-65548,US,MO,65548,7.162,,,, +US-MO-65550,US,MO,65550,5.35,,,, +US-MO-65552,US,MO,65552,5.725,,,, +US-MO-65555,US,MO,65555,5.725,,,, +US-MO-65556,US,MO,65556,5.475,,,, +US-MO-65557,US,MO,65557,5.725,,,, +US-MO-65559,US,MO,65559,5.85,,,, +US-MO-65560,US,MO,65560,5.225,,,, +US-MO-65564,US,MO,65564,5.725,,,, +US-MO-65565,US,MO,65565,8.475,,,, +US-MO-65566,US,MO,65566,7.225,,,, +US-MO-65567,US,MO,65567,5.475,,,, +US-MO-65570,US,MO,65570,5.725,,,, +US-MO-65571,US,MO,65571,7.225,,,, +US-MO-65580,US,MO,65580,5.891,,,, +US-MO-65582,US,MO,65582,6.391,,,, +US-MO-65583,US,MO,65583,5.475,,,, +US-MO-65584,US,MO,65584,5.475,,,, +US-MO-65586,US,MO,65586,5.975,,,, +US-MO-65588,US,MO,65588,7.225,,,, +US-MO-65589,US,MO,65589,5.725,,,, +US-MO-65590,US,MO,65590,6.225,,,, +US-MO-65591,US,MO,65591,5.475,,,, +US-MO-65601,US,MO,65601,5.6,,,, +US-MO-65603,US,MO,65603,6.475,,,, +US-MO-65604,US,MO,65604,5.475,,,, +US-MO-65605,US,MO,65605,7.725,,,, +US-MO-65606,US,MO,65606,8.225,,,, +US-MO-65607,US,MO,65607,7.975,,,, +US-MO-65608,US,MO,65608,7.225,,,, +US-MO-65609,US,MO,65609,5.162,,,, +US-MO-65610,US,MO,65610,5.975,,,, +US-MO-65611,US,MO,65611,6.475,,,, +US-MO-65612,US,MO,65612,5.475,,,, +US-MO-65613,US,MO,65613,8.1,,,, +US-MO-65614,US,MO,65614,6.1,,,, +US-MO-65615,US,MO,65615,9.6,,,, +US-MO-65616,US,MO,65616,8.6,,,, +US-MO-65617,US,MO,65617,5.6,,,, +US-MO-65618,US,MO,65618,8.225,,,, +US-MO-65619,US,MO,65619,6.975,,,, +US-MO-65620,US,MO,65620,5.975,,,, +US-MO-65622,US,MO,65622,8.225,,,, +US-MO-65623,US,MO,65623,6.725,,,, +US-MO-65624,US,MO,65624,6.475,,,, +US-MO-65625,US,MO,65625,5.725,,,, +US-MO-65626,US,MO,65626,5.162,,,, +US-MO-65627,US,MO,65627,6.1,,,, +US-MO-65629,US,MO,65629,5.975,,,, +US-MO-65630,US,MO,65630,5.975,,,, +US-MO-65631,US,MO,65631,5.975,,,, +US-MO-65632,US,MO,65632,5.225,,,, +US-MO-65633,US,MO,65633,5.975,,,, +US-MO-65634,US,MO,65634,5.725,,,, +US-MO-65635,US,MO,65635,6.475,,,, +US-MO-65636,US,MO,65636,7.558,,,, +US-MO-65637,US,MO,65637,6.725,,,, +US-MO-65638,US,MO,65638,7.225,,,, +US-MO-65640,US,MO,65640,5.6,,,, +US-MO-65641,US,MO,65641,5.725,,,, +US-MO-65644,US,MO,65644,6.058,,,, +US-MO-65645,US,MO,65645,5.6,,,, +US-MO-65646,US,MO,65646,5.725,,,, +US-MO-65647,US,MO,65647,5.725,,,, +US-MO-65648,US,MO,65648,5.475,,,, +US-MO-65649,US,MO,65649,5.6,,,, +US-MO-65650,US,MO,65650,5.6,,,, +US-MO-65652,US,MO,65652,6.058,,,, +US-MO-65653,US,MO,65653,6.1,,,, +US-MO-65654,US,MO,65654,5.725,,,, +US-MO-65655,US,MO,65655,8.225,,,, +US-MO-65656,US,MO,65656,5.975,,,, +US-MO-65657,US,MO,65657,5.975,,,, +US-MO-65658,US,MO,65658,5.725,,,, +US-MO-65660,US,MO,65660,5.225,,,, +US-MO-65661,US,MO,65661,7.6,,,, +US-MO-65662,US,MO,65662,5.225,,,, +US-MO-65663,US,MO,65663,5.6,,,, +US-MO-65664,US,MO,65664,5.725,,,, +US-MO-65666,US,MO,65666,6.725,,,, +US-MO-65667,US,MO,65667,5.225,,,, +US-MO-65668,US,MO,65668,7.225,,,, +US-MO-65669,US,MO,65669,5.975,,,, +US-MO-65672,US,MO,65672,6.1,,,, +US-MO-65673,US,MO,65673,8.1,,,, +US-MO-65674,US,MO,65674,7.225,,,, +US-MO-65675,US,MO,65675,6.975,,,, +US-MO-65676,US,MO,65676,6.725,,,, +US-MO-65679,US,MO,65679,6.1,,,, +US-MO-65680,US,MO,65680,6.1,,,, +US-MO-65681,US,MO,65681,6.475,,,, +US-MO-65682,US,MO,65682,7.6,,,, +US-MO-65685,US,MO,65685,5.6,,,, +US-MO-65686,US,MO,65686,6.475,,,, +US-MO-65688,US,MO,65688,5.162,,,, +US-MO-65689,US,MO,65689,5.725,,,, +US-MO-65690,US,MO,65690,8.225,,,, +US-MO-65692,US,MO,65692,9.225,,,, +US-MO-65702,US,MO,65702,5.225,,,, +US-MO-65704,US,MO,65704,5.225,,,, +US-MO-65705,US,MO,65705,5.725,,,, +US-MO-65706,US,MO,65706,6.058,,,, +US-MO-65707,US,MO,65707,5.725,,,, +US-MO-65708,US,MO,65708,7.475,,,, +US-MO-65710,US,MO,65710,5.6,,,, +US-MO-65711,US,MO,65711,7.225,,,, +US-MO-65712,US,MO,65712,5.725,,,, +US-MO-65713,US,MO,65713,6.058,,,, +US-MO-65714,US,MO,65714,7.475,,,, +US-MO-65715,US,MO,65715,7.225,,,, +US-MO-65717,US,MO,65717,5.225,,,, +US-MO-65720,US,MO,65720,5.975,,,, +US-MO-65721,US,MO,65721,7.975,,,, +US-MO-65722,US,MO,65722,5.225,,,, +US-MO-65723,US,MO,65723,5.725,,,, +US-MO-65724,US,MO,65724,5.725,,,, +US-MO-65725,US,MO,65725,5.475,,,, +US-MO-65726,US,MO,65726,6.1,,,, +US-MO-65727,US,MO,65727,5.6,,,, +US-MO-65728,US,MO,65728,5.975,,,, +US-MO-65729,US,MO,65729,6.725,,,, +US-MO-65730,US,MO,65730,6.225,,,, +US-MO-65731,US,MO,65731,6.1,,,, +US-MO-65732,US,MO,65732,6.725,,,, +US-MO-65733,US,MO,65733,6.1,,,, +US-MO-65734,US,MO,65734,5.725,,,, +US-MO-65735,US,MO,65735,5.725,,,, +US-MO-65737,US,MO,65737,6.475,,,, +US-MO-65738,US,MO,65738,7.85,,,, +US-MO-65739,US,MO,65739,6.1,,,, +US-MO-65740,US,MO,65740,7.6,,,, +US-MO-65741,US,MO,65741,6.725,,,, +US-MO-65742,US,MO,65742,5.475,,,, +US-MO-65744,US,MO,65744,6.1,,,, +US-MO-65745,US,MO,65745,5.725,,,, +US-MO-65746,US,MO,65746,6.058,,,, +US-MO-65747,US,MO,65747,5.975,,,, +US-MO-65752,US,MO,65752,5.725,,,, +US-MO-65753,US,MO,65753,5.975,,,, +US-MO-65754,US,MO,65754,5.975,,,, +US-MO-65755,US,MO,65755,5.725,,,, +US-MO-65756,US,MO,65756,5.725,,,, +US-MO-65757,US,MO,65757,5.475,,,, +US-MO-65759,US,MO,65759,6.1,,,, +US-MO-65760,US,MO,65760,6.725,,,, +US-MO-65761,US,MO,65761,6.1,,,, +US-MO-65762,US,MO,65762,6.725,,,, +US-MO-65764,US,MO,65764,6.225,,,, +US-MO-65765,US,MO,65765,5.475,,,, +US-MO-65766,US,MO,65766,7.725,,,, +US-MO-65767,US,MO,65767,7.725,,,, +US-MO-65768,US,MO,65768,7.225,,,, +US-MO-65769,US,MO,65769,5.725,,,, +US-MO-65770,US,MO,65770,5.475,,,, +US-MO-65771,US,MO,65771,6.1,,,, +US-MO-65772,US,MO,65772,5.725,,,, +US-MO-65773,US,MO,65773,6.725,,,, +US-MO-65774,US,MO,65774,7.225,,,, +US-MO-65775,US,MO,65775,5.162,,,, +US-MO-65777,US,MO,65777,5.162,,,, +US-MO-65778,US,MO,65778,6.225,,,, +US-MO-65779,US,MO,65779,7.725,,,, +US-MO-65781,US,MO,65781,5.475,,,, +US-MO-65783,US,MO,65783,6.225,,,, +US-MO-65784,US,MO,65784,6.725,,,, +US-MO-65785,US,MO,65785,5.725,,,, +US-MO-65786,US,MO,65786,5.475,,,, +US-MO-65787,US,MO,65787,5.475,,,, +US-MO-65788,US,MO,65788,5.162,,,, +US-MO-65789,US,MO,65789,5.162,,,, +US-MO-65790,US,MO,65790,5.162,,,, +US-MO-65791,US,MO,65791,8.225,,,, +US-MO-65793,US,MO,65793,6.912,,,, +US-MO-65801,US,MO,65801,7.6,,,, +US-MO-65802,US,MO,65802,7.6,,,, +US-MO-65803,US,MO,65803,7.6,,,, +US-MO-65804,US,MO,65804,7.6,,,, +US-MO-65805,US,MO,65805,7.6,,,, +US-MO-65806,US,MO,65806,7.6,,,, +US-MO-65807,US,MO,65807,7.6,,,, +US-MO-65808,US,MO,65808,7.6,,,, +US-MO-65809,US,MO,65809,5.475,,,, +US-MO-65810,US,MO,65810,5.475,,,, +US-MO-65814,US,MO,65814,7.6,,,, +US-MO-65817,US,MO,65817,7.6,,,, +US-MO-65890,US,MO,65890,7.6,,,, +US-MO-65897,US,MO,65897,7.6,,,, +US-MO-65898,US,MO,65898,7.6,,,, +US-MO-65899,US,MO,65899,7.6,,,, +US-MS-38601,US,MS,38601,7,,,, +US-MS-38602,US,MS,38602,7,,,, +US-MS-38603,US,MS,38603,7,,,, +US-MS-38606,US,MS,38606,7,,,, +US-MS-38609,US,MS,38609,7,,,, +US-MS-38610,US,MS,38610,7,,,, +US-MS-38611,US,MS,38611,7,,,, +US-MS-38614,US,MS,38614,7,,,, +US-MS-38617,US,MS,38617,7,,,, +US-MS-38618,US,MS,38618,7,,,, +US-MS-38619,US,MS,38619,7,,,, +US-MS-38620,US,MS,38620,7,,,, +US-MS-38621,US,MS,38621,7,,,, +US-MS-38622,US,MS,38622,7,,,, +US-MS-38623,US,MS,38623,7,,,, +US-MS-38625,US,MS,38625,7,,,, +US-MS-38626,US,MS,38626,7,,,, +US-MS-38627,US,MS,38627,7,,,, +US-MS-38628,US,MS,38628,7,,,, +US-MS-38629,US,MS,38629,7,,,, +US-MS-38631,US,MS,38631,7,,,, +US-MS-38632,US,MS,38632,7,,,, +US-MS-38633,US,MS,38633,7,,,, +US-MS-38634,US,MS,38634,7,,,, +US-MS-38635,US,MS,38635,7,,,, +US-MS-38637,US,MS,38637,7,,,, +US-MS-38638,US,MS,38638,7,,,, +US-MS-38639,US,MS,38639,7,,,, +US-MS-38641,US,MS,38641,7,,,, +US-MS-38642,US,MS,38642,7,,,, +US-MS-38643,US,MS,38643,7,,,, +US-MS-38644,US,MS,38644,7,,,, +US-MS-38645,US,MS,38645,7,,,, +US-MS-38646,US,MS,38646,7,,,, +US-MS-38647,US,MS,38647,7,,,, +US-MS-38649,US,MS,38649,7,,,, +US-MS-38650,US,MS,38650,7,,,, +US-MS-38651,US,MS,38651,7,,,, +US-MS-38652,US,MS,38652,7,,,, +US-MS-38654,US,MS,38654,7,,,, +US-MS-38655,US,MS,38655,7,,,, +US-MS-38658,US,MS,38658,7,,,, +US-MS-38659,US,MS,38659,7,,,, +US-MS-38661,US,MS,38661,7,,,, +US-MS-38663,US,MS,38663,7,,,, +US-MS-38664,US,MS,38664,7,,,, +US-MS-38665,US,MS,38665,7,,,, +US-MS-38666,US,MS,38666,7,,,, +US-MS-38668,US,MS,38668,7,,,, +US-MS-38669,US,MS,38669,7,,,, +US-MS-38670,US,MS,38670,7,,,, +US-MS-38671,US,MS,38671,7,,,, +US-MS-38672,US,MS,38672,7,,,, +US-MS-38673,US,MS,38673,7,,,, +US-MS-38674,US,MS,38674,7,,,, +US-MS-38675,US,MS,38675,7,,,, +US-MS-38676,US,MS,38676,7,,,, +US-MS-38677,US,MS,38677,7,,,, +US-MS-38679,US,MS,38679,7,,,, +US-MS-38680,US,MS,38680,7,,,, +US-MS-38683,US,MS,38683,7,,,, +US-MS-38685,US,MS,38685,7,,,, +US-MS-38686,US,MS,38686,7,,,, +US-MS-38701,US,MS,38701,7,,,, +US-MS-38702,US,MS,38702,7,,,, +US-MS-38703,US,MS,38703,7,,,, +US-MS-38704,US,MS,38704,7,,,, +US-MS-38720,US,MS,38720,7,,,, +US-MS-38721,US,MS,38721,7,,,, +US-MS-38722,US,MS,38722,7,,,, +US-MS-38723,US,MS,38723,7,,,, +US-MS-38725,US,MS,38725,7,,,, +US-MS-38726,US,MS,38726,7,,,, +US-MS-38730,US,MS,38730,7,,,, +US-MS-38731,US,MS,38731,7,,,, +US-MS-38732,US,MS,38732,7,,,, +US-MS-38733,US,MS,38733,7,,,, +US-MS-38736,US,MS,38736,7,,,, +US-MS-38737,US,MS,38737,7,,,, +US-MS-38738,US,MS,38738,7,,,, +US-MS-38739,US,MS,38739,7,,,, +US-MS-38740,US,MS,38740,7,,,, +US-MS-38744,US,MS,38744,7,,,, +US-MS-38745,US,MS,38745,7,,,, +US-MS-38746,US,MS,38746,7,,,, +US-MS-38748,US,MS,38748,7,,,, +US-MS-38749,US,MS,38749,7,,,, +US-MS-38751,US,MS,38751,7,,,, +US-MS-38753,US,MS,38753,7,,,, +US-MS-38754,US,MS,38754,7,,,, +US-MS-38756,US,MS,38756,7,,,, +US-MS-38759,US,MS,38759,7,,,, +US-MS-38760,US,MS,38760,7,,,, +US-MS-38761,US,MS,38761,7,,,, +US-MS-38762,US,MS,38762,7,,,, +US-MS-38764,US,MS,38764,7,,,, +US-MS-38765,US,MS,38765,7,,,, +US-MS-38767,US,MS,38767,7,,,, +US-MS-38768,US,MS,38768,7,,,, +US-MS-38769,US,MS,38769,7,,,, +US-MS-38771,US,MS,38771,7,,,, +US-MS-38772,US,MS,38772,7,,,, +US-MS-38773,US,MS,38773,7,,,, +US-MS-38774,US,MS,38774,7,,,, +US-MS-38776,US,MS,38776,7,,,, +US-MS-38778,US,MS,38778,7,,,, +US-MS-38780,US,MS,38780,7,,,, +US-MS-38781,US,MS,38781,7,,,, +US-MS-38782,US,MS,38782,7,,,, +US-MS-38801,US,MS,38801,7.25,,,, +US-MS-38802,US,MS,38802,7.25,,,, +US-MS-38803,US,MS,38803,7.25,,,, +US-MS-38804,US,MS,38804,7.25,,,, +US-MS-38820,US,MS,38820,7,,,, +US-MS-38821,US,MS,38821,7,,,, +US-MS-38824,US,MS,38824,7,,,, +US-MS-38825,US,MS,38825,7,,,, +US-MS-38826,US,MS,38826,7.25,,,, +US-MS-38827,US,MS,38827,7,,,, +US-MS-38828,US,MS,38828,7,,,, +US-MS-38829,US,MS,38829,7,,,, +US-MS-38833,US,MS,38833,7,,,, +US-MS-38834,US,MS,38834,7,,,, +US-MS-38835,US,MS,38835,7,,,, +US-MS-38838,US,MS,38838,7,,,, +US-MS-38839,US,MS,38839,7,,,, +US-MS-38841,US,MS,38841,7,,,, +US-MS-38843,US,MS,38843,7,,,, +US-MS-38844,US,MS,38844,7,,,, +US-MS-38846,US,MS,38846,7,,,, +US-MS-38847,US,MS,38847,7,,,, +US-MS-38848,US,MS,38848,7,,,, +US-MS-38849,US,MS,38849,7,,,, +US-MS-38850,US,MS,38850,7,,,, +US-MS-38851,US,MS,38851,7,,,, +US-MS-38852,US,MS,38852,7,,,, +US-MS-38855,US,MS,38855,7,,,, +US-MS-38856,US,MS,38856,7,,,, +US-MS-38857,US,MS,38857,7,,,, +US-MS-38858,US,MS,38858,7,,,, +US-MS-38859,US,MS,38859,7,,,, +US-MS-38860,US,MS,38860,7,,,, +US-MS-38862,US,MS,38862,7,,,, +US-MS-38863,US,MS,38863,7,,,, +US-MS-38864,US,MS,38864,7,,,, +US-MS-38865,US,MS,38865,7,,,, +US-MS-38866,US,MS,38866,7,,,, +US-MS-38868,US,MS,38868,7,,,, +US-MS-38869,US,MS,38869,7,,,, +US-MS-38870,US,MS,38870,7,,,, +US-MS-38871,US,MS,38871,7,,,, +US-MS-38873,US,MS,38873,7,,,, +US-MS-38874,US,MS,38874,7,,,, +US-MS-38875,US,MS,38875,7,,,, +US-MS-38876,US,MS,38876,7,,,, +US-MS-38877,US,MS,38877,7,,,, +US-MS-38878,US,MS,38878,7,,,, +US-MS-38879,US,MS,38879,7,,,, +US-MS-38880,US,MS,38880,7,,,, +US-MS-38901,US,MS,38901,7,,,, +US-MS-38902,US,MS,38902,7,,,, +US-MS-38913,US,MS,38913,7,,,, +US-MS-38914,US,MS,38914,7,,,, +US-MS-38915,US,MS,38915,7,,,, +US-MS-38916,US,MS,38916,7,,,, +US-MS-38917,US,MS,38917,7,,,, +US-MS-38920,US,MS,38920,7,,,, +US-MS-38921,US,MS,38921,7,,,, +US-MS-38922,US,MS,38922,7,,,, +US-MS-38923,US,MS,38923,7,,,, +US-MS-38924,US,MS,38924,7,,,, +US-MS-38925,US,MS,38925,7,,,, +US-MS-38926,US,MS,38926,7,,,, +US-MS-38927,US,MS,38927,7,,,, +US-MS-38928,US,MS,38928,7,,,, +US-MS-38929,US,MS,38929,7,,,, +US-MS-38930,US,MS,38930,7,,,, +US-MS-38935,US,MS,38935,7,,,, +US-MS-38940,US,MS,38940,7,,,, +US-MS-38941,US,MS,38941,7,,,, +US-MS-38943,US,MS,38943,7,,,, +US-MS-38944,US,MS,38944,7,,,, +US-MS-38945,US,MS,38945,7,,,, +US-MS-38946,US,MS,38946,7,,,, +US-MS-38947,US,MS,38947,7,,,, +US-MS-38948,US,MS,38948,7,,,, +US-MS-38949,US,MS,38949,7,,,, +US-MS-38950,US,MS,38950,7,,,, +US-MS-38951,US,MS,38951,7,,,, +US-MS-38952,US,MS,38952,7,,,, +US-MS-38953,US,MS,38953,7,,,, +US-MS-38954,US,MS,38954,7,,,, +US-MS-38955,US,MS,38955,7,,,, +US-MS-38957,US,MS,38957,7,,,, +US-MS-38958,US,MS,38958,7,,,, +US-MS-38959,US,MS,38959,7,,,, +US-MS-38960,US,MS,38960,7,,,, +US-MS-38961,US,MS,38961,7,,,, +US-MS-38962,US,MS,38962,7,,,, +US-MS-38963,US,MS,38963,7,,,, +US-MS-38964,US,MS,38964,7,,,, +US-MS-38965,US,MS,38965,7,,,, +US-MS-38966,US,MS,38966,7,,,, +US-MS-38967,US,MS,38967,7,,,, +US-MS-39038,US,MS,39038,7,,,, +US-MS-39039,US,MS,39039,7,,,, +US-MS-39040,US,MS,39040,7,,,, +US-MS-39041,US,MS,39041,7,,,, +US-MS-39042,US,MS,39042,7,,,, +US-MS-39043,US,MS,39043,7,,,, +US-MS-39044,US,MS,39044,7,,,, +US-MS-39045,US,MS,39045,7,,,, +US-MS-39046,US,MS,39046,7,,,, +US-MS-39047,US,MS,39047,7,,,, +US-MS-39051,US,MS,39051,7,,,, +US-MS-39054,US,MS,39054,7,,,, +US-MS-39056,US,MS,39056,7,,,, +US-MS-39057,US,MS,39057,7,,,, +US-MS-39058,US,MS,39058,7,,,, +US-MS-39059,US,MS,39059,7,,,, +US-MS-39060,US,MS,39060,7,,,, +US-MS-39061,US,MS,39061,7,,,, +US-MS-39062,US,MS,39062,7,,,, +US-MS-39063,US,MS,39063,7,,,, +US-MS-39066,US,MS,39066,7,,,, +US-MS-39067,US,MS,39067,7,,,, +US-MS-39069,US,MS,39069,7,,,, +US-MS-39071,US,MS,39071,7,,,, +US-MS-39072,US,MS,39072,7,,,, +US-MS-39073,US,MS,39073,7,,,, +US-MS-39074,US,MS,39074,7,,,, +US-MS-39077,US,MS,39077,7,,,, +US-MS-39078,US,MS,39078,7,,,, +US-MS-39079,US,MS,39079,7,,,, +US-MS-39080,US,MS,39080,7,,,, +US-MS-39081,US,MS,39081,7,,,, +US-MS-39082,US,MS,39082,7,,,, +US-MS-39083,US,MS,39083,7,,,, +US-MS-39086,US,MS,39086,7,,,, +US-MS-39087,US,MS,39087,7,,,, +US-MS-39088,US,MS,39088,7,,,, +US-MS-39090,US,MS,39090,7,,,, +US-MS-39092,US,MS,39092,7,,,, +US-MS-39094,US,MS,39094,7,,,, +US-MS-39095,US,MS,39095,7,,,, +US-MS-39096,US,MS,39096,7,,,, +US-MS-39097,US,MS,39097,7,,,, +US-MS-39098,US,MS,39098,7,,,, +US-MS-39107,US,MS,39107,7,,,, +US-MS-39108,US,MS,39108,7,,,, +US-MS-39109,US,MS,39109,7,,,, +US-MS-39110,US,MS,39110,7,,,, +US-MS-39111,US,MS,39111,7,,,, +US-MS-39113,US,MS,39113,7,,,, +US-MS-39114,US,MS,39114,7,,,, +US-MS-39115,US,MS,39115,7,,,, +US-MS-39116,US,MS,39116,7,,,, +US-MS-39117,US,MS,39117,7,,,, +US-MS-39119,US,MS,39119,7,,,, +US-MS-39120,US,MS,39120,7,,,, +US-MS-39121,US,MS,39121,7,,,, +US-MS-39122,US,MS,39122,7,,,, +US-MS-39130,US,MS,39130,7,,,, +US-MS-39140,US,MS,39140,7,,,, +US-MS-39144,US,MS,39144,7,,,, +US-MS-39145,US,MS,39145,7,,,, +US-MS-39146,US,MS,39146,7,,,, +US-MS-39148,US,MS,39148,7,,,, +US-MS-39149,US,MS,39149,7,,,, +US-MS-39150,US,MS,39150,7,,,, +US-MS-39151,US,MS,39151,7,,,, +US-MS-39152,US,MS,39152,7,,,, +US-MS-39153,US,MS,39153,7,,,, +US-MS-39154,US,MS,39154,7,,,, +US-MS-39156,US,MS,39156,7,,,, +US-MS-39157,US,MS,39157,7,,,, +US-MS-39158,US,MS,39158,7,,,, +US-MS-39159,US,MS,39159,7,,,, +US-MS-39160,US,MS,39160,7,,,, +US-MS-39161,US,MS,39161,7,,,, +US-MS-39162,US,MS,39162,7,,,, +US-MS-39163,US,MS,39163,7,,,, +US-MS-39165,US,MS,39165,7,,,, +US-MS-39166,US,MS,39166,7,,,, +US-MS-39167,US,MS,39167,7,,,, +US-MS-39168,US,MS,39168,7,,,, +US-MS-39169,US,MS,39169,7,,,, +US-MS-39170,US,MS,39170,7,,,, +US-MS-39171,US,MS,39171,7,,,, +US-MS-39173,US,MS,39173,7,,,, +US-MS-39174,US,MS,39174,7,,,, +US-MS-39175,US,MS,39175,7,,,, +US-MS-39176,US,MS,39176,7,,,, +US-MS-39177,US,MS,39177,7,,,, +US-MS-39179,US,MS,39179,7,,,, +US-MS-39180,US,MS,39180,7,,,, +US-MS-39181,US,MS,39181,7,,,, +US-MS-39182,US,MS,39182,7,,,, +US-MS-39183,US,MS,39183,7,,,, +US-MS-39189,US,MS,39189,7,,,, +US-MS-39190,US,MS,39190,7,,,, +US-MS-39191,US,MS,39191,7,,,, +US-MS-39192,US,MS,39192,7,,,, +US-MS-39193,US,MS,39193,7,,,, +US-MS-39194,US,MS,39194,7,,,, +US-MS-39201,US,MS,39201,7,,,, +US-MS-39202,US,MS,39202,7,,,, +US-MS-39203,US,MS,39203,7,,,, +US-MS-39204,US,MS,39204,7,,,, +US-MS-39205,US,MS,39205,7,,,, +US-MS-39206,US,MS,39206,7,,,, +US-MS-39207,US,MS,39207,7,,,, +US-MS-39208,US,MS,39208,7,,,, +US-MS-39209,US,MS,39209,7,,,, +US-MS-39210,US,MS,39210,7,,,, +US-MS-39211,US,MS,39211,7,,,, +US-MS-39212,US,MS,39212,7,,,, +US-MS-39213,US,MS,39213,7,,,, +US-MS-39215,US,MS,39215,7,,,, +US-MS-39216,US,MS,39216,7,,,, +US-MS-39217,US,MS,39217,7,,,, +US-MS-39218,US,MS,39218,7,,,, +US-MS-39225,US,MS,39225,7,,,, +US-MS-39232,US,MS,39232,7,,,, +US-MS-39236,US,MS,39236,7,,,, +US-MS-39250,US,MS,39250,7,,,, +US-MS-39269,US,MS,39269,7,,,, +US-MS-39272,US,MS,39272,7,,,, +US-MS-39282,US,MS,39282,7,,,, +US-MS-39283,US,MS,39283,7,,,, +US-MS-39284,US,MS,39284,7,,,, +US-MS-39286,US,MS,39286,7,,,, +US-MS-39288,US,MS,39288,7,,,, +US-MS-39289,US,MS,39289,7,,,, +US-MS-39296,US,MS,39296,7,,,, +US-MS-39298,US,MS,39298,7,,,, +US-MS-39301,US,MS,39301,7,,,, +US-MS-39302,US,MS,39302,7,,,, +US-MS-39303,US,MS,39303,7,,,, +US-MS-39304,US,MS,39304,7,,,, +US-MS-39305,US,MS,39305,7,,,, +US-MS-39307,US,MS,39307,7,,,, +US-MS-39309,US,MS,39309,7,,,, +US-MS-39320,US,MS,39320,7,,,, +US-MS-39322,US,MS,39322,7,,,, +US-MS-39323,US,MS,39323,7,,,, +US-MS-39324,US,MS,39324,7,,,, +US-MS-39325,US,MS,39325,7,,,, +US-MS-39326,US,MS,39326,7,,,, +US-MS-39327,US,MS,39327,7,,,, +US-MS-39328,US,MS,39328,7,,,, +US-MS-39330,US,MS,39330,7,,,, +US-MS-39332,US,MS,39332,7,,,, +US-MS-39335,US,MS,39335,7,,,, +US-MS-39336,US,MS,39336,7,,,, +US-MS-39337,US,MS,39337,7,,,, +US-MS-39338,US,MS,39338,7,,,, +US-MS-39339,US,MS,39339,7,,,, +US-MS-39341,US,MS,39341,7,,,, +US-MS-39342,US,MS,39342,7,,,, +US-MS-39345,US,MS,39345,7,,,, +US-MS-39346,US,MS,39346,7,,,, +US-MS-39347,US,MS,39347,7,,,, +US-MS-39348,US,MS,39348,7,,,, +US-MS-39350,US,MS,39350,7,,,, +US-MS-39352,US,MS,39352,7,,,, +US-MS-39354,US,MS,39354,7,,,, +US-MS-39355,US,MS,39355,7,,,, +US-MS-39356,US,MS,39356,7,,,, +US-MS-39358,US,MS,39358,7,,,, +US-MS-39359,US,MS,39359,7,,,, +US-MS-39360,US,MS,39360,7,,,, +US-MS-39361,US,MS,39361,7,,,, +US-MS-39362,US,MS,39362,7,,,, +US-MS-39363,US,MS,39363,7,,,, +US-MS-39364,US,MS,39364,7,,,, +US-MS-39365,US,MS,39365,7,,,, +US-MS-39366,US,MS,39366,7,,,, +US-MS-39367,US,MS,39367,7,,,, +US-MS-39401,US,MS,39401,7,,,, +US-MS-39402,US,MS,39402,7,,,, +US-MS-39403,US,MS,39403,7,,,, +US-MS-39404,US,MS,39404,7,,,, +US-MS-39406,US,MS,39406,7,,,, +US-MS-39407,US,MS,39407,7,,,, +US-MS-39421,US,MS,39421,7,,,, +US-MS-39422,US,MS,39422,7,,,, +US-MS-39423,US,MS,39423,7,,,, +US-MS-39425,US,MS,39425,7,,,, +US-MS-39426,US,MS,39426,7,,,, +US-MS-39427,US,MS,39427,7,,,, +US-MS-39428,US,MS,39428,7,,,, +US-MS-39429,US,MS,39429,7,,,, +US-MS-39436,US,MS,39436,7,,,, +US-MS-39437,US,MS,39437,7,,,, +US-MS-39439,US,MS,39439,7,,,, +US-MS-39440,US,MS,39440,7,,,, +US-MS-39441,US,MS,39441,7,,,, +US-MS-39442,US,MS,39442,7,,,, +US-MS-39443,US,MS,39443,7,,,, +US-MS-39451,US,MS,39451,7,,,, +US-MS-39452,US,MS,39452,7,,,, +US-MS-39455,US,MS,39455,7,,,, +US-MS-39456,US,MS,39456,7,,,, +US-MS-39457,US,MS,39457,7,,,, +US-MS-39459,US,MS,39459,7,,,, +US-MS-39460,US,MS,39460,7,,,, +US-MS-39461,US,MS,39461,7,,,, +US-MS-39462,US,MS,39462,7,,,, +US-MS-39463,US,MS,39463,7,,,, +US-MS-39464,US,MS,39464,7,,,, +US-MS-39465,US,MS,39465,7,,,, +US-MS-39466,US,MS,39466,7,,,, +US-MS-39470,US,MS,39470,7,,,, +US-MS-39474,US,MS,39474,7,,,, +US-MS-39475,US,MS,39475,7,,,, +US-MS-39476,US,MS,39476,7,,,, +US-MS-39477,US,MS,39477,7,,,, +US-MS-39478,US,MS,39478,7,,,, +US-MS-39479,US,MS,39479,7,,,, +US-MS-39480,US,MS,39480,7,,,, +US-MS-39481,US,MS,39481,7,,,, +US-MS-39482,US,MS,39482,7,,,, +US-MS-39483,US,MS,39483,7,,,, +US-MS-39501,US,MS,39501,7,,,, +US-MS-39502,US,MS,39502,7,,,, +US-MS-39503,US,MS,39503,7,,,, +US-MS-39505,US,MS,39505,7,,,, +US-MS-39506,US,MS,39506,7,,,, +US-MS-39507,US,MS,39507,7,,,, +US-MS-39520,US,MS,39520,7,,,, +US-MS-39521,US,MS,39521,7,,,, +US-MS-39522,US,MS,39522,7,,,, +US-MS-39525,US,MS,39525,7,,,, +US-MS-39529,US,MS,39529,7,,,, +US-MS-39530,US,MS,39530,7,,,, +US-MS-39531,US,MS,39531,7,,,, +US-MS-39532,US,MS,39532,7,,,, +US-MS-39533,US,MS,39533,7,,,, +US-MS-39534,US,MS,39534,7,,,, +US-MS-39535,US,MS,39535,7,,,, +US-MS-39540,US,MS,39540,7,,,, +US-MS-39552,US,MS,39552,7,,,, +US-MS-39553,US,MS,39553,7,,,, +US-MS-39555,US,MS,39555,7,,,, +US-MS-39556,US,MS,39556,7,,,, +US-MS-39558,US,MS,39558,7,,,, +US-MS-39560,US,MS,39560,7,,,, +US-MS-39561,US,MS,39561,7,,,, +US-MS-39562,US,MS,39562,7,,,, +US-MS-39563,US,MS,39563,7,,,, +US-MS-39564,US,MS,39564,7,,,, +US-MS-39565,US,MS,39565,7,,,, +US-MS-39566,US,MS,39566,7,,,, +US-MS-39567,US,MS,39567,7,,,, +US-MS-39568,US,MS,39568,7,,,, +US-MS-39569,US,MS,39569,7,,,, +US-MS-39571,US,MS,39571,7,,,, +US-MS-39572,US,MS,39572,7,,,, +US-MS-39573,US,MS,39573,7,,,, +US-MS-39574,US,MS,39574,7,,,, +US-MS-39576,US,MS,39576,7,,,, +US-MS-39577,US,MS,39577,7,,,, +US-MS-39581,US,MS,39581,7,,,, +US-MS-39595,US,MS,39595,7,,,, +US-MS-39601,US,MS,39601,7,,,, +US-MS-39602,US,MS,39602,7,,,, +US-MS-39603,US,MS,39603,7,,,, +US-MS-39629,US,MS,39629,7,,,, +US-MS-39630,US,MS,39630,7,,,, +US-MS-39631,US,MS,39631,7,,,, +US-MS-39632,US,MS,39632,7,,,, +US-MS-39633,US,MS,39633,7,,,, +US-MS-39635,US,MS,39635,7,,,, +US-MS-39638,US,MS,39638,7,,,, +US-MS-39641,US,MS,39641,7,,,, +US-MS-39643,US,MS,39643,7,,,, +US-MS-39645,US,MS,39645,7,,,, +US-MS-39647,US,MS,39647,7,,,, +US-MS-39648,US,MS,39648,7,,,, +US-MS-39649,US,MS,39649,7,,,, +US-MS-39652,US,MS,39652,7,,,, +US-MS-39653,US,MS,39653,7,,,, +US-MS-39654,US,MS,39654,7,,,, +US-MS-39656,US,MS,39656,7,,,, +US-MS-39657,US,MS,39657,7,,,, +US-MS-39661,US,MS,39661,7,,,, +US-MS-39662,US,MS,39662,7,,,, +US-MS-39663,US,MS,39663,7,,,, +US-MS-39664,US,MS,39664,7,,,, +US-MS-39665,US,MS,39665,7,,,, +US-MS-39666,US,MS,39666,7,,,, +US-MS-39667,US,MS,39667,7,,,, +US-MS-39668,US,MS,39668,7,,,, +US-MS-39669,US,MS,39669,7,,,, +US-MS-39701,US,MS,39701,7,,,, +US-MS-39702,US,MS,39702,7,,,, +US-MS-39703,US,MS,39703,7,,,, +US-MS-39704,US,MS,39704,7,,,, +US-MS-39705,US,MS,39705,7,,,, +US-MS-39710,US,MS,39710,7,,,, +US-MS-39730,US,MS,39730,7,,,, +US-MS-39735,US,MS,39735,7,,,, +US-MS-39736,US,MS,39736,7,,,, +US-MS-39737,US,MS,39737,7,,,, +US-MS-39739,US,MS,39739,7,,,, +US-MS-39740,US,MS,39740,7,,,, +US-MS-39741,US,MS,39741,7,,,, +US-MS-39743,US,MS,39743,7,,,, +US-MS-39744,US,MS,39744,7,,,, +US-MS-39745,US,MS,39745,7,,,, +US-MS-39746,US,MS,39746,7,,,, +US-MS-39747,US,MS,39747,7,,,, +US-MS-39750,US,MS,39750,7,,,, +US-MS-39751,US,MS,39751,7,,,, +US-MS-39752,US,MS,39752,7,,,, +US-MS-39753,US,MS,39753,7,,,, +US-MS-39754,US,MS,39754,7,,,, +US-MS-39755,US,MS,39755,7,,,, +US-MS-39756,US,MS,39756,7,,,, +US-MS-39759,US,MS,39759,7,,,, +US-MS-39760,US,MS,39760,7,,,, +US-MS-39762,US,MS,39762,7,,,, +US-MS-39766,US,MS,39766,7,,,, +US-MS-39767,US,MS,39767,7,,,, +US-MS-39769,US,MS,39769,7,,,, +US-MS-39771,US,MS,39771,7,,,, +US-MS-39772,US,MS,39772,7,,,, +US-MS-39773,US,MS,39773,7,,,, +US-MS-39776,US,MS,39776,7,,,, +US-NC-27006,US,NC,27006,6.75,,,, +US-NC-27007,US,NC,27007,7,,,, +US-NC-27009,US,NC,27009,6.75,,,, +US-NC-27010,US,NC,27010,6.75,,,, +US-NC-27011,US,NC,27011,6.75,,,, +US-NC-27012,US,NC,27012,6.75,,,, +US-NC-27013,US,NC,27013,7,,,, +US-NC-27014,US,NC,27014,6.75,,,, +US-NC-27016,US,NC,27016,6.75,,,, +US-NC-27017,US,NC,27017,7,,,, +US-NC-27018,US,NC,27018,6.75,,,, +US-NC-27019,US,NC,27019,6.75,,,, +US-NC-27020,US,NC,27020,6.75,,,, +US-NC-27021,US,NC,27021,6.75,,,, +US-NC-27022,US,NC,27022,6.75,,,, +US-NC-27023,US,NC,27023,6.75,,,, +US-NC-27024,US,NC,27024,7,,,, +US-NC-27025,US,NC,27025,6.75,,,, +US-NC-27027,US,NC,27027,6.75,,,, +US-NC-27028,US,NC,27028,6.75,,,, +US-NC-27030,US,NC,27030,7,,,, +US-NC-27031,US,NC,27031,7,,,, +US-NC-27040,US,NC,27040,6.75,,,, +US-NC-27041,US,NC,27041,7,,,, +US-NC-27042,US,NC,27042,6.75,,,, +US-NC-27043,US,NC,27043,6.75,,,, +US-NC-27045,US,NC,27045,6.75,,,, +US-NC-27046,US,NC,27046,6.75,,,, +US-NC-27047,US,NC,27047,7,,,, +US-NC-27048,US,NC,27048,6.75,,,, +US-NC-27049,US,NC,27049,7,,,, +US-NC-27050,US,NC,27050,6.75,,,, +US-NC-27051,US,NC,27051,6.75,,,, +US-NC-27052,US,NC,27052,6.75,,,, +US-NC-27053,US,NC,27053,6.75,,,, +US-NC-27054,US,NC,27054,7,,,, +US-NC-27055,US,NC,27055,6.75,,,, +US-NC-27094,US,NC,27094,6.75,,,, +US-NC-27098,US,NC,27098,6.75,,,, +US-NC-27099,US,NC,27099,6.75,,,, +US-NC-27101,US,NC,27101,6.75,,,, +US-NC-27102,US,NC,27102,6.75,,,, +US-NC-27103,US,NC,27103,6.75,,,, +US-NC-27104,US,NC,27104,6.75,,,, +US-NC-27105,US,NC,27105,6.75,,,, +US-NC-27106,US,NC,27106,6.75,,,, +US-NC-27107,US,NC,27107,6.75,,,, +US-NC-27108,US,NC,27108,6.75,,,, +US-NC-27109,US,NC,27109,6.75,,,, +US-NC-27110,US,NC,27110,6.75,,,, +US-NC-27111,US,NC,27111,6.75,,,, +US-NC-27113,US,NC,27113,6.75,,,, +US-NC-27114,US,NC,27114,6.75,,,, +US-NC-27115,US,NC,27115,6.75,,,, +US-NC-27116,US,NC,27116,6.75,,,, +US-NC-27117,US,NC,27117,6.75,,,, +US-NC-27120,US,NC,27120,6.75,,,, +US-NC-27127,US,NC,27127,6.75,,,, +US-NC-27130,US,NC,27130,6.75,,,, +US-NC-27150,US,NC,27150,6.75,,,, +US-NC-27152,US,NC,27152,6.75,,,, +US-NC-27155,US,NC,27155,6.75,,,, +US-NC-27157,US,NC,27157,6.75,,,, +US-NC-27198,US,NC,27198,6.75,,,, +US-NC-27199,US,NC,27199,6.75,,,, +US-NC-27201,US,NC,27201,6.75,,,, +US-NC-27202,US,NC,27202,6.75,,,, +US-NC-27203,US,NC,27203,7,,,, +US-NC-27204,US,NC,27204,7,,,, +US-NC-27205,US,NC,27205,7,,,, +US-NC-27207,US,NC,27207,6.75,,,, +US-NC-27208,US,NC,27208,6.75,,,, +US-NC-27209,US,NC,27209,7,,,, +US-NC-27212,US,NC,27212,6.75,,,, +US-NC-27213,US,NC,27213,6.75,,,, +US-NC-27214,US,NC,27214,6.75,,,, +US-NC-27215,US,NC,27215,6.75,,,, +US-NC-27216,US,NC,27216,6.75,,,, +US-NC-27217,US,NC,27217,6.75,,,, +US-NC-27228,US,NC,27228,6.75,,,, +US-NC-27229,US,NC,27229,7,,,, +US-NC-27230,US,NC,27230,7,,,, +US-NC-27231,US,NC,27231,7.5,,,, +US-NC-27233,US,NC,27233,7,,,, +US-NC-27235,US,NC,27235,6.75,,,, +US-NC-27237,US,NC,27237,7,,,, +US-NC-27239,US,NC,27239,6.75,,,, +US-NC-27242,US,NC,27242,6.75,,,, +US-NC-27243,US,NC,27243,7.5,,,, +US-NC-27244,US,NC,27244,6.75,,,, +US-NC-27247,US,NC,27247,7,,,, +US-NC-27248,US,NC,27248,7,,,, +US-NC-27249,US,NC,27249,6.75,,,, +US-NC-27252,US,NC,27252,6.75,,,, +US-NC-27253,US,NC,27253,6.75,,,, +US-NC-27256,US,NC,27256,6.75,,,, +US-NC-27258,US,NC,27258,6.75,,,, +US-NC-27259,US,NC,27259,6.75,,,, +US-NC-27260,US,NC,27260,6.75,,,, +US-NC-27261,US,NC,27261,6.75,,,, +US-NC-27262,US,NC,27262,6.75,,,, +US-NC-27263,US,NC,27263,7,,,, +US-NC-27264,US,NC,27264,7,,,, +US-NC-27265,US,NC,27265,6.75,,,, +US-NC-27278,US,NC,27278,7.5,,,, +US-NC-27281,US,NC,27281,6.75,,,, +US-NC-27282,US,NC,27282,6.75,,,, +US-NC-27283,US,NC,27283,6.75,,,, +US-NC-27284,US,NC,27284,6.75,,,, +US-NC-27285,US,NC,27285,6.75,,,, +US-NC-27288,US,NC,27288,6.75,,,, +US-NC-27289,US,NC,27289,6.75,,,, +US-NC-27291,US,NC,27291,6.75,,,, +US-NC-27292,US,NC,27292,6.75,,,, +US-NC-27293,US,NC,27293,6.75,,,, +US-NC-27294,US,NC,27294,6.75,,,, +US-NC-27295,US,NC,27295,6.75,,,, +US-NC-27298,US,NC,27298,7,,,, +US-NC-27299,US,NC,27299,6.75,,,, +US-NC-27301,US,NC,27301,6.75,,,, +US-NC-27302,US,NC,27302,6.75,,,, +US-NC-27305,US,NC,27305,6.75,,,, +US-NC-27306,US,NC,27306,7,,,, +US-NC-27310,US,NC,27310,6.75,,,, +US-NC-27311,US,NC,27311,6.75,,,, +US-NC-27312,US,NC,27312,6.75,,,, +US-NC-27313,US,NC,27313,6.75,,,, +US-NC-27314,US,NC,27314,6.75,,,, +US-NC-27315,US,NC,27315,6.75,,,, +US-NC-27316,US,NC,27316,7,,,, +US-NC-27317,US,NC,27317,7,,,, +US-NC-27320,US,NC,27320,6.75,,,, +US-NC-27323,US,NC,27323,6.75,,,, +US-NC-27325,US,NC,27325,6.75,,,, +US-NC-27326,US,NC,27326,6.75,,,, +US-NC-27330,US,NC,27330,7,,,, +US-NC-27331,US,NC,27331,7,,,, +US-NC-27332,US,NC,27332,7,,,, +US-NC-27340,US,NC,27340,6.75,,,, +US-NC-27341,US,NC,27341,7,,,, +US-NC-27342,US,NC,27342,6.75,,,, +US-NC-27343,US,NC,27343,6.75,,,, +US-NC-27344,US,NC,27344,6.75,,,, +US-NC-27349,US,NC,27349,6.75,,,, +US-NC-27350,US,NC,27350,7,,,, +US-NC-27351,US,NC,27351,6.75,,,, +US-NC-27355,US,NC,27355,7,,,, +US-NC-27356,US,NC,27356,7,,,, +US-NC-27357,US,NC,27357,6.75,,,, +US-NC-27358,US,NC,27358,6.75,,,, +US-NC-27359,US,NC,27359,6.75,,,, +US-NC-27360,US,NC,27360,6.75,,,, +US-NC-27361,US,NC,27361,6.75,,,, +US-NC-27370,US,NC,27370,7,,,, +US-NC-27371,US,NC,27371,7,,,, +US-NC-27373,US,NC,27373,6.75,,,, +US-NC-27374,US,NC,27374,6.75,,,, +US-NC-27375,US,NC,27375,6.75,,,, +US-NC-27376,US,NC,27376,6.75,,,, +US-NC-27377,US,NC,27377,6.75,,,, +US-NC-27379,US,NC,27379,6.75,,,, +US-NC-27401,US,NC,27401,6.75,,,, +US-NC-27402,US,NC,27402,6.75,,,, +US-NC-27403,US,NC,27403,6.75,,,, +US-NC-27404,US,NC,27404,6.75,,,, +US-NC-27405,US,NC,27405,6.75,,,, +US-NC-27406,US,NC,27406,6.75,,,, +US-NC-27407,US,NC,27407,6.75,,,, +US-NC-27408,US,NC,27408,6.75,,,, +US-NC-27409,US,NC,27409,6.75,,,, +US-NC-27410,US,NC,27410,6.75,,,, +US-NC-27411,US,NC,27411,6.75,,,, +US-NC-27412,US,NC,27412,6.75,,,, +US-NC-27413,US,NC,27413,6.75,,,, +US-NC-27415,US,NC,27415,6.75,,,, +US-NC-27416,US,NC,27416,6.75,,,, +US-NC-27417,US,NC,27417,6.75,,,, +US-NC-27419,US,NC,27419,6.75,,,, +US-NC-27420,US,NC,27420,6.75,,,, +US-NC-27425,US,NC,27425,6.75,,,, +US-NC-27427,US,NC,27427,6.75,,,, +US-NC-27429,US,NC,27429,6.75,,,, +US-NC-27435,US,NC,27435,6.75,,,, +US-NC-27438,US,NC,27438,6.75,,,, +US-NC-27455,US,NC,27455,6.75,,,, +US-NC-27495,US,NC,27495,6.75,,,, +US-NC-27497,US,NC,27497,6.75,,,, +US-NC-27498,US,NC,27498,6.75,,,, +US-NC-27499,US,NC,27499,6.75,,,, +US-NC-27501,US,NC,27501,6.75,,,, +US-NC-27502,US,NC,27502,6.75,,,, +US-NC-27503,US,NC,27503,7.5,,,, +US-NC-27504,US,NC,27504,6.75,,,, +US-NC-27505,US,NC,27505,6.75,,,, +US-NC-27506,US,NC,27506,6.75,,,, +US-NC-27507,US,NC,27507,6.75,,,, +US-NC-27508,US,NC,27508,6.75,,,, +US-NC-27509,US,NC,27509,6.75,,,, +US-NC-27510,US,NC,27510,7.5,,,, +US-NC-27511,US,NC,27511,6.75,,,, +US-NC-27512,US,NC,27512,6.75,,,, +US-NC-27513,US,NC,27513,6.75,,,, +US-NC-27514,US,NC,27514,7.5,,,, +US-NC-27515,US,NC,27515,7.5,,,, +US-NC-27516,US,NC,27516,7.5,,,, +US-NC-27517,US,NC,27517,6.75,,,, +US-NC-27518,US,NC,27518,6.75,,,, +US-NC-27519,US,NC,27519,6.75,,,, +US-NC-27520,US,NC,27520,6.75,,,, +US-NC-27521,US,NC,27521,6.75,,,, +US-NC-27522,US,NC,27522,6.75,,,, +US-NC-27523,US,NC,27523,6.75,,,, +US-NC-27524,US,NC,27524,6.75,,,, +US-NC-27525,US,NC,27525,6.75,,,, +US-NC-27526,US,NC,27526,6.75,,,, +US-NC-27527,US,NC,27527,6.75,,,, +US-NC-27528,US,NC,27528,6.75,,,, +US-NC-27529,US,NC,27529,6.75,,,, +US-NC-27530,US,NC,27530,6.75,,,, +US-NC-27531,US,NC,27531,6.75,,,, +US-NC-27532,US,NC,27532,6.75,,,, +US-NC-27533,US,NC,27533,6.75,,,, +US-NC-27534,US,NC,27534,6.75,,,, +US-NC-27536,US,NC,27536,6.75,,,, +US-NC-27537,US,NC,27537,6.75,,,, +US-NC-27539,US,NC,27539,6.75,,,, +US-NC-27540,US,NC,27540,6.75,,,, +US-NC-27541,US,NC,27541,6.75,,,, +US-NC-27542,US,NC,27542,6.75,,,, +US-NC-27543,US,NC,27543,6.75,,,, +US-NC-27544,US,NC,27544,6.75,,,, +US-NC-27545,US,NC,27545,6.75,,,, +US-NC-27546,US,NC,27546,6.75,,,, +US-NC-27549,US,NC,27549,6.75,,,, +US-NC-27551,US,NC,27551,6.75,,,, +US-NC-27552,US,NC,27552,6.75,,,, +US-NC-27553,US,NC,27553,6.75,,,, +US-NC-27555,US,NC,27555,6.75,,,, +US-NC-27556,US,NC,27556,6.75,,,, +US-NC-27557,US,NC,27557,6.75,,,, +US-NC-27559,US,NC,27559,6.75,,,, +US-NC-27560,US,NC,27560,6.75,,,, +US-NC-27562,US,NC,27562,6.75,,,, +US-NC-27563,US,NC,27563,6.75,,,, +US-NC-27565,US,NC,27565,6.75,,,, +US-NC-27568,US,NC,27568,6.75,,,, +US-NC-27569,US,NC,27569,6.75,,,, +US-NC-27570,US,NC,27570,6.75,,,, +US-NC-27571,US,NC,27571,6.75,,,, +US-NC-27572,US,NC,27572,7.5,,,, +US-NC-27573,US,NC,27573,6.75,,,, +US-NC-27574,US,NC,27574,6.75,,,, +US-NC-27576,US,NC,27576,6.75,,,, +US-NC-27577,US,NC,27577,6.75,,,, +US-NC-27581,US,NC,27581,6.75,,,, +US-NC-27582,US,NC,27582,6.75,,,, +US-NC-27583,US,NC,27583,6.75,,,, +US-NC-27584,US,NC,27584,6.75,,,, +US-NC-27586,US,NC,27586,6.75,,,, +US-NC-27587,US,NC,27587,6.75,,,, +US-NC-27588,US,NC,27588,6.75,,,, +US-NC-27589,US,NC,27589,6.75,,,, +US-NC-27591,US,NC,27591,6.75,,,, +US-NC-27592,US,NC,27592,6.75,,,, +US-NC-27593,US,NC,27593,6.75,,,, +US-NC-27594,US,NC,27594,6.75,,,, +US-NC-27596,US,NC,27596,6.75,,,, +US-NC-27597,US,NC,27597,6.75,,,, +US-NC-27599,US,NC,27599,7.5,,,, +US-NC-27601,US,NC,27601,6.75,,,, +US-NC-27602,US,NC,27602,6.75,,,, +US-NC-27603,US,NC,27603,6.75,,,, +US-NC-27604,US,NC,27604,6.75,,,, +US-NC-27605,US,NC,27605,6.75,,,, +US-NC-27606,US,NC,27606,6.75,,,, +US-NC-27607,US,NC,27607,6.75,,,, +US-NC-27608,US,NC,27608,6.75,,,, +US-NC-27609,US,NC,27609,6.75,,,, +US-NC-27610,US,NC,27610,6.75,,,, +US-NC-27611,US,NC,27611,6.75,,,, +US-NC-27612,US,NC,27612,6.75,,,, +US-NC-27613,US,NC,27613,6.75,,,, +US-NC-27614,US,NC,27614,6.75,,,, +US-NC-27615,US,NC,27615,6.75,,,, +US-NC-27616,US,NC,27616,6.75,,,, +US-NC-27617,US,NC,27617,6.75,,,, +US-NC-27619,US,NC,27619,6.75,,,, +US-NC-27620,US,NC,27620,6.75,,,, +US-NC-27621,US,NC,27621,6.75,,,, +US-NC-27622,US,NC,27622,6.75,,,, +US-NC-27623,US,NC,27623,6.75,,,, +US-NC-27624,US,NC,27624,6.75,,,, +US-NC-27625,US,NC,27625,6.75,,,, +US-NC-27626,US,NC,27626,6.75,,,, +US-NC-27627,US,NC,27627,6.75,,,, +US-NC-27628,US,NC,27628,6.75,,,, +US-NC-27629,US,NC,27629,6.75,,,, +US-NC-27634,US,NC,27634,6.75,,,, +US-NC-27635,US,NC,27635,6.75,,,, +US-NC-27636,US,NC,27636,6.75,,,, +US-NC-27640,US,NC,27640,6.75,,,, +US-NC-27650,US,NC,27650,6.75,,,, +US-NC-27656,US,NC,27656,6.75,,,, +US-NC-27658,US,NC,27658,6.75,,,, +US-NC-27661,US,NC,27661,6.75,,,, +US-NC-27668,US,NC,27668,6.75,,,, +US-NC-27675,US,NC,27675,6.75,,,, +US-NC-27676,US,NC,27676,6.75,,,, +US-NC-27690,US,NC,27690,6.75,,,, +US-NC-27695,US,NC,27695,6.75,,,, +US-NC-27697,US,NC,27697,6.75,,,, +US-NC-27698,US,NC,27698,6.75,,,, +US-NC-27699,US,NC,27699,6.75,,,, +US-NC-27701,US,NC,27701,7.5,,,, +US-NC-27702,US,NC,27702,7.5,,,, +US-NC-27703,US,NC,27703,7.5,,,, +US-NC-27704,US,NC,27704,7.5,,,, +US-NC-27705,US,NC,27705,7.5,,,, +US-NC-27706,US,NC,27706,7.5,,,, +US-NC-27707,US,NC,27707,7.5,,,, +US-NC-27708,US,NC,27708,7.5,,,, +US-NC-27709,US,NC,27709,7.5,,,, +US-NC-27710,US,NC,27710,7.5,,,, +US-NC-27711,US,NC,27711,7.5,,,, +US-NC-27712,US,NC,27712,7.5,,,, +US-NC-27713,US,NC,27713,7.5,,,, +US-NC-27715,US,NC,27715,7.5,,,, +US-NC-27717,US,NC,27717,7.5,,,, +US-NC-27722,US,NC,27722,7.5,,,, +US-NC-27801,US,NC,27801,7,,,, +US-NC-27802,US,NC,27802,7,,,, +US-NC-27803,US,NC,27803,6.75,,,, +US-NC-27804,US,NC,27804,6.75,,,, +US-NC-27805,US,NC,27805,6.75,,,, +US-NC-27806,US,NC,27806,6.75,,,, +US-NC-27807,US,NC,27807,6.75,,,, +US-NC-27808,US,NC,27808,6.75,,,, +US-NC-27809,US,NC,27809,6.75,,,, +US-NC-27810,US,NC,27810,6.75,,,, +US-NC-27811,US,NC,27811,7,,,, +US-NC-27812,US,NC,27812,7,,,, +US-NC-27813,US,NC,27813,6.75,,,, +US-NC-27814,US,NC,27814,6.75,,,, +US-NC-27815,US,NC,27815,7,,,, +US-NC-27816,US,NC,27816,6.75,,,, +US-NC-27817,US,NC,27817,6.75,,,, +US-NC-27818,US,NC,27818,7,,,, +US-NC-27819,US,NC,27819,7,,,, +US-NC-27820,US,NC,27820,6.75,,,, +US-NC-27821,US,NC,27821,6.75,,,, +US-NC-27822,US,NC,27822,6.75,,,, +US-NC-27823,US,NC,27823,7,,,, +US-NC-27824,US,NC,27824,6.75,,,, +US-NC-27825,US,NC,27825,7,,,, +US-NC-27826,US,NC,27826,6.75,,,, +US-NC-27827,US,NC,27827,7,,,, +US-NC-27828,US,NC,27828,7,,,, +US-NC-27829,US,NC,27829,7,,,, +US-NC-27830,US,NC,27830,6.75,,,, +US-NC-27831,US,NC,27831,6.75,,,, +US-NC-27832,US,NC,27832,6.75,,,, +US-NC-27833,US,NC,27833,7,,,, +US-NC-27834,US,NC,27834,7,,,, +US-NC-27835,US,NC,27835,7,,,, +US-NC-27836,US,NC,27836,7,,,, +US-NC-27837,US,NC,27837,7,,,, +US-NC-27839,US,NC,27839,7,,,, +US-NC-27840,US,NC,27840,7,,,, +US-NC-27841,US,NC,27841,7,,,, +US-NC-27842,US,NC,27842,6.75,,,, +US-NC-27843,US,NC,27843,7,,,, +US-NC-27844,US,NC,27844,7,,,, +US-NC-27845,US,NC,27845,6.75,,,, +US-NC-27846,US,NC,27846,7,,,, +US-NC-27847,US,NC,27847,6.75,,,, +US-NC-27849,US,NC,27849,6.75,,,, +US-NC-27850,US,NC,27850,7,,,, +US-NC-27851,US,NC,27851,6.75,,,, +US-NC-27852,US,NC,27852,7,,,, +US-NC-27853,US,NC,27853,6.75,,,, +US-NC-27855,US,NC,27855,7,,,, +US-NC-27856,US,NC,27856,6.75,,,, +US-NC-27857,US,NC,27857,7,,,, +US-NC-27858,US,NC,27858,7,,,, +US-NC-27860,US,NC,27860,6.75,,,, +US-NC-27861,US,NC,27861,7,,,, +US-NC-27862,US,NC,27862,6.75,,,, +US-NC-27863,US,NC,27863,6.75,,,, +US-NC-27864,US,NC,27864,7,,,, +US-NC-27865,US,NC,27865,6.75,,,, +US-NC-27866,US,NC,27866,6.75,,,, +US-NC-27867,US,NC,27867,6.75,,,, +US-NC-27868,US,NC,27868,6.75,,,, +US-NC-27869,US,NC,27869,6.75,,,, +US-NC-27870,US,NC,27870,7,,,, +US-NC-27871,US,NC,27871,7,,,, +US-NC-27872,US,NC,27872,6.75,,,, +US-NC-27873,US,NC,27873,6.75,,,, +US-NC-27874,US,NC,27874,7,,,, +US-NC-27875,US,NC,27875,6.75,,,, +US-NC-27876,US,NC,27876,6.75,,,, +US-NC-27877,US,NC,27877,6.75,,,, +US-NC-27878,US,NC,27878,6.75,,,, +US-NC-27879,US,NC,27879,7,,,, +US-NC-27880,US,NC,27880,6.75,,,, +US-NC-27881,US,NC,27881,7,,,, +US-NC-27882,US,NC,27882,6.75,,,, +US-NC-27883,US,NC,27883,6.75,,,, +US-NC-27884,US,NC,27884,7,,,, +US-NC-27885,US,NC,27885,6.75,,,, +US-NC-27886,US,NC,27886,7,,,, +US-NC-27887,US,NC,27887,7,,,, +US-NC-27888,US,NC,27888,7,,,, +US-NC-27889,US,NC,27889,6.75,,,, +US-NC-27890,US,NC,27890,7,,,, +US-NC-27891,US,NC,27891,6.75,,,, +US-NC-27892,US,NC,27892,7,,,, +US-NC-27893,US,NC,27893,6.75,,,, +US-NC-27894,US,NC,27894,6.75,,,, +US-NC-27895,US,NC,27895,6.75,,,, +US-NC-27896,US,NC,27896,6.75,,,, +US-NC-27897,US,NC,27897,6.75,,,, +US-NC-27906,US,NC,27906,6.75,,,, +US-NC-27907,US,NC,27907,6.75,,,, +US-NC-27909,US,NC,27909,6.75,,,, +US-NC-27910,US,NC,27910,7,,,, +US-NC-27915,US,NC,27915,6.75,,,, +US-NC-27916,US,NC,27916,6.75,,,, +US-NC-27917,US,NC,27917,6.75,,,, +US-NC-27919,US,NC,27919,6.75,,,, +US-NC-27920,US,NC,27920,6.75,,,, +US-NC-27921,US,NC,27921,6.75,,,, +US-NC-27922,US,NC,27922,7,,,, +US-NC-27923,US,NC,27923,6.75,,,, +US-NC-27924,US,NC,27924,6.75,,,, +US-NC-27925,US,NC,27925,6.75,,,, +US-NC-27926,US,NC,27926,6.75,,,, +US-NC-27927,US,NC,27927,6.75,,,, +US-NC-27928,US,NC,27928,6.75,,,, +US-NC-27929,US,NC,27929,6.75,,,, +US-NC-27930,US,NC,27930,6.75,,,, +US-NC-27932,US,NC,27932,6.75,,,, +US-NC-27935,US,NC,27935,6.75,,,, +US-NC-27936,US,NC,27936,6.75,,,, +US-NC-27937,US,NC,27937,6.75,,,, +US-NC-27938,US,NC,27938,6.75,,,, +US-NC-27939,US,NC,27939,6.75,,,, +US-NC-27941,US,NC,27941,6.75,,,, +US-NC-27942,US,NC,27942,7,,,, +US-NC-27943,US,NC,27943,6.75,,,, +US-NC-27944,US,NC,27944,6.75,,,, +US-NC-27946,US,NC,27946,6.75,,,, +US-NC-27947,US,NC,27947,6.75,,,, +US-NC-27948,US,NC,27948,6.75,,,, +US-NC-27949,US,NC,27949,6.75,,,, +US-NC-27950,US,NC,27950,6.75,,,, +US-NC-27953,US,NC,27953,6.75,,,, +US-NC-27954,US,NC,27954,6.75,,,, +US-NC-27956,US,NC,27956,6.75,,,, +US-NC-27957,US,NC,27957,6.75,,,, +US-NC-27958,US,NC,27958,6.75,,,, +US-NC-27959,US,NC,27959,6.75,,,, +US-NC-27960,US,NC,27960,6.75,,,, +US-NC-27962,US,NC,27962,6.75,,,, +US-NC-27964,US,NC,27964,6.75,,,, +US-NC-27965,US,NC,27965,6.75,,,, +US-NC-27966,US,NC,27966,6.75,,,, +US-NC-27967,US,NC,27967,6.75,,,, +US-NC-27968,US,NC,27968,6.75,,,, +US-NC-27969,US,NC,27969,6.75,,,, +US-NC-27970,US,NC,27970,6.75,,,, +US-NC-27972,US,NC,27972,6.75,,,, +US-NC-27973,US,NC,27973,6.75,,,, +US-NC-27974,US,NC,27974,6.75,,,, +US-NC-27976,US,NC,27976,6.75,,,, +US-NC-27978,US,NC,27978,6.75,,,, +US-NC-27979,US,NC,27979,6.75,,,, +US-NC-27980,US,NC,27980,6.75,,,, +US-NC-27981,US,NC,27981,6.75,,,, +US-NC-27982,US,NC,27982,6.75,,,, +US-NC-27983,US,NC,27983,6.75,,,, +US-NC-27985,US,NC,27985,6.75,,,, +US-NC-27986,US,NC,27986,7,,,, +US-NC-28001,US,NC,28001,6.75,,,, +US-NC-28002,US,NC,28002,6.75,,,, +US-NC-28006,US,NC,28006,6.75,,,, +US-NC-28007,US,NC,28007,6.75,,,, +US-NC-28009,US,NC,28009,6.75,,,, +US-NC-28010,US,NC,28010,6.75,,,, +US-NC-28012,US,NC,28012,6.75,,,, +US-NC-28016,US,NC,28016,6.75,,,, +US-NC-28017,US,NC,28017,6.75,,,, +US-NC-28018,US,NC,28018,6.75,,,, +US-NC-28019,US,NC,28019,6.75,,,, +US-NC-28020,US,NC,28020,6.75,,,, +US-NC-28021,US,NC,28021,6.75,,,, +US-NC-28023,US,NC,28023,7,,,, +US-NC-28024,US,NC,28024,6.75,,,, +US-NC-28025,US,NC,28025,7,,,, +US-NC-28026,US,NC,28026,7,,,, +US-NC-28027,US,NC,28027,7,,,, +US-NC-28031,US,NC,28031,7.25,,,, +US-NC-28032,US,NC,28032,6.75,,,, +US-NC-28033,US,NC,28033,6.75,,,, +US-NC-28034,US,NC,28034,6.75,,,, +US-NC-28035,US,NC,28035,7.25,,,, +US-NC-28036,US,NC,28036,7.25,,,, +US-NC-28037,US,NC,28037,6.75,,,, +US-NC-28038,US,NC,28038,6.75,,,, +US-NC-28039,US,NC,28039,7,,,, +US-NC-28040,US,NC,28040,6.75,,,, +US-NC-28041,US,NC,28041,7,,,, +US-NC-28042,US,NC,28042,6.75,,,, +US-NC-28043,US,NC,28043,6.75,,,, +US-NC-28052,US,NC,28052,6.75,,,, +US-NC-28053,US,NC,28053,6.75,,,, +US-NC-28054,US,NC,28054,6.75,,,, +US-NC-28055,US,NC,28055,6.75,,,, +US-NC-28056,US,NC,28056,6.75,,,, +US-NC-28070,US,NC,28070,7.25,,,, +US-NC-28071,US,NC,28071,7,,,, +US-NC-28072,US,NC,28072,7,,,, +US-NC-28073,US,NC,28073,6.75,,,, +US-NC-28074,US,NC,28074,6.75,,,, +US-NC-28075,US,NC,28075,7,,,, +US-NC-28076,US,NC,28076,6.75,,,, +US-NC-28077,US,NC,28077,6.75,,,, +US-NC-28078,US,NC,28078,7.25,,,, +US-NC-28079,US,NC,28079,6.75,,,, +US-NC-28080,US,NC,28080,6.75,,,, +US-NC-28081,US,NC,28081,7,,,, +US-NC-28082,US,NC,28082,7,,,, +US-NC-28083,US,NC,28083,7,,,, +US-NC-28086,US,NC,28086,6.75,,,, +US-NC-28088,US,NC,28088,7,,,, +US-NC-28089,US,NC,28089,6.75,,,, +US-NC-28090,US,NC,28090,6.75,,,, +US-NC-28091,US,NC,28091,6.75,,,, +US-NC-28092,US,NC,28092,6.75,,,, +US-NC-28093,US,NC,28093,6.75,,,, +US-NC-28097,US,NC,28097,6.75,,,, +US-NC-28098,US,NC,28098,6.75,,,, +US-NC-28101,US,NC,28101,6.75,,,, +US-NC-28102,US,NC,28102,6.75,,,, +US-NC-28103,US,NC,28103,6.75,,,, +US-NC-28104,US,NC,28104,6.75,,,, +US-NC-28105,US,NC,28105,7.25,,,, +US-NC-28106,US,NC,28106,7.25,,,, +US-NC-28107,US,NC,28107,7,,,, +US-NC-28108,US,NC,28108,6.75,,,, +US-NC-28109,US,NC,28109,6.75,,,, +US-NC-28110,US,NC,28110,6.75,,,, +US-NC-28111,US,NC,28111,6.75,,,, +US-NC-28112,US,NC,28112,6.75,,,, +US-NC-28114,US,NC,28114,6.75,,,, +US-NC-28115,US,NC,28115,6.75,,,, +US-NC-28117,US,NC,28117,6.75,,,, +US-NC-28119,US,NC,28119,6.75,,,, +US-NC-28120,US,NC,28120,6.75,,,, +US-NC-28123,US,NC,28123,6.75,,,, +US-NC-28124,US,NC,28124,7,,,, +US-NC-28125,US,NC,28125,7,,,, +US-NC-28126,US,NC,28126,7.25,,,, +US-NC-28127,US,NC,28127,6.75,,,, +US-NC-28128,US,NC,28128,6.75,,,, +US-NC-28129,US,NC,28129,6.75,,,, +US-NC-28130,US,NC,28130,7.25,,,, +US-NC-28133,US,NC,28133,6.75,,,, +US-NC-28134,US,NC,28134,7.25,,,, +US-NC-28135,US,NC,28135,6.75,,,, +US-NC-28136,US,NC,28136,6.75,,,, +US-NC-28137,US,NC,28137,6.75,,,, +US-NC-28138,US,NC,28138,7,,,, +US-NC-28139,US,NC,28139,6.75,,,, +US-NC-28144,US,NC,28144,7,,,, +US-NC-28145,US,NC,28145,7,,,, +US-NC-28146,US,NC,28146,7,,,, +US-NC-28147,US,NC,28147,7,,,, +US-NC-28150,US,NC,28150,6.75,,,, +US-NC-28151,US,NC,28151,6.75,,,, +US-NC-28152,US,NC,28152,6.75,,,, +US-NC-28159,US,NC,28159,7,,,, +US-NC-28160,US,NC,28160,6.75,,,, +US-NC-28163,US,NC,28163,6.75,,,, +US-NC-28164,US,NC,28164,6.75,,,, +US-NC-28166,US,NC,28166,6.75,,,, +US-NC-28167,US,NC,28167,6.75,,,, +US-NC-28168,US,NC,28168,6.75,,,, +US-NC-28169,US,NC,28169,6.75,,,, +US-NC-28170,US,NC,28170,6.75,,,, +US-NC-28173,US,NC,28173,6.75,,,, +US-NC-28174,US,NC,28174,6.75,,,, +US-NC-28201,US,NC,28201,7.25,,,, +US-NC-28202,US,NC,28202,7.25,,,, +US-NC-28203,US,NC,28203,7.25,,,, +US-NC-28204,US,NC,28204,7.25,,,, +US-NC-28205,US,NC,28205,7.25,,,, +US-NC-28206,US,NC,28206,7.25,,,, +US-NC-28207,US,NC,28207,7.25,,,, +US-NC-28208,US,NC,28208,7.25,,,, +US-NC-28209,US,NC,28209,7.25,,,, +US-NC-28210,US,NC,28210,7.25,,,, +US-NC-28211,US,NC,28211,7.25,,,, +US-NC-28212,US,NC,28212,7.25,,,, +US-NC-28213,US,NC,28213,7.25,,,, +US-NC-28214,US,NC,28214,7.25,,,, +US-NC-28215,US,NC,28215,7.25,,,, +US-NC-28216,US,NC,28216,7.25,,,, +US-NC-28217,US,NC,28217,7.25,,,, +US-NC-28218,US,NC,28218,7.25,,,, +US-NC-28219,US,NC,28219,7.25,,,, +US-NC-28220,US,NC,28220,7.25,,,, +US-NC-28221,US,NC,28221,7.25,,,, +US-NC-28222,US,NC,28222,7.25,,,, +US-NC-28223,US,NC,28223,7.25,,,, +US-NC-28224,US,NC,28224,7.25,,,, +US-NC-28226,US,NC,28226,7.25,,,, +US-NC-28227,US,NC,28227,7.25,,,, +US-NC-28228,US,NC,28228,7.25,,,, +US-NC-28229,US,NC,28229,7.25,,,, +US-NC-28230,US,NC,28230,7.25,,,, +US-NC-28231,US,NC,28231,7.25,,,, +US-NC-28232,US,NC,28232,7.25,,,, +US-NC-28233,US,NC,28233,7.25,,,, +US-NC-28234,US,NC,28234,7.25,,,, +US-NC-28235,US,NC,28235,7.25,,,, +US-NC-28236,US,NC,28236,7.25,,,, +US-NC-28237,US,NC,28237,7.25,,,, +US-NC-28241,US,NC,28241,7.25,,,, +US-NC-28242,US,NC,28242,7.25,,,, +US-NC-28243,US,NC,28243,7.25,,,, +US-NC-28244,US,NC,28244,7.25,,,, +US-NC-28246,US,NC,28246,7.25,,,, +US-NC-28247,US,NC,28247,7.25,,,, +US-NC-28250,US,NC,28250,7.25,,,, +US-NC-28253,US,NC,28253,7.25,,,, +US-NC-28254,US,NC,28254,7.25,,,, +US-NC-28255,US,NC,28255,7.25,,,, +US-NC-28256,US,NC,28256,7.25,,,, +US-NC-28258,US,NC,28258,7.25,,,, +US-NC-28260,US,NC,28260,7.25,,,, +US-NC-28262,US,NC,28262,7.25,,,, +US-NC-28263,US,NC,28263,7.25,,,, +US-NC-28265,US,NC,28265,7.25,,,, +US-NC-28266,US,NC,28266,7.25,,,, +US-NC-28269,US,NC,28269,7.25,,,, +US-NC-28270,US,NC,28270,7.25,,,, +US-NC-28271,US,NC,28271,7.25,,,, +US-NC-28272,US,NC,28272,7.25,,,, +US-NC-28273,US,NC,28273,7.25,,,, +US-NC-28274,US,NC,28274,7.25,,,, +US-NC-28275,US,NC,28275,7.25,,,, +US-NC-28277,US,NC,28277,7.25,,,, +US-NC-28278,US,NC,28278,7.25,,,, +US-NC-28280,US,NC,28280,7.25,,,, +US-NC-28281,US,NC,28281,7.25,,,, +US-NC-28282,US,NC,28282,7.25,,,, +US-NC-28284,US,NC,28284,7.25,,,, +US-NC-28285,US,NC,28285,7.25,,,, +US-NC-28287,US,NC,28287,7.25,,,, +US-NC-28288,US,NC,28288,7.25,,,, +US-NC-28289,US,NC,28289,7.25,,,, +US-NC-28290,US,NC,28290,7.25,,,, +US-NC-28296,US,NC,28296,7.25,,,, +US-NC-28297,US,NC,28297,7.25,,,, +US-NC-28299,US,NC,28299,7.25,,,, +US-NC-28301,US,NC,28301,7,,,, +US-NC-28302,US,NC,28302,7,,,, +US-NC-28303,US,NC,28303,7,,,, +US-NC-28304,US,NC,28304,7,,,, +US-NC-28305,US,NC,28305,7,,,, +US-NC-28306,US,NC,28306,7,,,, +US-NC-28307,US,NC,28307,7,,,, +US-NC-28308,US,NC,28308,7,,,, +US-NC-28309,US,NC,28309,7,,,, +US-NC-28310,US,NC,28310,7,,,, +US-NC-28311,US,NC,28311,7,,,, +US-NC-28312,US,NC,28312,7,,,, +US-NC-28314,US,NC,28314,7,,,, +US-NC-28315,US,NC,28315,6.75,,,, +US-NC-28318,US,NC,28318,7,,,, +US-NC-28319,US,NC,28319,7,,,, +US-NC-28320,US,NC,28320,6.75,,,, +US-NC-28323,US,NC,28323,6.75,,,, +US-NC-28325,US,NC,28325,7,,,, +US-NC-28326,US,NC,28326,6.75,,,, +US-NC-28327,US,NC,28327,6.75,,,, +US-NC-28328,US,NC,28328,7,,,, +US-NC-28329,US,NC,28329,7,,,, +US-NC-28330,US,NC,28330,6.75,,,, +US-NC-28331,US,NC,28331,7,,,, +US-NC-28332,US,NC,28332,6.75,,,, +US-NC-28333,US,NC,28333,6.75,,,, +US-NC-28334,US,NC,28334,6.75,,,, +US-NC-28335,US,NC,28335,6.75,,,, +US-NC-28337,US,NC,28337,6.75,,,, +US-NC-28338,US,NC,28338,6.75,,,, +US-NC-28339,US,NC,28339,6.75,,,, +US-NC-28340,US,NC,28340,7,,,, +US-NC-28341,US,NC,28341,7,,,, +US-NC-28342,US,NC,28342,7,,,, +US-NC-28343,US,NC,28343,6.75,,,, +US-NC-28344,US,NC,28344,7,,,, +US-NC-28345,US,NC,28345,6.75,,,, +US-NC-28347,US,NC,28347,6.75,,,, +US-NC-28348,US,NC,28348,7,,,, +US-NC-28349,US,NC,28349,7,,,, +US-NC-28350,US,NC,28350,6.75,,,, +US-NC-28351,US,NC,28351,6.75,,,, +US-NC-28352,US,NC,28352,6.75,,,, +US-NC-28353,US,NC,28353,6.75,,,, +US-NC-28355,US,NC,28355,7,,,, +US-NC-28356,US,NC,28356,7,,,, +US-NC-28357,US,NC,28357,7,,,, +US-NC-28358,US,NC,28358,7,,,, +US-NC-28359,US,NC,28359,7,,,, +US-NC-28360,US,NC,28360,7,,,, +US-NC-28362,US,NC,28362,7,,,, +US-NC-28363,US,NC,28363,6.75,,,, +US-NC-28364,US,NC,28364,7,,,, +US-NC-28365,US,NC,28365,6.75,,,, +US-NC-28366,US,NC,28366,7,,,, +US-NC-28367,US,NC,28367,6.75,,,, +US-NC-28368,US,NC,28368,6.75,,,, +US-NC-28369,US,NC,28369,7,,,, +US-NC-28370,US,NC,28370,6.75,,,, +US-NC-28371,US,NC,28371,7,,,, +US-NC-28372,US,NC,28372,7,,,, +US-NC-28373,US,NC,28373,6.75,,,, +US-NC-28374,US,NC,28374,6.75,,,, +US-NC-28375,US,NC,28375,7,,,, +US-NC-28376,US,NC,28376,6.75,,,, +US-NC-28377,US,NC,28377,7,,,, +US-NC-28378,US,NC,28378,7,,,, +US-NC-28379,US,NC,28379,6.75,,,, +US-NC-28380,US,NC,28380,6.75,,,, +US-NC-28382,US,NC,28382,7,,,, +US-NC-28383,US,NC,28383,7,,,, +US-NC-28384,US,NC,28384,7,,,, +US-NC-28385,US,NC,28385,7,,,, +US-NC-28386,US,NC,28386,7,,,, +US-NC-28387,US,NC,28387,6.75,,,, +US-NC-28388,US,NC,28388,6.75,,,, +US-NC-28390,US,NC,28390,6.75,,,, +US-NC-28391,US,NC,28391,7,,,, +US-NC-28392,US,NC,28392,6.75,,,, +US-NC-28393,US,NC,28393,7,,,, +US-NC-28394,US,NC,28394,6.75,,,, +US-NC-28395,US,NC,28395,7,,,, +US-NC-28396,US,NC,28396,6.75,,,, +US-NC-28398,US,NC,28398,7,,,, +US-NC-28399,US,NC,28399,6.75,,,, +US-NC-28401,US,NC,28401,7,,,, +US-NC-28402,US,NC,28402,7,,,, +US-NC-28403,US,NC,28403,7,,,, +US-NC-28404,US,NC,28404,7,,,, +US-NC-28405,US,NC,28405,7,,,, +US-NC-28406,US,NC,28406,7,,,, +US-NC-28407,US,NC,28407,7,,,, +US-NC-28408,US,NC,28408,7,,,, +US-NC-28409,US,NC,28409,7,,,, +US-NC-28410,US,NC,28410,7,,,, +US-NC-28411,US,NC,28411,7,,,, +US-NC-28412,US,NC,28412,7,,,, +US-NC-28420,US,NC,28420,6.75,,,, +US-NC-28421,US,NC,28421,6.75,,,, +US-NC-28422,US,NC,28422,6.75,,,, +US-NC-28423,US,NC,28423,6.75,,,, +US-NC-28424,US,NC,28424,6.75,,,, +US-NC-28425,US,NC,28425,6.75,,,, +US-NC-28428,US,NC,28428,7,,,, +US-NC-28429,US,NC,28429,7,,,, +US-NC-28430,US,NC,28430,6.75,,,, +US-NC-28431,US,NC,28431,6.75,,,, +US-NC-28432,US,NC,28432,6.75,,,, +US-NC-28433,US,NC,28433,6.75,,,, +US-NC-28434,US,NC,28434,6.75,,,, +US-NC-28435,US,NC,28435,6.75,,,, +US-NC-28436,US,NC,28436,6.75,,,, +US-NC-28438,US,NC,28438,6.75,,,, +US-NC-28439,US,NC,28439,6.75,,,, +US-NC-28441,US,NC,28441,7,,,, +US-NC-28442,US,NC,28442,6.75,,,, +US-NC-28443,US,NC,28443,6.75,,,, +US-NC-28444,US,NC,28444,7,,,, +US-NC-28445,US,NC,28445,7,,,, +US-NC-28447,US,NC,28447,7,,,, +US-NC-28448,US,NC,28448,6.75,,,, +US-NC-28449,US,NC,28449,7,,,, +US-NC-28450,US,NC,28450,6.75,,,, +US-NC-28451,US,NC,28451,6.75,,,, +US-NC-28452,US,NC,28452,6.75,,,, +US-NC-28453,US,NC,28453,7,,,, +US-NC-28454,US,NC,28454,6.75,,,, +US-NC-28455,US,NC,28455,6.75,,,, +US-NC-28456,US,NC,28456,6.75,,,, +US-NC-28457,US,NC,28457,6.75,,,, +US-NC-28458,US,NC,28458,7,,,, +US-NC-28459,US,NC,28459,6.75,,,, +US-NC-28460,US,NC,28460,7,,,, +US-NC-28461,US,NC,28461,6.75,,,, +US-NC-28462,US,NC,28462,6.75,,,, +US-NC-28463,US,NC,28463,6.75,,,, +US-NC-28464,US,NC,28464,7,,,, +US-NC-28465,US,NC,28465,6.75,,,, +US-NC-28466,US,NC,28466,7,,,, +US-NC-28467,US,NC,28467,6.75,,,, +US-NC-28468,US,NC,28468,6.75,,,, +US-NC-28469,US,NC,28469,6.75,,,, +US-NC-28470,US,NC,28470,6.75,,,, +US-NC-28472,US,NC,28472,6.75,,,, +US-NC-28478,US,NC,28478,6.75,,,, +US-NC-28479,US,NC,28479,6.75,,,, +US-NC-28480,US,NC,28480,7,,,, +US-NC-28501,US,NC,28501,6.75,,,, +US-NC-28502,US,NC,28502,6.75,,,, +US-NC-28503,US,NC,28503,6.75,,,, +US-NC-28504,US,NC,28504,6.75,,,, +US-NC-28508,US,NC,28508,7,,,, +US-NC-28509,US,NC,28509,6.75,,,, +US-NC-28510,US,NC,28510,6.75,,,, +US-NC-28511,US,NC,28511,6.75,,,, +US-NC-28512,US,NC,28512,6.75,,,, +US-NC-28513,US,NC,28513,7,,,, +US-NC-28515,US,NC,28515,6.75,,,, +US-NC-28516,US,NC,28516,6.75,,,, +US-NC-28518,US,NC,28518,7,,,, +US-NC-28519,US,NC,28519,6.75,,,, +US-NC-28520,US,NC,28520,6.75,,,, +US-NC-28521,US,NC,28521,7,,,, +US-NC-28522,US,NC,28522,6.75,,,, +US-NC-28523,US,NC,28523,6.75,,,, +US-NC-28524,US,NC,28524,6.75,,,, +US-NC-28525,US,NC,28525,6.75,,,, +US-NC-28526,US,NC,28526,6.75,,,, +US-NC-28527,US,NC,28527,6.75,,,, +US-NC-28528,US,NC,28528,6.75,,,, +US-NC-28529,US,NC,28529,6.75,,,, +US-NC-28530,US,NC,28530,7,,,, +US-NC-28531,US,NC,28531,6.75,,,, +US-NC-28532,US,NC,28532,6.75,,,, +US-NC-28537,US,NC,28537,6.75,,,, +US-NC-28538,US,NC,28538,7,,,, +US-NC-28539,US,NC,28539,7,,,, +US-NC-28540,US,NC,28540,7,,,, +US-NC-28541,US,NC,28541,7,,,, +US-NC-28543,US,NC,28543,7,,,, +US-NC-28544,US,NC,28544,7,,,, +US-NC-28545,US,NC,28545,7,,,, +US-NC-28546,US,NC,28546,7,,,, +US-NC-28547,US,NC,28547,7,,,, +US-NC-28551,US,NC,28551,6.75,,,, +US-NC-28552,US,NC,28552,6.75,,,, +US-NC-28553,US,NC,28553,6.75,,,, +US-NC-28554,US,NC,28554,7,,,, +US-NC-28555,US,NC,28555,7,,,, +US-NC-28556,US,NC,28556,6.75,,,, +US-NC-28557,US,NC,28557,6.75,,,, +US-NC-28560,US,NC,28560,6.75,,,, +US-NC-28561,US,NC,28561,6.75,,,, +US-NC-28562,US,NC,28562,6.75,,,, +US-NC-28563,US,NC,28563,6.75,,,, +US-NC-28564,US,NC,28564,6.75,,,, +US-NC-28570,US,NC,28570,6.75,,,, +US-NC-28571,US,NC,28571,6.75,,,, +US-NC-28572,US,NC,28572,7,,,, +US-NC-28573,US,NC,28573,6.75,,,, +US-NC-28574,US,NC,28574,7,,,, +US-NC-28575,US,NC,28575,6.75,,,, +US-NC-28577,US,NC,28577,6.75,,,, +US-NC-28578,US,NC,28578,6.75,,,, +US-NC-28579,US,NC,28579,6.75,,,, +US-NC-28580,US,NC,28580,7,,,, +US-NC-28581,US,NC,28581,6.75,,,, +US-NC-28582,US,NC,28582,7,,,, +US-NC-28583,US,NC,28583,6.75,,,, +US-NC-28584,US,NC,28584,6.75,,,, +US-NC-28585,US,NC,28585,6.75,,,, +US-NC-28586,US,NC,28586,6.75,,,, +US-NC-28587,US,NC,28587,6.75,,,, +US-NC-28589,US,NC,28589,6.75,,,, +US-NC-28590,US,NC,28590,7,,,, +US-NC-28594,US,NC,28594,6.75,,,, +US-NC-28601,US,NC,28601,7,,,, +US-NC-28602,US,NC,28602,7,,,, +US-NC-28603,US,NC,28603,7,,,, +US-NC-28604,US,NC,28604,6.75,,,, +US-NC-28605,US,NC,28605,6.75,,,, +US-NC-28606,US,NC,28606,7,,,, +US-NC-28607,US,NC,28607,6.75,,,, +US-NC-28608,US,NC,28608,6.75,,,, +US-NC-28609,US,NC,28609,7,,,, +US-NC-28610,US,NC,28610,7,,,, +US-NC-28611,US,NC,28611,6.75,,,, +US-NC-28612,US,NC,28612,6.75,,,, +US-NC-28613,US,NC,28613,7,,,, +US-NC-28615,US,NC,28615,6.75,,,, +US-NC-28616,US,NC,28616,6.75,,,, +US-NC-28617,US,NC,28617,6.75,,,, +US-NC-28618,US,NC,28618,6.75,,,, +US-NC-28619,US,NC,28619,6.75,,,, +US-NC-28621,US,NC,28621,7,,,, +US-NC-28622,US,NC,28622,6.75,,,, +US-NC-28623,US,NC,28623,6.75,,,, +US-NC-28624,US,NC,28624,7,,,, +US-NC-28625,US,NC,28625,6.75,,,, +US-NC-28626,US,NC,28626,6.75,,,, +US-NC-28627,US,NC,28627,6.75,,,, +US-NC-28628,US,NC,28628,6.75,,,, +US-NC-28629,US,NC,28629,6.75,,,, +US-NC-28630,US,NC,28630,6.75,,,, +US-NC-28631,US,NC,28631,6.75,,,, +US-NC-28633,US,NC,28633,6.75,,,, +US-NC-28634,US,NC,28634,6.75,,,, +US-NC-28635,US,NC,28635,7,,,, +US-NC-28636,US,NC,28636,7,,,, +US-NC-28637,US,NC,28637,6.75,,,, +US-NC-28638,US,NC,28638,6.75,,,, +US-NC-28640,US,NC,28640,6.75,,,, +US-NC-28641,US,NC,28641,6.75,,,, +US-NC-28642,US,NC,28642,6.75,,,, +US-NC-28643,US,NC,28643,6.75,,,, +US-NC-28644,US,NC,28644,6.75,,,, +US-NC-28645,US,NC,28645,6.75,,,, +US-NC-28646,US,NC,28646,6.75,,,, +US-NC-28647,US,NC,28647,6.75,,,, +US-NC-28649,US,NC,28649,7,,,, +US-NC-28650,US,NC,28650,7,,,, +US-NC-28651,US,NC,28651,7,,,, +US-NC-28652,US,NC,28652,6.75,,,, +US-NC-28653,US,NC,28653,6.75,,,, +US-NC-28654,US,NC,28654,7,,,, +US-NC-28655,US,NC,28655,6.75,,,, +US-NC-28656,US,NC,28656,7,,,, +US-NC-28657,US,NC,28657,6.75,,,, +US-NC-28658,US,NC,28658,7,,,, +US-NC-28659,US,NC,28659,7,,,, +US-NC-28660,US,NC,28660,6.75,,,, +US-NC-28661,US,NC,28661,6.75,,,, +US-NC-28662,US,NC,28662,6.75,,,, +US-NC-28663,US,NC,28663,6.75,,,, +US-NC-28664,US,NC,28664,6.75,,,, +US-NC-28665,US,NC,28665,7,,,, +US-NC-28666,US,NC,28666,6.75,,,, +US-NC-28667,US,NC,28667,6.75,,,, +US-NC-28668,US,NC,28668,6.75,,,, +US-NC-28669,US,NC,28669,7,,,, +US-NC-28670,US,NC,28670,7,,,, +US-NC-28671,US,NC,28671,6.75,,,, +US-NC-28672,US,NC,28672,6.75,,,, +US-NC-28673,US,NC,28673,7,,,, +US-NC-28675,US,NC,28675,6.75,,,, +US-NC-28676,US,NC,28676,7,,,, +US-NC-28677,US,NC,28677,6.75,,,, +US-NC-28678,US,NC,28678,7,,,, +US-NC-28679,US,NC,28679,6.75,,,, +US-NC-28680,US,NC,28680,6.75,,,, +US-NC-28681,US,NC,28681,7,,,, +US-NC-28682,US,NC,28682,7,,,, +US-NC-28683,US,NC,28683,7,,,, +US-NC-28684,US,NC,28684,6.75,,,, +US-NC-28685,US,NC,28685,7,,,, +US-NC-28687,US,NC,28687,6.75,,,, +US-NC-28688,US,NC,28688,6.75,,,, +US-NC-28689,US,NC,28689,6.75,,,, +US-NC-28690,US,NC,28690,6.75,,,, +US-NC-28691,US,NC,28691,6.75,,,, +US-NC-28692,US,NC,28692,6.75,,,, +US-NC-28693,US,NC,28693,6.75,,,, +US-NC-28694,US,NC,28694,6.75,,,, +US-NC-28697,US,NC,28697,7,,,, +US-NC-28698,US,NC,28698,6.75,,,, +US-NC-28699,US,NC,28699,6.75,,,, +US-NC-28701,US,NC,28701,7,,,, +US-NC-28702,US,NC,28702,6.75,,,, +US-NC-28704,US,NC,28704,7,,,, +US-NC-28705,US,NC,28705,6.75,,,, +US-NC-28707,US,NC,28707,6.75,,,, +US-NC-28708,US,NC,28708,6.75,,,, +US-NC-28709,US,NC,28709,7,,,, +US-NC-28710,US,NC,28710,6.75,,,, +US-NC-28711,US,NC,28711,7,,,, +US-NC-28712,US,NC,28712,6.75,,,, +US-NC-28713,US,NC,28713,6.75,,,, +US-NC-28714,US,NC,28714,6.75,,,, +US-NC-28715,US,NC,28715,7,,,, +US-NC-28716,US,NC,28716,7,,,, +US-NC-28717,US,NC,28717,6.75,,,, +US-NC-28718,US,NC,28718,6.75,,,, +US-NC-28719,US,NC,28719,6.75,,,, +US-NC-28720,US,NC,28720,6.75,,,, +US-NC-28721,US,NC,28721,7,,,, +US-NC-28722,US,NC,28722,6.75,,,, +US-NC-28723,US,NC,28723,6.75,,,, +US-NC-28724,US,NC,28724,6.75,,,, +US-NC-28725,US,NC,28725,6.75,,,, +US-NC-28726,US,NC,28726,6.75,,,, +US-NC-28727,US,NC,28727,6.75,,,, +US-NC-28728,US,NC,28728,7,,,, +US-NC-28729,US,NC,28729,6.75,,,, +US-NC-28730,US,NC,28730,7,,,, +US-NC-28731,US,NC,28731,6.75,,,, +US-NC-28732,US,NC,28732,6.75,,,, +US-NC-28733,US,NC,28733,6.75,,,, +US-NC-28734,US,NC,28734,6.75,,,, +US-NC-28735,US,NC,28735,6.75,,,, +US-NC-28736,US,NC,28736,6.75,,,, +US-NC-28737,US,NC,28737,6.75,,,, +US-NC-28738,US,NC,28738,7,,,, +US-NC-28739,US,NC,28739,6.75,,,, +US-NC-28740,US,NC,28740,6.75,,,, +US-NC-28741,US,NC,28741,6.75,,,, +US-NC-28742,US,NC,28742,6.75,,,, +US-NC-28743,US,NC,28743,6.75,,,, +US-NC-28744,US,NC,28744,6.75,,,, +US-NC-28745,US,NC,28745,7,,,, +US-NC-28746,US,NC,28746,6.75,,,, +US-NC-28747,US,NC,28747,6.75,,,, +US-NC-28748,US,NC,28748,7,,,, +US-NC-28749,US,NC,28749,6.75,,,, +US-NC-28750,US,NC,28750,6.75,,,, +US-NC-28751,US,NC,28751,7,,,, +US-NC-28752,US,NC,28752,6.75,,,, +US-NC-28753,US,NC,28753,6.75,,,, +US-NC-28754,US,NC,28754,6.75,,,, +US-NC-28755,US,NC,28755,6.75,,,, +US-NC-28756,US,NC,28756,6.75,,,, +US-NC-28757,US,NC,28757,7,,,, +US-NC-28758,US,NC,28758,6.75,,,, +US-NC-28759,US,NC,28759,6.75,,,, +US-NC-28760,US,NC,28760,6.75,,,, +US-NC-28761,US,NC,28761,6.75,,,, +US-NC-28762,US,NC,28762,6.75,,,, +US-NC-28763,US,NC,28763,6.75,,,, +US-NC-28765,US,NC,28765,6.75,,,, +US-NC-28766,US,NC,28766,6.75,,,, +US-NC-28768,US,NC,28768,6.75,,,, +US-NC-28770,US,NC,28770,7,,,, +US-NC-28771,US,NC,28771,6.75,,,, +US-NC-28772,US,NC,28772,6.75,,,, +US-NC-28773,US,NC,28773,6.75,,,, +US-NC-28774,US,NC,28774,6.75,,,, +US-NC-28775,US,NC,28775,6.75,,,, +US-NC-28776,US,NC,28776,7,,,, +US-NC-28777,US,NC,28777,6.75,,,, +US-NC-28778,US,NC,28778,7,,,, +US-NC-28779,US,NC,28779,6.75,,,, +US-NC-28781,US,NC,28781,6.75,,,, +US-NC-28782,US,NC,28782,6.75,,,, +US-NC-28783,US,NC,28783,6.75,,,, +US-NC-28784,US,NC,28784,6.75,,,, +US-NC-28785,US,NC,28785,7,,,, +US-NC-28786,US,NC,28786,7,,,, +US-NC-28787,US,NC,28787,7,,,, +US-NC-28788,US,NC,28788,6.75,,,, +US-NC-28789,US,NC,28789,6.75,,,, +US-NC-28790,US,NC,28790,6.75,,,, +US-NC-28791,US,NC,28791,6.75,,,, +US-NC-28792,US,NC,28792,6.75,,,, +US-NC-28793,US,NC,28793,6.75,,,, +US-NC-28801,US,NC,28801,7,,,, +US-NC-28802,US,NC,28802,7,,,, +US-NC-28803,US,NC,28803,7,,,, +US-NC-28804,US,NC,28804,7,,,, +US-NC-28805,US,NC,28805,7,,,, +US-NC-28806,US,NC,28806,7,,,, +US-NC-28810,US,NC,28810,7,,,, +US-NC-28813,US,NC,28813,7,,,, +US-NC-28814,US,NC,28814,7,,,, +US-NC-28815,US,NC,28815,7,,,, +US-NC-28816,US,NC,28816,7,,,, +US-NC-28901,US,NC,28901,6.75,,,, +US-NC-28902,US,NC,28902,6.75,,,, +US-NC-28903,US,NC,28903,6.75,,,, +US-NC-28904,US,NC,28904,6.75,,,, +US-NC-28905,US,NC,28905,6.75,,,, +US-NC-28906,US,NC,28906,6.75,,,, +US-NC-28909,US,NC,28909,6.75,,,, +US-ND-58001,US,ND,58001,5,,,, +US-ND-58002,US,ND,58002,5.5,,,, +US-ND-58004,US,ND,58004,5.5,,,, +US-ND-58005,US,ND,58005,5.5,,,, +US-ND-58006,US,ND,58006,5.5,,,, +US-ND-58007,US,ND,58007,5.5,,,, +US-ND-58008,US,ND,58008,5,,,, +US-ND-58009,US,ND,58009,5,,,, +US-ND-58011,US,ND,58011,5.5,,,, +US-ND-58012,US,ND,58012,6.5,,,, +US-ND-58013,US,ND,58013,5,,,, +US-ND-58015,US,ND,58015,5,,,, +US-ND-58016,US,ND,58016,5,,,, +US-ND-58017,US,ND,58017,5,,,, +US-ND-58018,US,ND,58018,5,,,, +US-ND-58021,US,ND,58021,5.5,,,, +US-ND-58027,US,ND,58027,7,,,, +US-ND-58029,US,ND,58029,5.5,,,, +US-ND-58030,US,ND,58030,5,,,, +US-ND-58031,US,ND,58031,5,,,, +US-ND-58032,US,ND,58032,6.5,,,, +US-ND-58033,US,ND,58033,5,,,, +US-ND-58035,US,ND,58035,5,,,, +US-ND-58036,US,ND,58036,5.5,,,, +US-ND-58038,US,ND,58038,5.5,,,, +US-ND-58040,US,ND,58040,6,,,, +US-ND-58041,US,ND,58041,7,,,, +US-ND-58042,US,ND,58042,5.5,,,, +US-ND-58043,US,ND,58043,5,,,, +US-ND-58045,US,ND,58045,7,,,, +US-ND-58046,US,ND,58046,8,,,, +US-ND-58047,US,ND,58047,5.5,,,, +US-ND-58048,US,ND,58048,5.5,,,, +US-ND-58049,US,ND,58049,5,,,, +US-ND-58051,US,ND,58051,7,,,, +US-ND-58052,US,ND,58052,5.5,,,, +US-ND-58053,US,ND,58053,5,,,, +US-ND-58054,US,ND,58054,7,,,, +US-ND-58056,US,ND,58056,5,,,, +US-ND-58057,US,ND,58057,5,,,, +US-ND-58058,US,ND,58058,5,,,, +US-ND-58059,US,ND,58059,5.5,,,, +US-ND-58060,US,ND,58060,5,,,, +US-ND-58061,US,ND,58061,5,,,, +US-ND-58062,US,ND,58062,5,,,, +US-ND-58063,US,ND,58063,5,,,, +US-ND-58064,US,ND,58064,5.5,,,, +US-ND-58065,US,ND,58065,5,,,, +US-ND-58067,US,ND,58067,5,,,, +US-ND-58068,US,ND,58068,5,,,, +US-ND-58069,US,ND,58069,5,,,, +US-ND-58071,US,ND,58071,6.5,,,, +US-ND-58072,US,ND,58072,7.5,,,, +US-ND-58074,US,ND,58074,7,,,, +US-ND-58075,US,ND,58075,7,,,, +US-ND-58076,US,ND,58076,7,,,, +US-ND-58077,US,ND,58077,5,,,, +US-ND-58078,US,ND,58078,6.5,,,, +US-ND-58079,US,ND,58079,5.5,,,, +US-ND-58081,US,ND,58081,5,,,, +US-ND-58102,US,ND,58102,7.5,,,, +US-ND-58103,US,ND,58103,7.5,,,, +US-ND-58104,US,ND,58104,7.5,,,, +US-ND-58105,US,ND,58105,7.5,,,, +US-ND-58106,US,ND,58106,7.5,,,, +US-ND-58107,US,ND,58107,7.5,,,, +US-ND-58108,US,ND,58108,7.5,,,, +US-ND-58109,US,ND,58109,7.5,,,, +US-ND-58121,US,ND,58121,7.5,,,, +US-ND-58122,US,ND,58122,7.5,,,, +US-ND-58124,US,ND,58124,7.5,,,, +US-ND-58125,US,ND,58125,7.5,,,, +US-ND-58126,US,ND,58126,7.5,,,, +US-ND-58201,US,ND,58201,6.75,,,, +US-ND-58202,US,ND,58202,6.75,,,, +US-ND-58203,US,ND,58203,6.75,,,, +US-ND-58204,US,ND,58204,5,,,, +US-ND-58205,US,ND,58205,5,,,, +US-ND-58206,US,ND,58206,6.75,,,, +US-ND-58207,US,ND,58207,6.75,,,, +US-ND-58208,US,ND,58208,6.75,,,, +US-ND-58210,US,ND,58210,5.25,,,, +US-ND-58212,US,ND,58212,5,,,, +US-ND-58214,US,ND,58214,5,,,, +US-ND-58216,US,ND,58216,5,,,, +US-ND-58218,US,ND,58218,5,,,, +US-ND-58219,US,ND,58219,5,,,, +US-ND-58220,US,ND,58220,7,,,, +US-ND-58222,US,ND,58222,5,,,, +US-ND-58223,US,ND,58223,5,,,, +US-ND-58224,US,ND,58224,5,,,, +US-ND-58225,US,ND,58225,6.5,,,, +US-ND-58227,US,ND,58227,5,,,, +US-ND-58228,US,ND,58228,5,,,, +US-ND-58229,US,ND,58229,5.25,,,, +US-ND-58230,US,ND,58230,8,,,, +US-ND-58231,US,ND,58231,5.25,,,, +US-ND-58233,US,ND,58233,5.25,,,, +US-ND-58235,US,ND,58235,5,,,, +US-ND-58236,US,ND,58236,5,,,, +US-ND-58237,US,ND,58237,7.25,,,, +US-ND-58238,US,ND,58238,5,,,, +US-ND-58239,US,ND,58239,5,,,, +US-ND-58240,US,ND,58240,7,,,, +US-ND-58241,US,ND,58241,5,,,, +US-ND-58243,US,ND,58243,5.25,,,, +US-ND-58244,US,ND,58244,5,,,, +US-ND-58249,US,ND,58249,7,,,, +US-ND-58250,US,ND,58250,5.25,,,, +US-ND-58251,US,ND,58251,5,,,, +US-ND-58254,US,ND,58254,5,,,, +US-ND-58255,US,ND,58255,5,,,, +US-ND-58256,US,ND,58256,5,,,, +US-ND-58257,US,ND,58257,7,,,, +US-ND-58258,US,ND,58258,5,,,, +US-ND-58259,US,ND,58259,5,,,, +US-ND-58260,US,ND,58260,5,,,, +US-ND-58261,US,ND,58261,5.25,,,, +US-ND-58262,US,ND,58262,5,,,, +US-ND-58265,US,ND,58265,7,,,, +US-ND-58266,US,ND,58266,5,,,, +US-ND-58267,US,ND,58267,5,,,, +US-ND-58269,US,ND,58269,5,,,, +US-ND-58270,US,ND,58270,7.25,,,, +US-ND-58271,US,ND,58271,7.5,,,, +US-ND-58272,US,ND,58272,5,,,, +US-ND-58273,US,ND,58273,5.25,,,, +US-ND-58274,US,ND,58274,7,,,, +US-ND-58275,US,ND,58275,5,,,, +US-ND-58276,US,ND,58276,5,,,, +US-ND-58277,US,ND,58277,6,,,, +US-ND-58278,US,ND,58278,5,,,, +US-ND-58281,US,ND,58281,5,,,, +US-ND-58282,US,ND,58282,7,,,, +US-ND-58301,US,ND,58301,7,,,, +US-ND-58310,US,ND,58310,5,,,, +US-ND-58311,US,ND,58311,5,,,, +US-ND-58313,US,ND,58313,5,,,, +US-ND-58316,US,ND,58316,5,,,, +US-ND-58317,US,ND,58317,5,,,, +US-ND-58318,US,ND,58318,7,,,, +US-ND-58321,US,ND,58321,5,,,, +US-ND-58323,US,ND,58323,5,,,, +US-ND-58324,US,ND,58324,7,,,, +US-ND-58325,US,ND,58325,5,,,, +US-ND-58327,US,ND,58327,5,,,, +US-ND-58329,US,ND,58329,6,,,, +US-ND-58330,US,ND,58330,5,,,, +US-ND-58331,US,ND,58331,5,,,, +US-ND-58332,US,ND,58332,5,,,, +US-ND-58335,US,ND,58335,5,,,, +US-ND-58338,US,ND,58338,5,,,, +US-ND-58339,US,ND,58339,5,,,, +US-ND-58341,US,ND,58341,6,,,, +US-ND-58343,US,ND,58343,5,,,, +US-ND-58344,US,ND,58344,6,,,, +US-ND-58345,US,ND,58345,5,,,, +US-ND-58346,US,ND,58346,5,,,, +US-ND-58348,US,ND,58348,5,,,, +US-ND-58351,US,ND,58351,5,,,, +US-ND-58352,US,ND,58352,5,,,, +US-ND-58353,US,ND,58353,5,,,, +US-ND-58355,US,ND,58355,5,,,, +US-ND-58356,US,ND,58356,7,,,, +US-ND-58357,US,ND,58357,5,,,, +US-ND-58361,US,ND,58361,5,,,, +US-ND-58362,US,ND,58362,5,,,, +US-ND-58363,US,ND,58363,5,,,, +US-ND-58365,US,ND,58365,5,,,, +US-ND-58366,US,ND,58366,6,,,, +US-ND-58367,US,ND,58367,7,,,, +US-ND-58368,US,ND,58368,7,,,, +US-ND-58369,US,ND,58369,6,,,, +US-ND-58370,US,ND,58370,5,,,, +US-ND-58372,US,ND,58372,5,,,, +US-ND-58374,US,ND,58374,5,,,, +US-ND-58377,US,ND,58377,5,,,, +US-ND-58379,US,ND,58379,5,,,, +US-ND-58380,US,ND,58380,5,,,, +US-ND-58381,US,ND,58381,5,,,, +US-ND-58382,US,ND,58382,5,,,, +US-ND-58384,US,ND,58384,5,,,, +US-ND-58385,US,ND,58385,5,,,, +US-ND-58386,US,ND,58386,5,,,, +US-ND-58401,US,ND,58401,7,,,, +US-ND-58402,US,ND,58402,7,,,, +US-ND-58405,US,ND,58405,7,,,, +US-ND-58413,US,ND,58413,6,,,, +US-ND-58415,US,ND,58415,5,,,, +US-ND-58416,US,ND,58416,5,,,, +US-ND-58418,US,ND,58418,5,,,, +US-ND-58420,US,ND,58420,5,,,, +US-ND-58421,US,ND,58421,6,,,, +US-ND-58422,US,ND,58422,5,,,, +US-ND-58423,US,ND,58423,5,,,, +US-ND-58424,US,ND,58424,5,,,, +US-ND-58425,US,ND,58425,6.5,,,, +US-ND-58426,US,ND,58426,5,,,, +US-ND-58428,US,ND,58428,5,,,, +US-ND-58429,US,ND,58429,5,,,, +US-ND-58430,US,ND,58430,5,,,, +US-ND-58431,US,ND,58431,5,,,, +US-ND-58433,US,ND,58433,5,,,, +US-ND-58436,US,ND,58436,6,,,, +US-ND-58438,US,ND,58438,5,,,, +US-ND-58439,US,ND,58439,5,,,, +US-ND-58440,US,ND,58440,5,,,, +US-ND-58441,US,ND,58441,5,,,, +US-ND-58442,US,ND,58442,5,,,, +US-ND-58443,US,ND,58443,5,,,, +US-ND-58444,US,ND,58444,5,,,, +US-ND-58445,US,ND,58445,5,,,, +US-ND-58448,US,ND,58448,5,,,, +US-ND-58451,US,ND,58451,5,,,, +US-ND-58452,US,ND,58452,5,,,, +US-ND-58454,US,ND,58454,5,,,, +US-ND-58455,US,ND,58455,5,,,, +US-ND-58456,US,ND,58456,5,,,, +US-ND-58458,US,ND,58458,7,,,, +US-ND-58460,US,ND,58460,5,,,, +US-ND-58461,US,ND,58461,5,,,, +US-ND-58463,US,ND,58463,5,,,, +US-ND-58464,US,ND,58464,5,,,, +US-ND-58466,US,ND,58466,5,,,, +US-ND-58467,US,ND,58467,5,,,, +US-ND-58472,US,ND,58472,5,,,, +US-ND-58474,US,ND,58474,7,,,, +US-ND-58475,US,ND,58475,5,,,, +US-ND-58476,US,ND,58476,5,,,, +US-ND-58477,US,ND,58477,5,,,, +US-ND-58478,US,ND,58478,5,,,, +US-ND-58479,US,ND,58479,5,,,, +US-ND-58480,US,ND,58480,5,,,, +US-ND-58481,US,ND,58481,5,,,, +US-ND-58482,US,ND,58482,7,,,, +US-ND-58483,US,ND,58483,5,,,, +US-ND-58484,US,ND,58484,5,,,, +US-ND-58486,US,ND,58486,5,,,, +US-ND-58487,US,ND,58487,5,,,, +US-ND-58488,US,ND,58488,5,,,, +US-ND-58490,US,ND,58490,5,,,, +US-ND-58492,US,ND,58492,5,,,, +US-ND-58494,US,ND,58494,5,,,, +US-ND-58495,US,ND,58495,6.5,,,, +US-ND-58496,US,ND,58496,5,,,, +US-ND-58497,US,ND,58497,5,,,, +US-ND-58501,US,ND,58501,6,,,, +US-ND-58502,US,ND,58502,6,,,, +US-ND-58503,US,ND,58503,6,,,, +US-ND-58504,US,ND,58504,6,,,, +US-ND-58505,US,ND,58505,6,,,, +US-ND-58506,US,ND,58506,6,,,, +US-ND-58507,US,ND,58507,6,,,, +US-ND-58520,US,ND,58520,5,,,, +US-ND-58521,US,ND,58521,5,,,, +US-ND-58523,US,ND,58523,6,,,, +US-ND-58524,US,ND,58524,5,,,, +US-ND-58528,US,ND,58528,5,,,, +US-ND-58529,US,ND,58529,5,,,, +US-ND-58530,US,ND,58530,5,,,, +US-ND-58531,US,ND,58531,5,,,, +US-ND-58532,US,ND,58532,5,,,, +US-ND-58533,US,ND,58533,6,,,, +US-ND-58535,US,ND,58535,5,,,, +US-ND-58538,US,ND,58538,5,,,, +US-ND-58540,US,ND,58540,5,,,, +US-ND-58541,US,ND,58541,5,,,, +US-ND-58542,US,ND,58542,5,,,, +US-ND-58544,US,ND,58544,5,,,, +US-ND-58545,US,ND,58545,6,,,, +US-ND-58549,US,ND,58549,5,,,, +US-ND-58552,US,ND,58552,7,,,, +US-ND-58554,US,ND,58554,6,,,, +US-ND-58558,US,ND,58558,5,,,, +US-ND-58559,US,ND,58559,5,,,, +US-ND-58560,US,ND,58560,5,,,, +US-ND-58561,US,ND,58561,7,,,, +US-ND-58562,US,ND,58562,5,,,, +US-ND-58563,US,ND,58563,5,,,, +US-ND-58564,US,ND,58564,5,,,, +US-ND-58565,US,ND,58565,5,,,, +US-ND-58566,US,ND,58566,5,,,, +US-ND-58568,US,ND,58568,5,,,, +US-ND-58569,US,ND,58569,5,,,, +US-ND-58570,US,ND,58570,5,,,, +US-ND-58571,US,ND,58571,5,,,, +US-ND-58572,US,ND,58572,5,,,, +US-ND-58573,US,ND,58573,5,,,, +US-ND-58575,US,ND,58575,5,,,, +US-ND-58576,US,ND,58576,6.5,,,, +US-ND-58577,US,ND,58577,7,,,, +US-ND-58579,US,ND,58579,5,,,, +US-ND-58580,US,ND,58580,5,,,, +US-ND-58581,US,ND,58581,5,,,, +US-ND-58601,US,ND,58601,6.5,,,, +US-ND-58602,US,ND,58602,6.5,,,, +US-ND-58620,US,ND,58620,5,,,, +US-ND-58621,US,ND,58621,5,,,, +US-ND-58622,US,ND,58622,5,,,, +US-ND-58623,US,ND,58623,6,,,, +US-ND-58625,US,ND,58625,5,,,, +US-ND-58626,US,ND,58626,5,,,, +US-ND-58627,US,ND,58627,5,,,, +US-ND-58630,US,ND,58630,5,,,, +US-ND-58631,US,ND,58631,6,,,, +US-ND-58632,US,ND,58632,5,,,, +US-ND-58634,US,ND,58634,5,,,, +US-ND-58636,US,ND,58636,5,,,, +US-ND-58638,US,ND,58638,5,,,, +US-ND-58639,US,ND,58639,6.5,,,, +US-ND-58640,US,ND,58640,5,,,, +US-ND-58641,US,ND,58641,5,,,, +US-ND-58642,US,ND,58642,5,,,, +US-ND-58643,US,ND,58643,5,,,, +US-ND-58644,US,ND,58644,5,,,, +US-ND-58645,US,ND,58645,5,,,, +US-ND-58646,US,ND,58646,7,,,, +US-ND-58647,US,ND,58647,7,,,, +US-ND-58649,US,ND,58649,6,,,, +US-ND-58650,US,ND,58650,7,,,, +US-ND-58651,US,ND,58651,5,,,, +US-ND-58652,US,ND,58652,5,,,, +US-ND-58653,US,ND,58653,6,,,, +US-ND-58654,US,ND,58654,5,,,, +US-ND-58655,US,ND,58655,5,,,, +US-ND-58656,US,ND,58656,5,,,, +US-ND-58701,US,ND,58701,7.5,,,, +US-ND-58702,US,ND,58702,7.5,,,, +US-ND-58703,US,ND,58703,7.5,,,, +US-ND-58704,US,ND,58704,5.5,,,, +US-ND-58705,US,ND,58705,5.5,,,, +US-ND-58707,US,ND,58707,7.5,,,, +US-ND-58710,US,ND,58710,5,,,, +US-ND-58711,US,ND,58711,5,,,, +US-ND-58712,US,ND,58712,5,,,, +US-ND-58713,US,ND,58713,5,,,, +US-ND-58716,US,ND,58716,5,,,, +US-ND-58718,US,ND,58718,5.5,,,, +US-ND-58721,US,ND,58721,5,,,, +US-ND-58722,US,ND,58722,5.5,,,, +US-ND-58723,US,ND,58723,5,,,, +US-ND-58725,US,ND,58725,5.5,,,, +US-ND-58727,US,ND,58727,5,,,, +US-ND-58730,US,ND,58730,5,,,, +US-ND-58731,US,ND,58731,5,,,, +US-ND-58733,US,ND,58733,5.5,,,, +US-ND-58734,US,ND,58734,5.5,,,, +US-ND-58735,US,ND,58735,5.5,,,, +US-ND-58736,US,ND,58736,7,,,, +US-ND-58737,US,ND,58737,5,,,, +US-ND-58740,US,ND,58740,7,,,, +US-ND-58741,US,ND,58741,5,,,, +US-ND-58744,US,ND,58744,5,,,, +US-ND-58746,US,ND,58746,7.5,,,, +US-ND-58748,US,ND,58748,5,,,, +US-ND-58750,US,ND,58750,5,,,, +US-ND-58752,US,ND,58752,5,,,, +US-ND-58755,US,ND,58755,5,,,, +US-ND-58756,US,ND,58756,5.5,,,, +US-ND-58757,US,ND,58757,5,,,, +US-ND-58758,US,ND,58758,5,,,, +US-ND-58759,US,ND,58759,5.5,,,, +US-ND-58760,US,ND,58760,5,,,, +US-ND-58761,US,ND,58761,5,,,, +US-ND-58762,US,ND,58762,5,,,, +US-ND-58763,US,ND,58763,5,,,, +US-ND-58765,US,ND,58765,5,,,, +US-ND-58768,US,ND,58768,5.5,,,, +US-ND-58769,US,ND,58769,5,,,, +US-ND-58770,US,ND,58770,5,,,, +US-ND-58771,US,ND,58771,5,,,, +US-ND-58772,US,ND,58772,5,,,, +US-ND-58773,US,ND,58773,5,,,, +US-ND-58775,US,ND,58775,5,,,, +US-ND-58776,US,ND,58776,5,,,, +US-ND-58778,US,ND,58778,5,,,, +US-ND-58779,US,ND,58779,5.5,,,, +US-ND-58781,US,ND,58781,5.5,,,, +US-ND-58782,US,ND,58782,5,,,, +US-ND-58783,US,ND,58783,5,,,, +US-ND-58784,US,ND,58784,6.5,,,, +US-ND-58785,US,ND,58785,7.5,,,, +US-ND-58787,US,ND,58787,5,,,, +US-ND-58788,US,ND,58788,5,,,, +US-ND-58789,US,ND,58789,5,,,, +US-ND-58790,US,ND,58790,7,,,, +US-ND-58792,US,ND,58792,5,,,, +US-ND-58793,US,ND,58793,6,,,, +US-ND-58794,US,ND,58794,5,,,, +US-ND-58795,US,ND,58795,5,,,, +US-ND-58801,US,ND,58801,7,,,, +US-ND-58802,US,ND,58802,7,,,, +US-ND-58830,US,ND,58830,5,,,, +US-ND-58831,US,ND,58831,5,,,, +US-ND-58833,US,ND,58833,5,,,, +US-ND-58835,US,ND,58835,5,,,, +US-ND-58838,US,ND,58838,5,,,, +US-ND-58843,US,ND,58843,5,,,, +US-ND-58844,US,ND,58844,5,,,, +US-ND-58845,US,ND,58845,5,,,, +US-ND-58847,US,ND,58847,5,,,, +US-ND-58849,US,ND,58849,5,,,, +US-ND-58852,US,ND,58852,5,,,, +US-ND-58853,US,ND,58853,5,,,, +US-ND-58854,US,ND,58854,5,,,, +US-ND-58856,US,ND,58856,5,,,, +US-NE-68001,US,NE,68001,5.5,,,, +US-NE-68002,US,NE,68002,5.5,,,, +US-NE-68003,US,NE,68003,7,,,, +US-NE-68004,US,NE,68004,6.5,,,, +US-NE-68005,US,NE,68005,7,,,, +US-NE-68007,US,NE,68007,5.5,,,, +US-NE-68008,US,NE,68008,7,,,, +US-NE-68009,US,NE,68009,7,,,, +US-NE-68010,US,NE,68010,5.5,,,, +US-NE-68014,US,NE,68014,5.5,,,, +US-NE-68015,US,NE,68015,5.5,,,, +US-NE-68016,US,NE,68016,5.5,,,, +US-NE-68017,US,NE,68017,5.5,,,, +US-NE-68018,US,NE,68018,5.5,,,, +US-NE-68019,US,NE,68019,5.5,,,, +US-NE-68020,US,NE,68020,5.5,,,, +US-NE-68022,US,NE,68022,5.5,,,, +US-NE-68023,US,NE,68023,5.5,,,, +US-NE-68025,US,NE,68025,7,,,, +US-NE-68026,US,NE,68026,7,,,, +US-NE-68028,US,NE,68028,5.5,,,, +US-NE-68029,US,NE,68029,5.5,,,, +US-NE-68030,US,NE,68030,6,,,, +US-NE-68031,US,NE,68031,5.5,,,, +US-NE-68033,US,NE,68033,5.5,,,, +US-NE-68034,US,NE,68034,5.5,,,, +US-NE-68036,US,NE,68036,5.5,,,, +US-NE-68037,US,NE,68037,5.5,,,, +US-NE-68038,US,NE,68038,7,,,, +US-NE-68039,US,NE,68039,5.5,,,, +US-NE-68040,US,NE,68040,5.5,,,, +US-NE-68041,US,NE,68041,5.5,,,, +US-NE-68042,US,NE,68042,5.5,,,, +US-NE-68044,US,NE,68044,5.5,,,, +US-NE-68045,US,NE,68045,6.5,,,, +US-NE-68046,US,NE,68046,7,,,, +US-NE-68047,US,NE,68047,5.5,,,, +US-NE-68048,US,NE,68048,7,,,, +US-NE-68050,US,NE,68050,5.5,,,, +US-NE-68055,US,NE,68055,5.5,,,, +US-NE-68056,US,NE,68056,5.5,,,, +US-NE-68057,US,NE,68057,5.5,,,, +US-NE-68058,US,NE,68058,5.5,,,, +US-NE-68059,US,NE,68059,5.5,,,, +US-NE-68061,US,NE,68061,7,,,, +US-NE-68062,US,NE,68062,5.5,,,, +US-NE-68063,US,NE,68063,6.5,,,, +US-NE-68064,US,NE,68064,5.5,,,, +US-NE-68065,US,NE,68065,5.5,,,, +US-NE-68066,US,NE,68066,7,,,, +US-NE-68067,US,NE,68067,5.5,,,, +US-NE-68068,US,NE,68068,5.5,,,, +US-NE-68069,US,NE,68069,5.5,,,, +US-NE-68070,US,NE,68070,5.5,,,, +US-NE-68071,US,NE,68071,5.5,,,, +US-NE-68072,US,NE,68072,5.5,,,, +US-NE-68073,US,NE,68073,5.5,,,, +US-NE-68101,US,NE,68101,7,,,, +US-NE-68102,US,NE,68102,7,,,, +US-NE-68103,US,NE,68103,7,,,, +US-NE-68104,US,NE,68104,7,,,, +US-NE-68105,US,NE,68105,7,,,, +US-NE-68106,US,NE,68106,7,,,, +US-NE-68107,US,NE,68107,7,,,, +US-NE-68108,US,NE,68108,7,,,, +US-NE-68109,US,NE,68109,7,,,, +US-NE-68110,US,NE,68110,7,,,, +US-NE-68111,US,NE,68111,7,,,, +US-NE-68112,US,NE,68112,7,,,, +US-NE-68113,US,NE,68113,5.5,,,, +US-NE-68114,US,NE,68114,7,,,, +US-NE-68116,US,NE,68116,5.5,,,, +US-NE-68117,US,NE,68117,7,,,, +US-NE-68118,US,NE,68118,7,,,, +US-NE-68119,US,NE,68119,7,,,, +US-NE-68120,US,NE,68120,7,,,, +US-NE-68122,US,NE,68122,5.5,,,, +US-NE-68123,US,NE,68123,5.5,,,, +US-NE-68124,US,NE,68124,7,,,, +US-NE-68127,US,NE,68127,7,,,, +US-NE-68128,US,NE,68128,7,,,, +US-NE-68130,US,NE,68130,7,,,, +US-NE-68131,US,NE,68131,7,,,, +US-NE-68132,US,NE,68132,7,,,, +US-NE-68133,US,NE,68133,5.5,,,, +US-NE-68134,US,NE,68134,7,,,, +US-NE-68135,US,NE,68135,5.5,,,, +US-NE-68136,US,NE,68136,5.5,,,, +US-NE-68137,US,NE,68137,7,,,, +US-NE-68138,US,NE,68138,5.5,,,, +US-NE-68139,US,NE,68139,7,,,, +US-NE-68142,US,NE,68142,5.5,,,, +US-NE-68144,US,NE,68144,7,,,, +US-NE-68145,US,NE,68145,7,,,, +US-NE-68147,US,NE,68147,7,,,, +US-NE-68152,US,NE,68152,7,,,, +US-NE-68154,US,NE,68154,7,,,, +US-NE-68155,US,NE,68155,7,,,, +US-NE-68157,US,NE,68157,7,,,, +US-NE-68164,US,NE,68164,7,,,, +US-NE-68172,US,NE,68172,7,,,, +US-NE-68175,US,NE,68175,7,,,, +US-NE-68176,US,NE,68176,7,,,, +US-NE-68178,US,NE,68178,7,,,, +US-NE-68179,US,NE,68179,7,,,, +US-NE-68180,US,NE,68180,7,,,, +US-NE-68182,US,NE,68182,7,,,, +US-NE-68183,US,NE,68183,7,,,, +US-NE-68197,US,NE,68197,7,,,, +US-NE-68198,US,NE,68198,7,,,, +US-NE-68301,US,NE,68301,5.5,,,, +US-NE-68303,US,NE,68303,5.5,,,, +US-NE-68304,US,NE,68304,5.5,,,, +US-NE-68305,US,NE,68305,6.5,,,, +US-NE-68307,US,NE,68307,5.5,,,, +US-NE-68309,US,NE,68309,5.5,,,, +US-NE-68310,US,NE,68310,7,,,, +US-NE-68313,US,NE,68313,5.5,,,, +US-NE-68314,US,NE,68314,5.5,,,, +US-NE-68315,US,NE,68315,5.5,,,, +US-NE-68316,US,NE,68316,5.5,,,, +US-NE-68317,US,NE,68317,5.5,,,, +US-NE-68318,US,NE,68318,5.5,,,, +US-NE-68319,US,NE,68319,5.5,,,, +US-NE-68320,US,NE,68320,5.5,,,, +US-NE-68321,US,NE,68321,6.5,,,, +US-NE-68322,US,NE,68322,5.5,,,, +US-NE-68323,US,NE,68323,5.5,,,, +US-NE-68324,US,NE,68324,5.5,,,, +US-NE-68325,US,NE,68325,5.5,,,, +US-NE-68326,US,NE,68326,5.5,,,, +US-NE-68327,US,NE,68327,6.5,,,, +US-NE-68328,US,NE,68328,5.5,,,, +US-NE-68329,US,NE,68329,5.5,,,, +US-NE-68330,US,NE,68330,6.5,,,, +US-NE-68331,US,NE,68331,5.5,,,, +US-NE-68332,US,NE,68332,5.5,,,, +US-NE-68333,US,NE,68333,7,,,, +US-NE-68335,US,NE,68335,5.5,,,, +US-NE-68336,US,NE,68336,5.5,,,, +US-NE-68337,US,NE,68337,5.5,,,, +US-NE-68338,US,NE,68338,5.5,,,, +US-NE-68339,US,NE,68339,5.5,,,, +US-NE-68340,US,NE,68340,5.5,,,, +US-NE-68341,US,NE,68341,5.5,,,, +US-NE-68342,US,NE,68342,5.5,,,, +US-NE-68343,US,NE,68343,5.5,,,, +US-NE-68344,US,NE,68344,7,,,, +US-NE-68345,US,NE,68345,5.5,,,, +US-NE-68346,US,NE,68346,5.5,,,, +US-NE-68347,US,NE,68347,5.5,,,, +US-NE-68348,US,NE,68348,5.5,,,, +US-NE-68349,US,NE,68349,5.5,,,, +US-NE-68350,US,NE,68350,5.5,,,, +US-NE-68351,US,NE,68351,7,,,, +US-NE-68352,US,NE,68352,7,,,, +US-NE-68354,US,NE,68354,5.5,,,, +US-NE-68355,US,NE,68355,7,,,, +US-NE-68357,US,NE,68357,5.5,,,, +US-NE-68358,US,NE,68358,5.5,,,, +US-NE-68359,US,NE,68359,6.5,,,, +US-NE-68360,US,NE,68360,5.5,,,, +US-NE-68361,US,NE,68361,7,,,, +US-NE-68362,US,NE,68362,6.5,,,, +US-NE-68364,US,NE,68364,5.5,,,, +US-NE-68365,US,NE,68365,5.5,,,, +US-NE-68366,US,NE,68366,5.5,,,, +US-NE-68367,US,NE,68367,5.5,,,, +US-NE-68368,US,NE,68368,5.5,,,, +US-NE-68370,US,NE,68370,6.5,,,, +US-NE-68371,US,NE,68371,7,,,, +US-NE-68372,US,NE,68372,5.5,,,, +US-NE-68375,US,NE,68375,6.5,,,, +US-NE-68376,US,NE,68376,5.5,,,, +US-NE-68377,US,NE,68377,5.5,,,, +US-NE-68378,US,NE,68378,5.5,,,, +US-NE-68379,US,NE,68379,5.5,,,, +US-NE-68380,US,NE,68380,5.5,,,, +US-NE-68381,US,NE,68381,5.5,,,, +US-NE-68382,US,NE,68382,5.5,,,, +US-NE-68401,US,NE,68401,5.5,,,, +US-NE-68402,US,NE,68402,5.5,,,, +US-NE-68403,US,NE,68403,5.5,,,, +US-NE-68404,US,NE,68404,5.5,,,, +US-NE-68405,US,NE,68405,6.5,,,, +US-NE-68406,US,NE,68406,5.5,,,, +US-NE-68407,US,NE,68407,5.5,,,, +US-NE-68409,US,NE,68409,5.5,,,, +US-NE-68410,US,NE,68410,7,,,, +US-NE-68413,US,NE,68413,5.5,,,, +US-NE-68414,US,NE,68414,5.5,,,, +US-NE-68415,US,NE,68415,6.5,,,, +US-NE-68416,US,NE,68416,5.5,,,, +US-NE-68417,US,NE,68417,5.5,,,, +US-NE-68418,US,NE,68418,6.5,,,, +US-NE-68419,US,NE,68419,5.5,,,, +US-NE-68420,US,NE,68420,7,,,, +US-NE-68421,US,NE,68421,6.5,,,, +US-NE-68422,US,NE,68422,5.5,,,, +US-NE-68423,US,NE,68423,5.5,,,, +US-NE-68424,US,NE,68424,5.5,,,, +US-NE-68428,US,NE,68428,5.5,,,, +US-NE-68429,US,NE,68429,5.5,,,, +US-NE-68430,US,NE,68430,5.5,,,, +US-NE-68431,US,NE,68431,5.5,,,, +US-NE-68433,US,NE,68433,5.5,,,, +US-NE-68434,US,NE,68434,6.5,,,, +US-NE-68436,US,NE,68436,5.5,,,, +US-NE-68437,US,NE,68437,5.5,,,, +US-NE-68438,US,NE,68438,5.5,,,, +US-NE-68439,US,NE,68439,5.5,,,, +US-NE-68440,US,NE,68440,5.5,,,, +US-NE-68441,US,NE,68441,5.5,,,, +US-NE-68442,US,NE,68442,5.5,,,, +US-NE-68443,US,NE,68443,6.5,,,, +US-NE-68444,US,NE,68444,5.5,,,, +US-NE-68445,US,NE,68445,5.5,,,, +US-NE-68446,US,NE,68446,6.5,,,, +US-NE-68447,US,NE,68447,5.5,,,, +US-NE-68448,US,NE,68448,5.5,,,, +US-NE-68450,US,NE,68450,7,,,, +US-NE-68452,US,NE,68452,5.5,,,, +US-NE-68453,US,NE,68453,5.5,,,, +US-NE-68454,US,NE,68454,5.5,,,, +US-NE-68455,US,NE,68455,5.5,,,, +US-NE-68456,US,NE,68456,5.5,,,, +US-NE-68457,US,NE,68457,5.5,,,, +US-NE-68458,US,NE,68458,5.5,,,, +US-NE-68460,US,NE,68460,5.5,,,, +US-NE-68461,US,NE,68461,5.5,,,, +US-NE-68462,US,NE,68462,6.5,,,, +US-NE-68463,US,NE,68463,5.5,,,, +US-NE-68464,US,NE,68464,5.5,,,, +US-NE-68465,US,NE,68465,6.5,,,, +US-NE-68466,US,NE,68466,7,,,, +US-NE-68467,US,NE,68467,7,,,, +US-NE-68501,US,NE,68501,7,,,, +US-NE-68502,US,NE,68502,7,,,, +US-NE-68503,US,NE,68503,7,,,, +US-NE-68504,US,NE,68504,7,,,, +US-NE-68505,US,NE,68505,7,,,, +US-NE-68506,US,NE,68506,7,,,, +US-NE-68507,US,NE,68507,7,,,, +US-NE-68508,US,NE,68508,7,,,, +US-NE-68509,US,NE,68509,7,,,, +US-NE-68510,US,NE,68510,7,,,, +US-NE-68512,US,NE,68512,7,,,, +US-NE-68514,US,NE,68514,5.5,,,, +US-NE-68516,US,NE,68516,7,,,, +US-NE-68517,US,NE,68517,5.5,,,, +US-NE-68520,US,NE,68520,5.5,,,, +US-NE-68521,US,NE,68521,7,,,, +US-NE-68522,US,NE,68522,7,,,, +US-NE-68523,US,NE,68523,5.5,,,, +US-NE-68524,US,NE,68524,7,,,, +US-NE-68526,US,NE,68526,7,,,, +US-NE-68527,US,NE,68527,5.5,,,, +US-NE-68528,US,NE,68528,7,,,, +US-NE-68529,US,NE,68529,7,,,, +US-NE-68531,US,NE,68531,5.5,,,, +US-NE-68532,US,NE,68532,5.5,,,, +US-NE-68542,US,NE,68542,7,,,, +US-NE-68544,US,NE,68544,7,,,, +US-NE-68583,US,NE,68583,7,,,, +US-NE-68588,US,NE,68588,7,,,, +US-NE-68601,US,NE,68601,7,,,, +US-NE-68602,US,NE,68602,7,,,, +US-NE-68620,US,NE,68620,7,,,, +US-NE-68621,US,NE,68621,5.5,,,, +US-NE-68622,US,NE,68622,5.5,,,, +US-NE-68623,US,NE,68623,5.5,,,, +US-NE-68624,US,NE,68624,5.5,,,, +US-NE-68626,US,NE,68626,6.5,,,, +US-NE-68627,US,NE,68627,6.5,,,, +US-NE-68628,US,NE,68628,5.5,,,, +US-NE-68629,US,NE,68629,5.5,,,, +US-NE-68631,US,NE,68631,5.5,,,, +US-NE-68632,US,NE,68632,7,,,, +US-NE-68633,US,NE,68633,5.5,,,, +US-NE-68634,US,NE,68634,6.5,,,, +US-NE-68635,US,NE,68635,5.5,,,, +US-NE-68636,US,NE,68636,6.5,,,, +US-NE-68637,US,NE,68637,5.5,,,, +US-NE-68638,US,NE,68638,7,,,, +US-NE-68640,US,NE,68640,7,,,, +US-NE-68641,US,NE,68641,6.5,,,, +US-NE-68642,US,NE,68642,7,,,, +US-NE-68643,US,NE,68643,5.5,,,, +US-NE-68644,US,NE,68644,5.5,,,, +US-NE-68647,US,NE,68647,5.5,,,, +US-NE-68648,US,NE,68648,5.5,,,, +US-NE-68649,US,NE,68649,7,,,, +US-NE-68651,US,NE,68651,7,,,, +US-NE-68652,US,NE,68652,5.5,,,, +US-NE-68653,US,NE,68653,5.5,,,, +US-NE-68654,US,NE,68654,5.5,,,, +US-NE-68655,US,NE,68655,5.5,,,, +US-NE-68658,US,NE,68658,5.5,,,, +US-NE-68659,US,NE,68659,5.5,,,, +US-NE-68660,US,NE,68660,6.5,,,, +US-NE-68661,US,NE,68661,7,,,, +US-NE-68662,US,NE,68662,5.5,,,, +US-NE-68663,US,NE,68663,6.5,,,, +US-NE-68664,US,NE,68664,5.5,,,, +US-NE-68665,US,NE,68665,5.5,,,, +US-NE-68666,US,NE,68666,7,,,, +US-NE-68667,US,NE,68667,5.5,,,, +US-NE-68669,US,NE,68669,5.5,,,, +US-NE-68701,US,NE,68701,7,,,, +US-NE-68702,US,NE,68702,7,,,, +US-NE-68710,US,NE,68710,5.5,,,, +US-NE-68711,US,NE,68711,5.5,,,, +US-NE-68713,US,NE,68713,6.5,,,, +US-NE-68714,US,NE,68714,6.5,,,, +US-NE-68715,US,NE,68715,5.5,,,, +US-NE-68716,US,NE,68716,5.5,,,, +US-NE-68717,US,NE,68717,5.5,,,, +US-NE-68718,US,NE,68718,5.5,,,, +US-NE-68719,US,NE,68719,5.5,,,, +US-NE-68720,US,NE,68720,5.5,,,, +US-NE-68722,US,NE,68722,5.5,,,, +US-NE-68723,US,NE,68723,5.5,,,, +US-NE-68724,US,NE,68724,5.5,,,, +US-NE-68725,US,NE,68725,6.5,,,, +US-NE-68726,US,NE,68726,7,,,, +US-NE-68727,US,NE,68727,5.5,,,, +US-NE-68728,US,NE,68728,5.5,,,, +US-NE-68729,US,NE,68729,6.5,,,, +US-NE-68730,US,NE,68730,5.5,,,, +US-NE-68731,US,NE,68731,6,,,, +US-NE-68732,US,NE,68732,5.5,,,, +US-NE-68733,US,NE,68733,6,,,, +US-NE-68734,US,NE,68734,5.5,,,, +US-NE-68735,US,NE,68735,5.5,,,, +US-NE-68736,US,NE,68736,5.5,,,, +US-NE-68738,US,NE,68738,5.5,,,, +US-NE-68739,US,NE,68739,5.5,,,, +US-NE-68740,US,NE,68740,5.5,,,, +US-NE-68741,US,NE,68741,6,,,, +US-NE-68742,US,NE,68742,5.5,,,, +US-NE-68743,US,NE,68743,6,,,, +US-NE-68745,US,NE,68745,5.5,,,, +US-NE-68746,US,NE,68746,5.5,,,, +US-NE-68747,US,NE,68747,5.5,,,, +US-NE-68748,US,NE,68748,7,,,, +US-NE-68749,US,NE,68749,5.5,,,, +US-NE-68751,US,NE,68751,5.5,,,, +US-NE-68752,US,NE,68752,5.5,,,, +US-NE-68753,US,NE,68753,5.5,,,, +US-NE-68755,US,NE,68755,5.5,,,, +US-NE-68756,US,NE,68756,6.5,,,, +US-NE-68757,US,NE,68757,5.5,,,, +US-NE-68758,US,NE,68758,7,,,, +US-NE-68759,US,NE,68759,5.5,,,, +US-NE-68760,US,NE,68760,6.5,,,, +US-NE-68761,US,NE,68761,5.5,,,, +US-NE-68763,US,NE,68763,7,,,, +US-NE-68764,US,NE,68764,5.5,,,, +US-NE-68765,US,NE,68765,6.5,,,, +US-NE-68766,US,NE,68766,5.5,,,, +US-NE-68767,US,NE,68767,6.5,,,, +US-NE-68768,US,NE,68768,5.5,,,, +US-NE-68769,US,NE,68769,7,,,, +US-NE-68770,US,NE,68770,7,,,, +US-NE-68771,US,NE,68771,5.5,,,, +US-NE-68773,US,NE,68773,5.5,,,, +US-NE-68774,US,NE,68774,5.5,,,, +US-NE-68776,US,NE,68776,6,,,, +US-NE-68777,US,NE,68777,5.5,,,, +US-NE-68778,US,NE,68778,5.5,,,, +US-NE-68779,US,NE,68779,5.5,,,, +US-NE-68780,US,NE,68780,5.5,,,, +US-NE-68781,US,NE,68781,5.5,,,, +US-NE-68783,US,NE,68783,5.5,,,, +US-NE-68784,US,NE,68784,6.5,,,, +US-NE-68785,US,NE,68785,5.5,,,, +US-NE-68786,US,NE,68786,6.5,,,, +US-NE-68787,US,NE,68787,6.5,,,, +US-NE-68788,US,NE,68788,7,,,, +US-NE-68789,US,NE,68789,5.5,,,, +US-NE-68790,US,NE,68790,5.5,,,, +US-NE-68791,US,NE,68791,7,,,, +US-NE-68792,US,NE,68792,5.5,,,, +US-NE-68801,US,NE,68801,7,,,, +US-NE-68802,US,NE,68802,7,,,, +US-NE-68803,US,NE,68803,7,,,, +US-NE-68810,US,NE,68810,5.5,,,, +US-NE-68812,US,NE,68812,5.5,,,, +US-NE-68813,US,NE,68813,5.5,,,, +US-NE-68814,US,NE,68814,5.5,,,, +US-NE-68815,US,NE,68815,5.5,,,, +US-NE-68816,US,NE,68816,5.5,,,, +US-NE-68817,US,NE,68817,5.5,,,, +US-NE-68818,US,NE,68818,5.5,,,, +US-NE-68820,US,NE,68820,5.5,,,, +US-NE-68821,US,NE,68821,5.5,,,, +US-NE-68822,US,NE,68822,7,,,, +US-NE-68823,US,NE,68823,5.5,,,, +US-NE-68824,US,NE,68824,5.5,,,, +US-NE-68825,US,NE,68825,5.5,,,, +US-NE-68826,US,NE,68826,6.5,,,, +US-NE-68827,US,NE,68827,5.5,,,, +US-NE-68828,US,NE,68828,5.5,,,, +US-NE-68831,US,NE,68831,5.5,,,, +US-NE-68832,US,NE,68832,5.5,,,, +US-NE-68833,US,NE,68833,5.5,,,, +US-NE-68834,US,NE,68834,5.5,,,, +US-NE-68835,US,NE,68835,5.5,,,, +US-NE-68836,US,NE,68836,5.5,,,, +US-NE-68837,US,NE,68837,5.5,,,, +US-NE-68838,US,NE,68838,5.5,,,, +US-NE-68840,US,NE,68840,5.5,,,, +US-NE-68841,US,NE,68841,5.5,,,, +US-NE-68842,US,NE,68842,5.5,,,, +US-NE-68843,US,NE,68843,5.5,,,, +US-NE-68844,US,NE,68844,5.5,,,, +US-NE-68845,US,NE,68845,7,,,, +US-NE-68846,US,NE,68846,5.5,,,, +US-NE-68847,US,NE,68847,7,,,, +US-NE-68848,US,NE,68848,7,,,, +US-NE-68849,US,NE,68849,7,,,, +US-NE-68850,US,NE,68850,7,,,, +US-NE-68852,US,NE,68852,5.5,,,, +US-NE-68853,US,NE,68853,7,,,, +US-NE-68854,US,NE,68854,5.5,,,, +US-NE-68855,US,NE,68855,5.5,,,, +US-NE-68856,US,NE,68856,5.5,,,, +US-NE-68858,US,NE,68858,5.5,,,, +US-NE-68859,US,NE,68859,5.5,,,, +US-NE-68860,US,NE,68860,6.5,,,, +US-NE-68861,US,NE,68861,5.5,,,, +US-NE-68862,US,NE,68862,7,,,, +US-NE-68863,US,NE,68863,5.5,,,, +US-NE-68864,US,NE,68864,5.5,,,, +US-NE-68865,US,NE,68865,5.5,,,, +US-NE-68866,US,NE,68866,5.5,,,, +US-NE-68869,US,NE,68869,5.5,,,, +US-NE-68870,US,NE,68870,5.5,,,, +US-NE-68871,US,NE,68871,5.5,,,, +US-NE-68872,US,NE,68872,5.5,,,, +US-NE-68873,US,NE,68873,6.5,,,, +US-NE-68874,US,NE,68874,7,,,, +US-NE-68875,US,NE,68875,5.5,,,, +US-NE-68876,US,NE,68876,5.5,,,, +US-NE-68878,US,NE,68878,5.5,,,, +US-NE-68879,US,NE,68879,5.5,,,, +US-NE-68881,US,NE,68881,5.5,,,, +US-NE-68882,US,NE,68882,5.5,,,, +US-NE-68883,US,NE,68883,5.5,,,, +US-NE-68901,US,NE,68901,7,,,, +US-NE-68902,US,NE,68902,7,,,, +US-NE-68920,US,NE,68920,7.5,,,, +US-NE-68922,US,NE,68922,6.5,,,, +US-NE-68923,US,NE,68923,5.5,,,, +US-NE-68924,US,NE,68924,5.5,,,, +US-NE-68925,US,NE,68925,5.5,,,, +US-NE-68926,US,NE,68926,6.5,,,, +US-NE-68927,US,NE,68927,5.5,,,, +US-NE-68928,US,NE,68928,5.5,,,, +US-NE-68929,US,NE,68929,5.5,,,, +US-NE-68930,US,NE,68930,6.5,,,, +US-NE-68932,US,NE,68932,5.5,,,, +US-NE-68933,US,NE,68933,6.5,,,, +US-NE-68934,US,NE,68934,6.5,,,, +US-NE-68935,US,NE,68935,6.5,,,, +US-NE-68936,US,NE,68936,5.5,,,, +US-NE-68937,US,NE,68937,5.5,,,, +US-NE-68938,US,NE,68938,5.5,,,, +US-NE-68939,US,NE,68939,6.5,,,, +US-NE-68940,US,NE,68940,5.5,,,, +US-NE-68941,US,NE,68941,5.5,,,, +US-NE-68942,US,NE,68942,6.5,,,, +US-NE-68943,US,NE,68943,5.5,,,, +US-NE-68944,US,NE,68944,6.5,,,, +US-NE-68945,US,NE,68945,5.5,,,, +US-NE-68946,US,NE,68946,5.5,,,, +US-NE-68947,US,NE,68947,6.5,,,, +US-NE-68948,US,NE,68948,5.5,,,, +US-NE-68949,US,NE,68949,7,,,, +US-NE-68950,US,NE,68950,5.5,,,, +US-NE-68952,US,NE,68952,5.5,,,, +US-NE-68954,US,NE,68954,5.5,,,, +US-NE-68955,US,NE,68955,5.5,,,, +US-NE-68956,US,NE,68956,5.5,,,, +US-NE-68957,US,NE,68957,5.5,,,, +US-NE-68958,US,NE,68958,5.5,,,, +US-NE-68959,US,NE,68959,6.5,,,, +US-NE-68960,US,NE,68960,5.5,,,, +US-NE-68961,US,NE,68961,6.5,,,, +US-NE-68964,US,NE,68964,5.5,,,, +US-NE-68966,US,NE,68966,5.5,,,, +US-NE-68967,US,NE,68967,7,,,, +US-NE-68969,US,NE,68969,5.5,,,, +US-NE-68970,US,NE,68970,7,,,, +US-NE-68971,US,NE,68971,5.5,,,, +US-NE-68972,US,NE,68972,5.5,,,, +US-NE-68973,US,NE,68973,5.5,,,, +US-NE-68974,US,NE,68974,5.5,,,, +US-NE-68975,US,NE,68975,5.5,,,, +US-NE-68976,US,NE,68976,5.5,,,, +US-NE-68977,US,NE,68977,5.5,,,, +US-NE-68978,US,NE,68978,6.5,,,, +US-NE-68979,US,NE,68979,7,,,, +US-NE-68980,US,NE,68980,5.5,,,, +US-NE-68981,US,NE,68981,5.5,,,, +US-NE-68982,US,NE,68982,5.5,,,, +US-NE-69001,US,NE,69001,7,,,, +US-NE-69020,US,NE,69020,5.5,,,, +US-NE-69021,US,NE,69021,7,,,, +US-NE-69022,US,NE,69022,7,,,, +US-NE-69023,US,NE,69023,5.5,,,, +US-NE-69024,US,NE,69024,5.5,,,, +US-NE-69025,US,NE,69025,6.5,,,, +US-NE-69026,US,NE,69026,5.5,,,, +US-NE-69027,US,NE,69027,5.5,,,, +US-NE-69028,US,NE,69028,5.5,,,, +US-NE-69029,US,NE,69029,5.5,,,, +US-NE-69030,US,NE,69030,5.5,,,, +US-NE-69032,US,NE,69032,5.5,,,, +US-NE-69033,US,NE,69033,6.5,,,, +US-NE-69034,US,NE,69034,5.5,,,, +US-NE-69036,US,NE,69036,5.5,,,, +US-NE-69037,US,NE,69037,5.5,,,, +US-NE-69038,US,NE,69038,5.5,,,, +US-NE-69039,US,NE,69039,5.5,,,, +US-NE-69040,US,NE,69040,5.5,,,, +US-NE-69041,US,NE,69041,5.5,,,, +US-NE-69042,US,NE,69042,5.5,,,, +US-NE-69043,US,NE,69043,5.5,,,, +US-NE-69044,US,NE,69044,5.5,,,, +US-NE-69045,US,NE,69045,5.5,,,, +US-NE-69046,US,NE,69046,5.5,,,, +US-NE-69101,US,NE,69101,7,,,, +US-NE-69103,US,NE,69103,7,,,, +US-NE-69120,US,NE,69120,6.5,,,, +US-NE-69121,US,NE,69121,5.5,,,, +US-NE-69122,US,NE,69122,5.5,,,, +US-NE-69123,US,NE,69123,5.5,,,, +US-NE-69125,US,NE,69125,5.5,,,, +US-NE-69127,US,NE,69127,5.5,,,, +US-NE-69128,US,NE,69128,5.5,,,, +US-NE-69129,US,NE,69129,5.5,,,, +US-NE-69130,US,NE,69130,7,,,, +US-NE-69131,US,NE,69131,5.5,,,, +US-NE-69132,US,NE,69132,5.5,,,, +US-NE-69133,US,NE,69133,5.5,,,, +US-NE-69134,US,NE,69134,5.5,,,, +US-NE-69135,US,NE,69135,5.5,,,, +US-NE-69138,US,NE,69138,7,,,, +US-NE-69140,US,NE,69140,6.5,,,, +US-NE-69141,US,NE,69141,5.5,,,, +US-NE-69142,US,NE,69142,5.5,,,, +US-NE-69143,US,NE,69143,5.5,,,, +US-NE-69144,US,NE,69144,5.5,,,, +US-NE-69145,US,NE,69145,7,,,, +US-NE-69146,US,NE,69146,5.5,,,, +US-NE-69147,US,NE,69147,5.5,,,, +US-NE-69148,US,NE,69148,5.5,,,, +US-NE-69149,US,NE,69149,5.5,,,, +US-NE-69150,US,NE,69150,5.5,,,, +US-NE-69151,US,NE,69151,5.5,,,, +US-NE-69152,US,NE,69152,5.5,,,, +US-NE-69153,US,NE,69153,7,,,, +US-NE-69154,US,NE,69154,7,,,, +US-NE-69155,US,NE,69155,5.5,,,, +US-NE-69156,US,NE,69156,5.5,,,, +US-NE-69157,US,NE,69157,5.5,,,, +US-NE-69160,US,NE,69160,7.5,,,, +US-NE-69161,US,NE,69161,5.5,,,, +US-NE-69162,US,NE,69162,7.5,,,, +US-NE-69163,US,NE,69163,5.5,,,, +US-NE-69165,US,NE,69165,5.5,,,, +US-NE-69166,US,NE,69166,5.5,,,, +US-NE-69167,US,NE,69167,5.5,,,, +US-NE-69168,US,NE,69168,5.5,,,, +US-NE-69169,US,NE,69169,5.5,,,, +US-NE-69170,US,NE,69170,5.5,,,, +US-NE-69171,US,NE,69171,5.5,,,, +US-NE-69190,US,NE,69190,7,,,, +US-NE-69201,US,NE,69201,7,,,, +US-NE-69210,US,NE,69210,7,,,, +US-NE-69211,US,NE,69211,5.5,,,, +US-NE-69212,US,NE,69212,5.5,,,, +US-NE-69214,US,NE,69214,5.5,,,, +US-NE-69216,US,NE,69216,5.5,,,, +US-NE-69217,US,NE,69217,5.5,,,, +US-NE-69218,US,NE,69218,5.5,,,, +US-NE-69219,US,NE,69219,5.5,,,, +US-NE-69220,US,NE,69220,5.5,,,, +US-NE-69221,US,NE,69221,5.5,,,, +US-NE-69301,US,NE,69301,7,,,, +US-NE-69331,US,NE,69331,5.5,,,, +US-NE-69333,US,NE,69333,5.5,,,, +US-NE-69334,US,NE,69334,5.5,,,, +US-NE-69335,US,NE,69335,5.5,,,, +US-NE-69336,US,NE,69336,6.5,,,, +US-NE-69337,US,NE,69337,7,,,, +US-NE-69339,US,NE,69339,7,,,, +US-NE-69340,US,NE,69340,5.5,,,, +US-NE-69341,US,NE,69341,7,,,, +US-NE-69343,US,NE,69343,6.5,,,, +US-NE-69345,US,NE,69345,5.5,,,, +US-NE-69346,US,NE,69346,5.5,,,, +US-NE-69347,US,NE,69347,5.5,,,, +US-NE-69348,US,NE,69348,5.5,,,, +US-NE-69350,US,NE,69350,5.5,,,, +US-NE-69351,US,NE,69351,5.5,,,, +US-NE-69352,US,NE,69352,5.5,,,, +US-NE-69353,US,NE,69353,5.5,,,, +US-NE-69354,US,NE,69354,5.5,,,, +US-NE-69355,US,NE,69355,5.5,,,, +US-NE-69356,US,NE,69356,5.5,,,, +US-NE-69357,US,NE,69357,5.5,,,, +US-NE-69358,US,NE,69358,5.5,,,, +US-NE-69360,US,NE,69360,5.5,,,, +US-NE-69361,US,NE,69361,7,,,, +US-NE-69363,US,NE,69363,7,,,, +US-NE-69365,US,NE,69365,6.5,,,, +US-NE-69366,US,NE,69366,5.5,,,, +US-NE-69367,US,NE,69367,5.5,,,, +US-NJ-07001,US,NJ,07001,7,,,, +US-NJ-07002,US,NJ,07002,7,,,, +US-NJ-07003,US,NJ,07003,7,,,, +US-NJ-07004,US,NJ,07004,7,,,, +US-NJ-07005,US,NJ,07005,7,,,, +US-NJ-07006,US,NJ,07006,7,,,, +US-NJ-07007,US,NJ,07007,7,,,, +US-NJ-07008,US,NJ,07008,7,,,, +US-NJ-07009,US,NJ,07009,7,,,, +US-NJ-07010,US,NJ,07010,7,,,, +US-NJ-07011,US,NJ,07011,7,,,, +US-NJ-07012,US,NJ,07012,7,,,, +US-NJ-07013,US,NJ,07013,7,,,, +US-NJ-07014,US,NJ,07014,7,,,, +US-NJ-07015,US,NJ,07015,7,,,, +US-NJ-07016,US,NJ,07016,7,,,, +US-NJ-07017,US,NJ,07017,7,,,, +US-NJ-07018,US,NJ,07018,7,,,, +US-NJ-07019,US,NJ,07019,7,,,, +US-NJ-07020,US,NJ,07020,7,,,, +US-NJ-07021,US,NJ,07021,7,,,, +US-NJ-07022,US,NJ,07022,7,,,, +US-NJ-07023,US,NJ,07023,7,,,, +US-NJ-07024,US,NJ,07024,7,,,, +US-NJ-07026,US,NJ,07026,7,,,, +US-NJ-07027,US,NJ,07027,7,,,, +US-NJ-07028,US,NJ,07028,7,,,, +US-NJ-07029,US,NJ,07029,7,,,, +US-NJ-07030,US,NJ,07030,7,,,, +US-NJ-07031,US,NJ,07031,7,,,, +US-NJ-07032,US,NJ,07032,7,,,, +US-NJ-07033,US,NJ,07033,7,,,, +US-NJ-07034,US,NJ,07034,7,,,, +US-NJ-07035,US,NJ,07035,7,,,, +US-NJ-07036,US,NJ,07036,7,,,, +US-NJ-07039,US,NJ,07039,7,,,, +US-NJ-07040,US,NJ,07040,7,,,, +US-NJ-07041,US,NJ,07041,7,,,, +US-NJ-07042,US,NJ,07042,7,,,, +US-NJ-07043,US,NJ,07043,7,,,, +US-NJ-07044,US,NJ,07044,7,,,, +US-NJ-07045,US,NJ,07045,7,,,, +US-NJ-07046,US,NJ,07046,7,,,, +US-NJ-07047,US,NJ,07047,7,,,, +US-NJ-07050,US,NJ,07050,7,,,, +US-NJ-07051,US,NJ,07051,7,,,, +US-NJ-07052,US,NJ,07052,7,,,, +US-NJ-07054,US,NJ,07054,7,,,, +US-NJ-07055,US,NJ,07055,7,,,, +US-NJ-07057,US,NJ,07057,7,,,, +US-NJ-07058,US,NJ,07058,7,,,, +US-NJ-07059,US,NJ,07059,7,,,, +US-NJ-07060,US,NJ,07060,7,,,, +US-NJ-07061,US,NJ,07061,7,,,, +US-NJ-07062,US,NJ,07062,7,,,, +US-NJ-07063,US,NJ,07063,7,,,, +US-NJ-07064,US,NJ,07064,7,,,, +US-NJ-07065,US,NJ,07065,7,,,, +US-NJ-07066,US,NJ,07066,7,,,, +US-NJ-07067,US,NJ,07067,7,,,, +US-NJ-07068,US,NJ,07068,7,,,, +US-NJ-07069,US,NJ,07069,7,,,, +US-NJ-07070,US,NJ,07070,7,,,, +US-NJ-07071,US,NJ,07071,7,,,, +US-NJ-07072,US,NJ,07072,7,,,, +US-NJ-07073,US,NJ,07073,7,,,, +US-NJ-07074,US,NJ,07074,7,,,, +US-NJ-07075,US,NJ,07075,7,,,, +US-NJ-07076,US,NJ,07076,7,,,, +US-NJ-07077,US,NJ,07077,7,,,, +US-NJ-07078,US,NJ,07078,7,,,, +US-NJ-07079,US,NJ,07079,7,,,, +US-NJ-07080,US,NJ,07080,7,,,, +US-NJ-07081,US,NJ,07081,7,,,, +US-NJ-07082,US,NJ,07082,7,,,, +US-NJ-07083,US,NJ,07083,7,,,, +US-NJ-07086,US,NJ,07086,7,,,, +US-NJ-07087,US,NJ,07087,7,,,, +US-NJ-07088,US,NJ,07088,7,,,, +US-NJ-07090,US,NJ,07090,7,,,, +US-NJ-07091,US,NJ,07091,7,,,, +US-NJ-07092,US,NJ,07092,7,,,, +US-NJ-07093,US,NJ,07093,7,,,, +US-NJ-07094,US,NJ,07094,7,,,, +US-NJ-07095,US,NJ,07095,7,,,, +US-NJ-07096,US,NJ,07096,7,,,, +US-NJ-07097,US,NJ,07097,7,,,, +US-NJ-07099,US,NJ,07099,7,,,, +US-NJ-07101,US,NJ,07101,7,,,, +US-NJ-07102,US,NJ,07102,7,,,, +US-NJ-07103,US,NJ,07103,7,,,, +US-NJ-07104,US,NJ,07104,7,,,, +US-NJ-07105,US,NJ,07105,7,,,, +US-NJ-07106,US,NJ,07106,7,,,, +US-NJ-07107,US,NJ,07107,7,,,, +US-NJ-07108,US,NJ,07108,7,,,, +US-NJ-07109,US,NJ,07109,7,,,, +US-NJ-07110,US,NJ,07110,7,,,, +US-NJ-07111,US,NJ,07111,7,,,, +US-NJ-07112,US,NJ,07112,7,,,, +US-NJ-07114,US,NJ,07114,7,,,, +US-NJ-07175,US,NJ,07175,7,,,, +US-NJ-07184,US,NJ,07184,7,,,, +US-NJ-07188,US,NJ,07188,7,,,, +US-NJ-07189,US,NJ,07189,7,,,, +US-NJ-07191,US,NJ,07191,7,,,, +US-NJ-07192,US,NJ,07192,7,,,, +US-NJ-07193,US,NJ,07193,7,,,, +US-NJ-07195,US,NJ,07195,7,,,, +US-NJ-07198,US,NJ,07198,7,,,, +US-NJ-07199,US,NJ,07199,7,,,, +US-NJ-07201,US,NJ,07201,7,,,, +US-NJ-07202,US,NJ,07202,7,,,, +US-NJ-07203,US,NJ,07203,7,,,, +US-NJ-07204,US,NJ,07204,7,,,, +US-NJ-07205,US,NJ,07205,7,,,, +US-NJ-07206,US,NJ,07206,7,,,, +US-NJ-07207,US,NJ,07207,7,,,, +US-NJ-07208,US,NJ,07208,7,,,, +US-NJ-07302,US,NJ,07302,7,,,, +US-NJ-07303,US,NJ,07303,7,,,, +US-NJ-07304,US,NJ,07304,7,,,, +US-NJ-07305,US,NJ,07305,7,,,, +US-NJ-07306,US,NJ,07306,7,,,, +US-NJ-07307,US,NJ,07307,7,,,, +US-NJ-07308,US,NJ,07308,7,,,, +US-NJ-07310,US,NJ,07310,7,,,, +US-NJ-07311,US,NJ,07311,7,,,, +US-NJ-07395,US,NJ,07395,7,,,, +US-NJ-07399,US,NJ,07399,7,,,, +US-NJ-07401,US,NJ,07401,7,,,, +US-NJ-07403,US,NJ,07403,7,,,, +US-NJ-07405,US,NJ,07405,7,,,, +US-NJ-07407,US,NJ,07407,7,,,, +US-NJ-07410,US,NJ,07410,7,,,, +US-NJ-07416,US,NJ,07416,7,,,, +US-NJ-07417,US,NJ,07417,7,,,, +US-NJ-07418,US,NJ,07418,7,,,, +US-NJ-07419,US,NJ,07419,7,,,, +US-NJ-07420,US,NJ,07420,7,,,, +US-NJ-07421,US,NJ,07421,7,,,, +US-NJ-07422,US,NJ,07422,7,,,, +US-NJ-07423,US,NJ,07423,7,,,, +US-NJ-07424,US,NJ,07424,7,,,, +US-NJ-07428,US,NJ,07428,7,,,, +US-NJ-07430,US,NJ,07430,7,,,, +US-NJ-07432,US,NJ,07432,7,,,, +US-NJ-07435,US,NJ,07435,7,,,, +US-NJ-07436,US,NJ,07436,7,,,, +US-NJ-07438,US,NJ,07438,7,,,, +US-NJ-07439,US,NJ,07439,7,,,, +US-NJ-07440,US,NJ,07440,7,,,, +US-NJ-07442,US,NJ,07442,7,,,, +US-NJ-07444,US,NJ,07444,7,,,, +US-NJ-07446,US,NJ,07446,7,,,, +US-NJ-07450,US,NJ,07450,7,,,, +US-NJ-07451,US,NJ,07451,7,,,, +US-NJ-07452,US,NJ,07452,7,,,, +US-NJ-07456,US,NJ,07456,7,,,, +US-NJ-07457,US,NJ,07457,7,,,, +US-NJ-07458,US,NJ,07458,7,,,, +US-NJ-07460,US,NJ,07460,7,,,, +US-NJ-07461,US,NJ,07461,7,,,, +US-NJ-07462,US,NJ,07462,7,,,, +US-NJ-07463,US,NJ,07463,7,,,, +US-NJ-07465,US,NJ,07465,7,,,, +US-NJ-07470,US,NJ,07470,7,,,, +US-NJ-07474,US,NJ,07474,7,,,, +US-NJ-07480,US,NJ,07480,7,,,, +US-NJ-07481,US,NJ,07481,7,,,, +US-NJ-07495,US,NJ,07495,7,,,, +US-NJ-07501,US,NJ,07501,7,,,, +US-NJ-07502,US,NJ,07502,7,,,, +US-NJ-07503,US,NJ,07503,7,,,, +US-NJ-07504,US,NJ,07504,7,,,, +US-NJ-07505,US,NJ,07505,7,,,, +US-NJ-07506,US,NJ,07506,7,,,, +US-NJ-07507,US,NJ,07507,7,,,, +US-NJ-07508,US,NJ,07508,7,,,, +US-NJ-07509,US,NJ,07509,7,,,, +US-NJ-07510,US,NJ,07510,7,,,, +US-NJ-07511,US,NJ,07511,7,,,, +US-NJ-07512,US,NJ,07512,7,,,, +US-NJ-07513,US,NJ,07513,7,,,, +US-NJ-07514,US,NJ,07514,7,,,, +US-NJ-07522,US,NJ,07522,7,,,, +US-NJ-07524,US,NJ,07524,7,,,, +US-NJ-07533,US,NJ,07533,7,,,, +US-NJ-07538,US,NJ,07538,7,,,, +US-NJ-07543,US,NJ,07543,7,,,, +US-NJ-07544,US,NJ,07544,7,,,, +US-NJ-07601,US,NJ,07601,7,,,, +US-NJ-07602,US,NJ,07602,7,,,, +US-NJ-07603,US,NJ,07603,7,,,, +US-NJ-07604,US,NJ,07604,7,,,, +US-NJ-07605,US,NJ,07605,7,,,, +US-NJ-07606,US,NJ,07606,7,,,, +US-NJ-07607,US,NJ,07607,7,,,, +US-NJ-07608,US,NJ,07608,7,,,, +US-NJ-07620,US,NJ,07620,7,,,, +US-NJ-07621,US,NJ,07621,7,,,, +US-NJ-07624,US,NJ,07624,7,,,, +US-NJ-07626,US,NJ,07626,7,,,, +US-NJ-07627,US,NJ,07627,7,,,, +US-NJ-07628,US,NJ,07628,7,,,, +US-NJ-07630,US,NJ,07630,7,,,, +US-NJ-07631,US,NJ,07631,7,,,, +US-NJ-07632,US,NJ,07632,7,,,, +US-NJ-07640,US,NJ,07640,7,,,, +US-NJ-07641,US,NJ,07641,7,,,, +US-NJ-07642,US,NJ,07642,7,,,, +US-NJ-07643,US,NJ,07643,7,,,, +US-NJ-07644,US,NJ,07644,7,,,, +US-NJ-07645,US,NJ,07645,7,,,, +US-NJ-07646,US,NJ,07646,7,,,, +US-NJ-07647,US,NJ,07647,7,,,, +US-NJ-07648,US,NJ,07648,7,,,, +US-NJ-07649,US,NJ,07649,7,,,, +US-NJ-07650,US,NJ,07650,7,,,, +US-NJ-07652,US,NJ,07652,7,,,, +US-NJ-07653,US,NJ,07653,7,,,, +US-NJ-07656,US,NJ,07656,7,,,, +US-NJ-07657,US,NJ,07657,7,,,, +US-NJ-07660,US,NJ,07660,7,,,, +US-NJ-07661,US,NJ,07661,7,,,, +US-NJ-07662,US,NJ,07662,7,,,, +US-NJ-07663,US,NJ,07663,7,,,, +US-NJ-07666,US,NJ,07666,7,,,, +US-NJ-07670,US,NJ,07670,7,,,, +US-NJ-07675,US,NJ,07675,7,,,, +US-NJ-07676,US,NJ,07676,7,,,, +US-NJ-07677,US,NJ,07677,7,,,, +US-NJ-07699,US,NJ,07699,7,,,, +US-NJ-07701,US,NJ,07701,7,,,, +US-NJ-07702,US,NJ,07702,7,,,, +US-NJ-07703,US,NJ,07703,7,,,, +US-NJ-07704,US,NJ,07704,7,,,, +US-NJ-07709,US,NJ,07709,7,,,, +US-NJ-07710,US,NJ,07710,7,,,, +US-NJ-07711,US,NJ,07711,7,,,, +US-NJ-07712,US,NJ,07712,7,,,, +US-NJ-07715,US,NJ,07715,7,,,, +US-NJ-07716,US,NJ,07716,7,,,, +US-NJ-07717,US,NJ,07717,7,,,, +US-NJ-07718,US,NJ,07718,7,,,, +US-NJ-07719,US,NJ,07719,7,,,, +US-NJ-07720,US,NJ,07720,7,,,, +US-NJ-07721,US,NJ,07721,7,,,, +US-NJ-07722,US,NJ,07722,7,,,, +US-NJ-07723,US,NJ,07723,7,,,, +US-NJ-07724,US,NJ,07724,7,,,, +US-NJ-07726,US,NJ,07726,7,,,, +US-NJ-07727,US,NJ,07727,7,,,, +US-NJ-07728,US,NJ,07728,7,,,, +US-NJ-07730,US,NJ,07730,7,,,, +US-NJ-07731,US,NJ,07731,7,,,, +US-NJ-07732,US,NJ,07732,7,,,, +US-NJ-07733,US,NJ,07733,7,,,, +US-NJ-07734,US,NJ,07734,7,,,, +US-NJ-07735,US,NJ,07735,7,,,, +US-NJ-07737,US,NJ,07737,7,,,, +US-NJ-07738,US,NJ,07738,7,,,, +US-NJ-07739,US,NJ,07739,7,,,, +US-NJ-07740,US,NJ,07740,7,,,, +US-NJ-07746,US,NJ,07746,7,,,, +US-NJ-07747,US,NJ,07747,7,,,, +US-NJ-07748,US,NJ,07748,7,,,, +US-NJ-07750,US,NJ,07750,7,,,, +US-NJ-07751,US,NJ,07751,7,,,, +US-NJ-07752,US,NJ,07752,7,,,, +US-NJ-07753,US,NJ,07753,7,,,, +US-NJ-07754,US,NJ,07754,7,,,, +US-NJ-07755,US,NJ,07755,7,,,, +US-NJ-07756,US,NJ,07756,7,,,, +US-NJ-07757,US,NJ,07757,7,,,, +US-NJ-07758,US,NJ,07758,7,,,, +US-NJ-07760,US,NJ,07760,7,,,, +US-NJ-07762,US,NJ,07762,7,,,, +US-NJ-07763,US,NJ,07763,7,,,, +US-NJ-07764,US,NJ,07764,7,,,, +US-NJ-07765,US,NJ,07765,7,,,, +US-NJ-07799,US,NJ,07799,7,,,, +US-NJ-07801,US,NJ,07801,7,,,, +US-NJ-07802,US,NJ,07802,7,,,, +US-NJ-07803,US,NJ,07803,7,,,, +US-NJ-07806,US,NJ,07806,7,,,, +US-NJ-07820,US,NJ,07820,7,,,, +US-NJ-07821,US,NJ,07821,7,,,, +US-NJ-07822,US,NJ,07822,7,,,, +US-NJ-07823,US,NJ,07823,7,,,, +US-NJ-07825,US,NJ,07825,7,,,, +US-NJ-07826,US,NJ,07826,7,,,, +US-NJ-07827,US,NJ,07827,7,,,, +US-NJ-07828,US,NJ,07828,7,,,, +US-NJ-07829,US,NJ,07829,7,,,, +US-NJ-07830,US,NJ,07830,7,,,, +US-NJ-07831,US,NJ,07831,7,,,, +US-NJ-07832,US,NJ,07832,7,,,, +US-NJ-07833,US,NJ,07833,7,,,, +US-NJ-07834,US,NJ,07834,7,,,, +US-NJ-07836,US,NJ,07836,7,,,, +US-NJ-07837,US,NJ,07837,7,,,, +US-NJ-07838,US,NJ,07838,7,,,, +US-NJ-07839,US,NJ,07839,7,,,, +US-NJ-07840,US,NJ,07840,7,,,, +US-NJ-07842,US,NJ,07842,7,,,, +US-NJ-07843,US,NJ,07843,7,,,, +US-NJ-07844,US,NJ,07844,7,,,, +US-NJ-07845,US,NJ,07845,7,,,, +US-NJ-07846,US,NJ,07846,7,,,, +US-NJ-07847,US,NJ,07847,7,,,, +US-NJ-07848,US,NJ,07848,7,,,, +US-NJ-07849,US,NJ,07849,7,,,, +US-NJ-07850,US,NJ,07850,7,,,, +US-NJ-07851,US,NJ,07851,7,,,, +US-NJ-07852,US,NJ,07852,7,,,, +US-NJ-07853,US,NJ,07853,7,,,, +US-NJ-07855,US,NJ,07855,7,,,, +US-NJ-07856,US,NJ,07856,7,,,, +US-NJ-07857,US,NJ,07857,7,,,, +US-NJ-07860,US,NJ,07860,7,,,, +US-NJ-07863,US,NJ,07863,7,,,, +US-NJ-07865,US,NJ,07865,7,,,, +US-NJ-07866,US,NJ,07866,7,,,, +US-NJ-07869,US,NJ,07869,7,,,, +US-NJ-07870,US,NJ,07870,7,,,, +US-NJ-07871,US,NJ,07871,7,,,, +US-NJ-07874,US,NJ,07874,7,,,, +US-NJ-07875,US,NJ,07875,7,,,, +US-NJ-07876,US,NJ,07876,7,,,, +US-NJ-07877,US,NJ,07877,7,,,, +US-NJ-07878,US,NJ,07878,7,,,, +US-NJ-07879,US,NJ,07879,7,,,, +US-NJ-07880,US,NJ,07880,7,,,, +US-NJ-07881,US,NJ,07881,7,,,, +US-NJ-07882,US,NJ,07882,7,,,, +US-NJ-07885,US,NJ,07885,7,,,, +US-NJ-07890,US,NJ,07890,7,,,, +US-NJ-07901,US,NJ,07901,7,,,, +US-NJ-07902,US,NJ,07902,7,,,, +US-NJ-07920,US,NJ,07920,7,,,, +US-NJ-07921,US,NJ,07921,7,,,, +US-NJ-07922,US,NJ,07922,7,,,, +US-NJ-07924,US,NJ,07924,7,,,, +US-NJ-07926,US,NJ,07926,7,,,, +US-NJ-07927,US,NJ,07927,7,,,, +US-NJ-07928,US,NJ,07928,7,,,, +US-NJ-07930,US,NJ,07930,7,,,, +US-NJ-07931,US,NJ,07931,7,,,, +US-NJ-07932,US,NJ,07932,7,,,, +US-NJ-07933,US,NJ,07933,7,,,, +US-NJ-07934,US,NJ,07934,7,,,, +US-NJ-07935,US,NJ,07935,7,,,, +US-NJ-07936,US,NJ,07936,7,,,, +US-NJ-07938,US,NJ,07938,7,,,, +US-NJ-07939,US,NJ,07939,7,,,, +US-NJ-07940,US,NJ,07940,7,,,, +US-NJ-07945,US,NJ,07945,7,,,, +US-NJ-07946,US,NJ,07946,7,,,, +US-NJ-07950,US,NJ,07950,7,,,, +US-NJ-07960,US,NJ,07960,7,,,, +US-NJ-07961,US,NJ,07961,7,,,, +US-NJ-07962,US,NJ,07962,7,,,, +US-NJ-07963,US,NJ,07963,7,,,, +US-NJ-07970,US,NJ,07970,7,,,, +US-NJ-07974,US,NJ,07974,7,,,, +US-NJ-07976,US,NJ,07976,7,,,, +US-NJ-07977,US,NJ,07977,7,,,, +US-NJ-07978,US,NJ,07978,7,,,, +US-NJ-07979,US,NJ,07979,7,,,, +US-NJ-07980,US,NJ,07980,7,,,, +US-NJ-07981,US,NJ,07981,7,,,, +US-NJ-07999,US,NJ,07999,7,,,, +US-NJ-08001,US,NJ,08001,7,,,, +US-NJ-08002,US,NJ,08002,7,,,, +US-NJ-08003,US,NJ,08003,7,,,, +US-NJ-08004,US,NJ,08004,7,,,, +US-NJ-08005,US,NJ,08005,7,,,, +US-NJ-08006,US,NJ,08006,7,,,, +US-NJ-08007,US,NJ,08007,7,,,, +US-NJ-08008,US,NJ,08008,7,,,, +US-NJ-08009,US,NJ,08009,7,,,, +US-NJ-08010,US,NJ,08010,7,,,, +US-NJ-08011,US,NJ,08011,7,,,, +US-NJ-08012,US,NJ,08012,7,,,, +US-NJ-08014,US,NJ,08014,7,,,, +US-NJ-08015,US,NJ,08015,7,,,, +US-NJ-08016,US,NJ,08016,7,,,, +US-NJ-08018,US,NJ,08018,7,,,, +US-NJ-08019,US,NJ,08019,7,,,, +US-NJ-08020,US,NJ,08020,7,,,, +US-NJ-08021,US,NJ,08021,7,,,, +US-NJ-08022,US,NJ,08022,7,,,, +US-NJ-08023,US,NJ,08023,7,,,, +US-NJ-08025,US,NJ,08025,7,,,, +US-NJ-08026,US,NJ,08026,7,,,, +US-NJ-08027,US,NJ,08027,7,,,, +US-NJ-08028,US,NJ,08028,7,,,, +US-NJ-08029,US,NJ,08029,7,,,, +US-NJ-08030,US,NJ,08030,7,,,, +US-NJ-08031,US,NJ,08031,7,,,, +US-NJ-08032,US,NJ,08032,7,,,, +US-NJ-08033,US,NJ,08033,7,,,, +US-NJ-08034,US,NJ,08034,7,,,, +US-NJ-08035,US,NJ,08035,7,,,, +US-NJ-08036,US,NJ,08036,7,,,, +US-NJ-08037,US,NJ,08037,7,,,, +US-NJ-08038,US,NJ,08038,7,,,, +US-NJ-08039,US,NJ,08039,7,,,, +US-NJ-08041,US,NJ,08041,7,,,, +US-NJ-08042,US,NJ,08042,7,,,, +US-NJ-08043,US,NJ,08043,7,,,, +US-NJ-08045,US,NJ,08045,7,,,, +US-NJ-08046,US,NJ,08046,7,,,, +US-NJ-08048,US,NJ,08048,7,,,, +US-NJ-08049,US,NJ,08049,7,,,, +US-NJ-08050,US,NJ,08050,7,,,, +US-NJ-08051,US,NJ,08051,7,,,, +US-NJ-08052,US,NJ,08052,7,,,, +US-NJ-08053,US,NJ,08053,7,,,, +US-NJ-08054,US,NJ,08054,7,,,, +US-NJ-08055,US,NJ,08055,7,,,, +US-NJ-08056,US,NJ,08056,7,,,, +US-NJ-08057,US,NJ,08057,7,,,, +US-NJ-08059,US,NJ,08059,7,,,, +US-NJ-08060,US,NJ,08060,7,,,, +US-NJ-08061,US,NJ,08061,7,,,, +US-NJ-08062,US,NJ,08062,7,,,, +US-NJ-08063,US,NJ,08063,7,,,, +US-NJ-08064,US,NJ,08064,7,,,, +US-NJ-08065,US,NJ,08065,7,,,, +US-NJ-08066,US,NJ,08066,7,,,, +US-NJ-08067,US,NJ,08067,7,,,, +US-NJ-08068,US,NJ,08068,7,,,, +US-NJ-08069,US,NJ,08069,7,,,, +US-NJ-08070,US,NJ,08070,7,,,, +US-NJ-08071,US,NJ,08071,7,,,, +US-NJ-08072,US,NJ,08072,7,,,, +US-NJ-08073,US,NJ,08073,7,,,, +US-NJ-08074,US,NJ,08074,7,,,, +US-NJ-08075,US,NJ,08075,7,,,, +US-NJ-08076,US,NJ,08076,7,,,, +US-NJ-08077,US,NJ,08077,7,,,, +US-NJ-08078,US,NJ,08078,7,,,, +US-NJ-08079,US,NJ,08079,7,,,, +US-NJ-08080,US,NJ,08080,7,,,, +US-NJ-08081,US,NJ,08081,7,,,, +US-NJ-08083,US,NJ,08083,7,,,, +US-NJ-08084,US,NJ,08084,7,,,, +US-NJ-08085,US,NJ,08085,7,,,, +US-NJ-08086,US,NJ,08086,7,,,, +US-NJ-08087,US,NJ,08087,7,,,, +US-NJ-08088,US,NJ,08088,7,,,, +US-NJ-08089,US,NJ,08089,7,,,, +US-NJ-08090,US,NJ,08090,7,,,, +US-NJ-08091,US,NJ,08091,7,,,, +US-NJ-08092,US,NJ,08092,7,,,, +US-NJ-08093,US,NJ,08093,7,,,, +US-NJ-08094,US,NJ,08094,7,,,, +US-NJ-08095,US,NJ,08095,7,,,, +US-NJ-08096,US,NJ,08096,7,,,, +US-NJ-08097,US,NJ,08097,7,,,, +US-NJ-08098,US,NJ,08098,7,,,, +US-NJ-08099,US,NJ,08099,7,,,, +US-NJ-08101,US,NJ,08101,7,,,, +US-NJ-08102,US,NJ,08102,7,,,, +US-NJ-08103,US,NJ,08103,7,,,, +US-NJ-08104,US,NJ,08104,7,,,, +US-NJ-08105,US,NJ,08105,7,,,, +US-NJ-08106,US,NJ,08106,7,,,, +US-NJ-08107,US,NJ,08107,7,,,, +US-NJ-08108,US,NJ,08108,7,,,, +US-NJ-08109,US,NJ,08109,7,,,, +US-NJ-08110,US,NJ,08110,7,,,, +US-NJ-08201,US,NJ,08201,7,,,, +US-NJ-08202,US,NJ,08202,7,,,, +US-NJ-08203,US,NJ,08203,7,,,, +US-NJ-08204,US,NJ,08204,7,,,, +US-NJ-08205,US,NJ,08205,7,,,, +US-NJ-08210,US,NJ,08210,7,,,, +US-NJ-08212,US,NJ,08212,7,,,, +US-NJ-08213,US,NJ,08213,7,,,, +US-NJ-08214,US,NJ,08214,7,,,, +US-NJ-08215,US,NJ,08215,7,,,, +US-NJ-08217,US,NJ,08217,7,,,, +US-NJ-08218,US,NJ,08218,7,,,, +US-NJ-08219,US,NJ,08219,7,,,, +US-NJ-08220,US,NJ,08220,7,,,, +US-NJ-08221,US,NJ,08221,7,,,, +US-NJ-08223,US,NJ,08223,7,,,, +US-NJ-08224,US,NJ,08224,7,,,, +US-NJ-08225,US,NJ,08225,7,,,, +US-NJ-08226,US,NJ,08226,7,,,, +US-NJ-08230,US,NJ,08230,7,,,, +US-NJ-08231,US,NJ,08231,7,,,, +US-NJ-08232,US,NJ,08232,7,,,, +US-NJ-08234,US,NJ,08234,7,,,, +US-NJ-08240,US,NJ,08240,7,,,, +US-NJ-08241,US,NJ,08241,7,,,, +US-NJ-08242,US,NJ,08242,7,,,, +US-NJ-08243,US,NJ,08243,7,,,, +US-NJ-08244,US,NJ,08244,7,,,, +US-NJ-08245,US,NJ,08245,7,,,, +US-NJ-08246,US,NJ,08246,7,,,, +US-NJ-08247,US,NJ,08247,7,,,, +US-NJ-08248,US,NJ,08248,7,,,, +US-NJ-08250,US,NJ,08250,7,,,, +US-NJ-08251,US,NJ,08251,7,,,, +US-NJ-08252,US,NJ,08252,7,,,, +US-NJ-08260,US,NJ,08260,7,,,, +US-NJ-08270,US,NJ,08270,7,,,, +US-NJ-08302,US,NJ,08302,7,,,, +US-NJ-08310,US,NJ,08310,7,,,, +US-NJ-08311,US,NJ,08311,7,,,, +US-NJ-08312,US,NJ,08312,7,,,, +US-NJ-08313,US,NJ,08313,7,,,, +US-NJ-08314,US,NJ,08314,7,,,, +US-NJ-08315,US,NJ,08315,7,,,, +US-NJ-08316,US,NJ,08316,7,,,, +US-NJ-08317,US,NJ,08317,7,,,, +US-NJ-08318,US,NJ,08318,7,,,, +US-NJ-08319,US,NJ,08319,7,,,, +US-NJ-08320,US,NJ,08320,7,,,, +US-NJ-08321,US,NJ,08321,7,,,, +US-NJ-08322,US,NJ,08322,7,,,, +US-NJ-08323,US,NJ,08323,7,,,, +US-NJ-08324,US,NJ,08324,7,,,, +US-NJ-08326,US,NJ,08326,7,,,, +US-NJ-08327,US,NJ,08327,7,,,, +US-NJ-08328,US,NJ,08328,7,,,, +US-NJ-08329,US,NJ,08329,7,,,, +US-NJ-08330,US,NJ,08330,7,,,, +US-NJ-08332,US,NJ,08332,7,,,, +US-NJ-08340,US,NJ,08340,7,,,, +US-NJ-08341,US,NJ,08341,7,,,, +US-NJ-08342,US,NJ,08342,7,,,, +US-NJ-08343,US,NJ,08343,7,,,, +US-NJ-08344,US,NJ,08344,7,,,, +US-NJ-08345,US,NJ,08345,7,,,, +US-NJ-08346,US,NJ,08346,7,,,, +US-NJ-08347,US,NJ,08347,7,,,, +US-NJ-08348,US,NJ,08348,7,,,, +US-NJ-08349,US,NJ,08349,7,,,, +US-NJ-08350,US,NJ,08350,7,,,, +US-NJ-08352,US,NJ,08352,7,,,, +US-NJ-08353,US,NJ,08353,7,,,, +US-NJ-08360,US,NJ,08360,7,,,, +US-NJ-08361,US,NJ,08361,7,,,, +US-NJ-08362,US,NJ,08362,7,,,, +US-NJ-08401,US,NJ,08401,7,,,, +US-NJ-08402,US,NJ,08402,7,,,, +US-NJ-08403,US,NJ,08403,7,,,, +US-NJ-08404,US,NJ,08404,7,,,, +US-NJ-08405,US,NJ,08405,7,,,, +US-NJ-08406,US,NJ,08406,7,,,, +US-NJ-08501,US,NJ,08501,7,,,, +US-NJ-08502,US,NJ,08502,7,,,, +US-NJ-08504,US,NJ,08504,7,,,, +US-NJ-08505,US,NJ,08505,7,,,, +US-NJ-08510,US,NJ,08510,7,,,, +US-NJ-08511,US,NJ,08511,7,,,, +US-NJ-08512,US,NJ,08512,7,,,, +US-NJ-08514,US,NJ,08514,7,,,, +US-NJ-08515,US,NJ,08515,7,,,, +US-NJ-08518,US,NJ,08518,7,,,, +US-NJ-08520,US,NJ,08520,7,,,, +US-NJ-08525,US,NJ,08525,7,,,, +US-NJ-08526,US,NJ,08526,7,,,, +US-NJ-08527,US,NJ,08527,7,,,, +US-NJ-08528,US,NJ,08528,7,,,, +US-NJ-08530,US,NJ,08530,7,,,, +US-NJ-08533,US,NJ,08533,7,,,, +US-NJ-08534,US,NJ,08534,7,,,, +US-NJ-08535,US,NJ,08535,7,,,, +US-NJ-08536,US,NJ,08536,7,,,, +US-NJ-08540,US,NJ,08540,7,,,, +US-NJ-08541,US,NJ,08541,7,,,, +US-NJ-08542,US,NJ,08542,7,,,, +US-NJ-08543,US,NJ,08543,7,,,, +US-NJ-08544,US,NJ,08544,7,,,, +US-NJ-08550,US,NJ,08550,7,,,, +US-NJ-08551,US,NJ,08551,7,,,, +US-NJ-08553,US,NJ,08553,7,,,, +US-NJ-08554,US,NJ,08554,7,,,, +US-NJ-08555,US,NJ,08555,7,,,, +US-NJ-08556,US,NJ,08556,7,,,, +US-NJ-08557,US,NJ,08557,7,,,, +US-NJ-08558,US,NJ,08558,7,,,, +US-NJ-08559,US,NJ,08559,7,,,, +US-NJ-08560,US,NJ,08560,7,,,, +US-NJ-08561,US,NJ,08561,7,,,, +US-NJ-08562,US,NJ,08562,7,,,, +US-NJ-08601,US,NJ,08601,7,,,, +US-NJ-08602,US,NJ,08602,7,,,, +US-NJ-08603,US,NJ,08603,7,,,, +US-NJ-08604,US,NJ,08604,7,,,, +US-NJ-08605,US,NJ,08605,7,,,, +US-NJ-08606,US,NJ,08606,7,,,, +US-NJ-08607,US,NJ,08607,7,,,, +US-NJ-08608,US,NJ,08608,7,,,, +US-NJ-08609,US,NJ,08609,7,,,, +US-NJ-08610,US,NJ,08610,7,,,, +US-NJ-08611,US,NJ,08611,7,,,, +US-NJ-08618,US,NJ,08618,7,,,, +US-NJ-08619,US,NJ,08619,7,,,, +US-NJ-08620,US,NJ,08620,7,,,, +US-NJ-08625,US,NJ,08625,7,,,, +US-NJ-08628,US,NJ,08628,7,,,, +US-NJ-08629,US,NJ,08629,7,,,, +US-NJ-08638,US,NJ,08638,7,,,, +US-NJ-08640,US,NJ,08640,7,,,, +US-NJ-08641,US,NJ,08641,7,,,, +US-NJ-08645,US,NJ,08645,7,,,, +US-NJ-08646,US,NJ,08646,7,,,, +US-NJ-08647,US,NJ,08647,7,,,, +US-NJ-08648,US,NJ,08648,7,,,, +US-NJ-08650,US,NJ,08650,7,,,, +US-NJ-08666,US,NJ,08666,7,,,, +US-NJ-08690,US,NJ,08690,7,,,, +US-NJ-08691,US,NJ,08691,7,,,, +US-NJ-08695,US,NJ,08695,7,,,, +US-NJ-08701,US,NJ,08701,7,,,, +US-NJ-08720,US,NJ,08720,7,,,, +US-NJ-08721,US,NJ,08721,7,,,, +US-NJ-08722,US,NJ,08722,7,,,, +US-NJ-08723,US,NJ,08723,7,,,, +US-NJ-08724,US,NJ,08724,7,,,, +US-NJ-08730,US,NJ,08730,7,,,, +US-NJ-08731,US,NJ,08731,7,,,, +US-NJ-08732,US,NJ,08732,7,,,, +US-NJ-08733,US,NJ,08733,7,,,, +US-NJ-08734,US,NJ,08734,7,,,, +US-NJ-08735,US,NJ,08735,7,,,, +US-NJ-08736,US,NJ,08736,7,,,, +US-NJ-08738,US,NJ,08738,7,,,, +US-NJ-08739,US,NJ,08739,7,,,, +US-NJ-08740,US,NJ,08740,7,,,, +US-NJ-08741,US,NJ,08741,7,,,, +US-NJ-08742,US,NJ,08742,7,,,, +US-NJ-08750,US,NJ,08750,7,,,, +US-NJ-08751,US,NJ,08751,7,,,, +US-NJ-08752,US,NJ,08752,7,,,, +US-NJ-08753,US,NJ,08753,7,,,, +US-NJ-08754,US,NJ,08754,7,,,, +US-NJ-08755,US,NJ,08755,7,,,, +US-NJ-08756,US,NJ,08756,7,,,, +US-NJ-08757,US,NJ,08757,7,,,, +US-NJ-08758,US,NJ,08758,7,,,, +US-NJ-08759,US,NJ,08759,7,,,, +US-NJ-08801,US,NJ,08801,7,,,, +US-NJ-08802,US,NJ,08802,7,,,, +US-NJ-08803,US,NJ,08803,7,,,, +US-NJ-08804,US,NJ,08804,7,,,, +US-NJ-08805,US,NJ,08805,7,,,, +US-NJ-08807,US,NJ,08807,7,,,, +US-NJ-08808,US,NJ,08808,7,,,, +US-NJ-08809,US,NJ,08809,7,,,, +US-NJ-08810,US,NJ,08810,7,,,, +US-NJ-08812,US,NJ,08812,7,,,, +US-NJ-08816,US,NJ,08816,7,,,, +US-NJ-08817,US,NJ,08817,7,,,, +US-NJ-08818,US,NJ,08818,7,,,, +US-NJ-08820,US,NJ,08820,7,,,, +US-NJ-08821,US,NJ,08821,7,,,, +US-NJ-08822,US,NJ,08822,7,,,, +US-NJ-08823,US,NJ,08823,7,,,, +US-NJ-08824,US,NJ,08824,7,,,, +US-NJ-08825,US,NJ,08825,7,,,, +US-NJ-08826,US,NJ,08826,7,,,, +US-NJ-08827,US,NJ,08827,7,,,, +US-NJ-08828,US,NJ,08828,7,,,, +US-NJ-08829,US,NJ,08829,7,,,, +US-NJ-08830,US,NJ,08830,7,,,, +US-NJ-08831,US,NJ,08831,7,,,, +US-NJ-08832,US,NJ,08832,7,,,, +US-NJ-08833,US,NJ,08833,7,,,, +US-NJ-08834,US,NJ,08834,7,,,, +US-NJ-08835,US,NJ,08835,7,,,, +US-NJ-08836,US,NJ,08836,7,,,, +US-NJ-08837,US,NJ,08837,7,,,, +US-NJ-08840,US,NJ,08840,7,,,, +US-NJ-08844,US,NJ,08844,7,,,, +US-NJ-08846,US,NJ,08846,7,,,, +US-NJ-08848,US,NJ,08848,7,,,, +US-NJ-08850,US,NJ,08850,7,,,, +US-NJ-08852,US,NJ,08852,7,,,, +US-NJ-08853,US,NJ,08853,7,,,, +US-NJ-08854,US,NJ,08854,7,,,, +US-NJ-08855,US,NJ,08855,7,,,, +US-NJ-08857,US,NJ,08857,7,,,, +US-NJ-08858,US,NJ,08858,7,,,, +US-NJ-08859,US,NJ,08859,7,,,, +US-NJ-08861,US,NJ,08861,7,,,, +US-NJ-08862,US,NJ,08862,7,,,, +US-NJ-08863,US,NJ,08863,7,,,, +US-NJ-08865,US,NJ,08865,7,,,, +US-NJ-08867,US,NJ,08867,7,,,, +US-NJ-08868,US,NJ,08868,7,,,, +US-NJ-08869,US,NJ,08869,7,,,, +US-NJ-08870,US,NJ,08870,7,,,, +US-NJ-08871,US,NJ,08871,7,,,, +US-NJ-08872,US,NJ,08872,7,,,, +US-NJ-08873,US,NJ,08873,7,,,, +US-NJ-08875,US,NJ,08875,7,,,, +US-NJ-08876,US,NJ,08876,7,,,, +US-NJ-08879,US,NJ,08879,7,,,, +US-NJ-08880,US,NJ,08880,7,,,, +US-NJ-08882,US,NJ,08882,7,,,, +US-NJ-08884,US,NJ,08884,7,,,, +US-NJ-08885,US,NJ,08885,7,,,, +US-NJ-08886,US,NJ,08886,7,,,, +US-NJ-08887,US,NJ,08887,7,,,, +US-NJ-08888,US,NJ,08888,7,,,, +US-NJ-08889,US,NJ,08889,7,,,, +US-NJ-08890,US,NJ,08890,7,,,, +US-NJ-08899,US,NJ,08899,7,,,, +US-NJ-08901,US,NJ,08901,7,,,, +US-NJ-08902,US,NJ,08902,7,,,, +US-NJ-08903,US,NJ,08903,7,,,, +US-NJ-08904,US,NJ,08904,7,,,, +US-NJ-08906,US,NJ,08906,7,,,, +US-NJ-08933,US,NJ,08933,7,,,, +US-NJ-08989,US,NJ,08989,7,,,, +US-NM-87001,US,NM,87001,6.25,,,, +US-NM-87002,US,NM,87002,6.375,,,, +US-NM-87004,US,NM,87004,7.0625,,,, +US-NM-87005,US,NM,87005,6.6875,,,, +US-NM-87006,US,NM,87006,6,,,, +US-NM-87007,US,NM,87007,6.6875,,,, +US-NM-87008,US,NM,87008,6.0625,,,, +US-NM-87009,US,NM,87009,7.5625,,,, +US-NM-87010,US,NM,87010,6.875,,,, +US-NM-87011,US,NM,87011,6,,,, +US-NM-87012,US,NM,87012,6.5,,,, +US-NM-87013,US,NM,87013,7.8125,,,, +US-NM-87014,US,NM,87014,6.6875,,,, +US-NM-87015,US,NM,87015,6.875,,,, +US-NM-87016,US,NM,87016,6.5,,,, +US-NM-87017,US,NM,87017,6.5,,,, +US-NM-87018,US,NM,87018,6.3125,,,, +US-NM-87020,US,NM,87020,8,,,, +US-NM-87021,US,NM,87021,8,,,, +US-NM-87022,US,NM,87022,6.0625,,,, +US-NM-87023,US,NM,87023,6.375,,,, +US-NM-87024,US,NM,87024,6.25,,,, +US-NM-87025,US,NM,87025,6.25,,,, +US-NM-87026,US,NM,87026,6.375,,,, +US-NM-87027,US,NM,87027,6.25,,,, +US-NM-87028,US,NM,87028,6,,,, +US-NM-87029,US,NM,87029,6.5,,,, +US-NM-87031,US,NM,87031,6.375,,,, +US-NM-87032,US,NM,87032,6.5,,,, +US-NM-87034,US,NM,87034,6.6875,,,, +US-NM-87035,US,NM,87035,6.5,,,, +US-NM-87036,US,NM,87036,7.6875,,,, +US-NM-87037,US,NM,87037,6.3125,,,, +US-NM-87038,US,NM,87038,6.6875,,,, +US-NM-87040,US,NM,87040,6.6875,,,, +US-NM-87041,US,NM,87041,6.25,,,, +US-NM-87042,US,NM,87042,7.4375,,,, +US-NM-87043,US,NM,87043,6.25,,,, +US-NM-87044,US,NM,87044,6.25,,,, +US-NM-87045,US,NM,87045,6.75,,,, +US-NM-87046,US,NM,87046,6.25,,,, +US-NM-87047,US,NM,87047,6.0625,,,, +US-NM-87048,US,NM,87048,7.1875,,,, +US-NM-87049,US,NM,87049,6.6875,,,, +US-NM-87051,US,NM,87051,6.6875,,,, +US-NM-87052,US,NM,87052,6.25,,,, +US-NM-87053,US,NM,87053,6.25,,,, +US-NM-87056,US,NM,87056,6.875,,,, +US-NM-87059,US,NM,87059,6.0625,,,, +US-NM-87060,US,NM,87060,6.375,,,, +US-NM-87061,US,NM,87061,6.5,,,, +US-NM-87062,US,NM,87062,6,,,, +US-NM-87063,US,NM,87063,7.5625,,,, +US-NM-87064,US,NM,87064,6.5,,,, +US-NM-87068,US,NM,87068,7.6875,,,, +US-NM-87070,US,NM,87070,7.4375,,,, +US-NM-87072,US,NM,87072,6.25,,,, +US-NM-87083,US,NM,87083,6.25,,,, +US-NM-87101,US,NM,87101,7,,,, +US-NM-87102,US,NM,87102,7,,,, +US-NM-87103,US,NM,87103,7,,,, +US-NM-87104,US,NM,87104,7,,,, +US-NM-87105,US,NM,87105,6.0625,,,, +US-NM-87106,US,NM,87106,7,,,, +US-NM-87107,US,NM,87107,7,,,, +US-NM-87108,US,NM,87108,7,,,, +US-NM-87109,US,NM,87109,7,,,, +US-NM-87110,US,NM,87110,7,,,, +US-NM-87111,US,NM,87111,7,,,, +US-NM-87112,US,NM,87112,7,,,, +US-NM-87113,US,NM,87113,7,,,, +US-NM-87114,US,NM,87114,7,,,, +US-NM-87115,US,NM,87115,6.0625,,,, +US-NM-87116,US,NM,87116,6.0625,,,, +US-NM-87117,US,NM,87117,6.0625,,,, +US-NM-87119,US,NM,87119,7,,,, +US-NM-87120,US,NM,87120,7,,,, +US-NM-87121,US,NM,87121,7,,,, +US-NM-87122,US,NM,87122,6.0625,,,, +US-NM-87123,US,NM,87123,7,,,, +US-NM-87124,US,NM,87124,7.4375,,,, +US-NM-87125,US,NM,87125,7,,,, +US-NM-87131,US,NM,87131,7,,,, +US-NM-87144,US,NM,87144,7.4375,,,, +US-NM-87151,US,NM,87151,7,,,, +US-NM-87153,US,NM,87153,7,,,, +US-NM-87154,US,NM,87154,7,,,, +US-NM-87158,US,NM,87158,7,,,, +US-NM-87174,US,NM,87174,7.4375,,,, +US-NM-87176,US,NM,87176,7,,,, +US-NM-87181,US,NM,87181,7,,,, +US-NM-87184,US,NM,87184,6.0625,,,, +US-NM-87185,US,NM,87185,6.0625,,,, +US-NM-87187,US,NM,87187,7,,,, +US-NM-87190,US,NM,87190,7,,,, +US-NM-87191,US,NM,87191,7,,,, +US-NM-87192,US,NM,87192,7,,,, +US-NM-87193,US,NM,87193,7,,,, +US-NM-87194,US,NM,87194,7,,,, +US-NM-87195,US,NM,87195,6.0625,,,, +US-NM-87196,US,NM,87196,7,,,, +US-NM-87197,US,NM,87197,7,,,, +US-NM-87198,US,NM,87198,7,,,, +US-NM-87199,US,NM,87199,7,,,, +US-NM-87301,US,NM,87301,8.3125,,,, +US-NM-87302,US,NM,87302,8.3125,,,, +US-NM-87305,US,NM,87305,8.3125,,,, +US-NM-87310,US,NM,87310,6.75,,,, +US-NM-87311,US,NM,87311,6.75,,,, +US-NM-87312,US,NM,87312,6.75,,,, +US-NM-87313,US,NM,87313,6.75,,,, +US-NM-87315,US,NM,87315,6.6875,,,, +US-NM-87316,US,NM,87316,6.75,,,, +US-NM-87317,US,NM,87317,8.3125,,,, +US-NM-87319,US,NM,87319,8.3125,,,, +US-NM-87320,US,NM,87320,6.75,,,, +US-NM-87321,US,NM,87321,6.75,,,, +US-NM-87322,US,NM,87322,6.75,,,, +US-NM-87323,US,NM,87323,6.75,,,, +US-NM-87325,US,NM,87325,6.75,,,, +US-NM-87326,US,NM,87326,8.3125,,,, +US-NM-87327,US,NM,87327,6.75,,,, +US-NM-87347,US,NM,87347,6.75,,,, +US-NM-87357,US,NM,87357,6.75,,,, +US-NM-87365,US,NM,87365,6.75,,,, +US-NM-87375,US,NM,87375,8.3125,,,, +US-NM-87401,US,NM,87401,7.125,,,, +US-NM-87402,US,NM,87402,7.125,,,, +US-NM-87410,US,NM,87410,7.75,,,, +US-NM-87412,US,NM,87412,6.3125,,,, +US-NM-87413,US,NM,87413,7.6875,,,, +US-NM-87415,US,NM,87415,6.3125,,,, +US-NM-87416,US,NM,87416,6.3125,,,, +US-NM-87417,US,NM,87417,6.3125,,,, +US-NM-87418,US,NM,87418,6.3125,,,, +US-NM-87419,US,NM,87419,6.3125,,,, +US-NM-87420,US,NM,87420,6.3125,,,, +US-NM-87421,US,NM,87421,6.3125,,,, +US-NM-87455,US,NM,87455,6.3125,,,, +US-NM-87461,US,NM,87461,6.3125,,,, +US-NM-87499,US,NM,87499,7.125,,,, +US-NM-87501,US,NM,87501,8.1875,,,, +US-NM-87502,US,NM,87502,8.1875,,,, +US-NM-87503,US,NM,87503,8.1875,,,, +US-NM-87504,US,NM,87504,8.1875,,,, +US-NM-87505,US,NM,87505,8.1875,,,, +US-NM-87506,US,NM,87506,6.875,,,, +US-NM-87507,US,NM,87507,8.1875,,,, +US-NM-87508,US,NM,87508,6.875,,,, +US-NM-87509,US,NM,87509,8.1875,,,, +US-NM-87510,US,NM,87510,6.5,,,, +US-NM-87511,US,NM,87511,6.5,,,, +US-NM-87512,US,NM,87512,7.125,,,, +US-NM-87513,US,NM,87513,7.125,,,, +US-NM-87514,US,NM,87514,7.125,,,, +US-NM-87515,US,NM,87515,6.5,,,, +US-NM-87516,US,NM,87516,6.5,,,, +US-NM-87517,US,NM,87517,7.125,,,, +US-NM-87518,US,NM,87518,6.5,,,, +US-NM-87519,US,NM,87519,7.125,,,, +US-NM-87520,US,NM,87520,8.1875,,,, +US-NM-87521,US,NM,87521,7.125,,,, +US-NM-87522,US,NM,87522,6.5,,,, +US-NM-87523,US,NM,87523,6.5,,,, +US-NM-87524,US,NM,87524,7.125,,,, +US-NM-87525,US,NM,87525,8.1875,,,, +US-NM-87527,US,NM,87527,6.5,,,, +US-NM-87528,US,NM,87528,6.5,,,, +US-NM-87529,US,NM,87529,7.125,,,, +US-NM-87530,US,NM,87530,6.5,,,, +US-NM-87531,US,NM,87531,6.5,,,, +US-NM-87532,US,NM,87532,8.1875,,,, +US-NM-87533,US,NM,87533,8.1875,,,, +US-NM-87535,US,NM,87535,6.875,,,, +US-NM-87537,US,NM,87537,6.5,,,, +US-NM-87538,US,NM,87538,6.5,,,, +US-NM-87539,US,NM,87539,6.5,,,, +US-NM-87540,US,NM,87540,6.875,,,, +US-NM-87543,US,NM,87543,7.125,,,, +US-NM-87544,US,NM,87544,7.3125,,,, +US-NM-87545,US,NM,87545,7.3125,,,, +US-NM-87548,US,NM,87548,6.5,,,, +US-NM-87549,US,NM,87549,6.5,,,, +US-NM-87551,US,NM,87551,6.5,,,, +US-NM-87552,US,NM,87552,6.5,,,, +US-NM-87553,US,NM,87553,7.125,,,, +US-NM-87554,US,NM,87554,6.5,,,, +US-NM-87556,US,NM,87556,8.1875,,,, +US-NM-87557,US,NM,87557,8.4375,,,, +US-NM-87558,US,NM,87558,8.4375,,,, +US-NM-87560,US,NM,87560,6.5,,,, +US-NM-87562,US,NM,87562,6.5,,,, +US-NM-87564,US,NM,87564,7.125,,,, +US-NM-87565,US,NM,87565,6.5,,,, +US-NM-87566,US,NM,87566,6.5,,,, +US-NM-87567,US,NM,87567,8.1875,,,, +US-NM-87569,US,NM,87569,6.5,,,, +US-NM-87571,US,NM,87571,8.1875,,,, +US-NM-87573,US,NM,87573,6.5,,,, +US-NM-87574,US,NM,87574,6.875,,,, +US-NM-87575,US,NM,87575,6.5,,,, +US-NM-87576,US,NM,87576,7.125,,,, +US-NM-87577,US,NM,87577,7.125,,,, +US-NM-87578,US,NM,87578,6.5,,,, +US-NM-87579,US,NM,87579,7.125,,,, +US-NM-87580,US,NM,87580,7.125,,,, +US-NM-87581,US,NM,87581,6.5,,,, +US-NM-87582,US,NM,87582,6.5,,,, +US-NM-87583,US,NM,87583,6.5,,,, +US-NM-87592,US,NM,87592,8.1875,,,, +US-NM-87594,US,NM,87594,8.1875,,,, +US-NM-87701,US,NM,87701,8.0625,,,, +US-NM-87710,US,NM,87710,7.4375,,,, +US-NM-87711,US,NM,87711,6.4375,,,, +US-NM-87712,US,NM,87712,6.1875,,,, +US-NM-87713,US,NM,87713,6.1875,,,, +US-NM-87714,US,NM,87714,6.8125,,,, +US-NM-87715,US,NM,87715,6.1875,,,, +US-NM-87718,US,NM,87718,7.1875,,,, +US-NM-87722,US,NM,87722,6.1875,,,, +US-NM-87723,US,NM,87723,6.1875,,,, +US-NM-87724,US,NM,87724,6.4375,,,, +US-NM-87728,US,NM,87728,5.75,,,, +US-NM-87729,US,NM,87729,5.75,,,, +US-NM-87730,US,NM,87730,5.75,,,, +US-NM-87731,US,NM,87731,6.5,,,, +US-NM-87732,US,NM,87732,6.1875,,,, +US-NM-87733,US,NM,87733,5.75,,,, +US-NM-87734,US,NM,87734,6.1875,,,, +US-NM-87735,US,NM,87735,6.1875,,,, +US-NM-87736,US,NM,87736,6.1875,,,, +US-NM-87740,US,NM,87740,7.9375,,,, +US-NM-87742,US,NM,87742,6.5,,,, +US-NM-87743,US,NM,87743,5.75,,,, +US-NM-87745,US,NM,87745,6.5,,,, +US-NM-87746,US,NM,87746,5.75,,,, +US-NM-87747,US,NM,87747,6.8125,,,, +US-NM-87749,US,NM,87749,5.75,,,, +US-NM-87752,US,NM,87752,7.1875,,,, +US-NM-87753,US,NM,87753,6.1875,,,, +US-NM-87801,US,NM,87801,7.0625,,,, +US-NM-87820,US,NM,87820,5.625,,,, +US-NM-87821,US,NM,87821,5.625,,,, +US-NM-87823,US,NM,87823,6,,,, +US-NM-87824,US,NM,87824,5.625,,,, +US-NM-87825,US,NM,87825,6.9375,,,, +US-NM-87827,US,NM,87827,5.625,,,, +US-NM-87828,US,NM,87828,6,,,, +US-NM-87829,US,NM,87829,5.625,,,, +US-NM-87830,US,NM,87830,5.625,,,, +US-NM-87831,US,NM,87831,6,,,, +US-NM-87832,US,NM,87832,6,,,, +US-NM-87901,US,NM,87901,7.875,,,, +US-NM-87930,US,NM,87930,6.3125,,,, +US-NM-87931,US,NM,87931,6.3125,,,, +US-NM-87933,US,NM,87933,6.3125,,,, +US-NM-87935,US,NM,87935,7.5625,,,, +US-NM-87936,US,NM,87936,6.375,,,, +US-NM-87937,US,NM,87937,7.4375,,,, +US-NM-87939,US,NM,87939,6.3125,,,, +US-NM-87940,US,NM,87940,6.375,,,, +US-NM-87941,US,NM,87941,6.375,,,, +US-NM-87942,US,NM,87942,7.5625,,,, +US-NM-87943,US,NM,87943,6.3125,,,, +US-NM-88001,US,NM,88001,7.5625,,,, +US-NM-88002,US,NM,88002,6.375,,,, +US-NM-88003,US,NM,88003,6.375,,,, +US-NM-88004,US,NM,88004,7.5625,,,, +US-NM-88005,US,NM,88005,7.5625,,,, +US-NM-88006,US,NM,88006,7.5625,,,, +US-NM-88007,US,NM,88007,6.375,,,, +US-NM-88008,US,NM,88008,6.375,,,, +US-NM-88009,US,NM,88009,7.25,,,, +US-NM-88011,US,NM,88011,7.5625,,,, +US-NM-88012,US,NM,88012,7.5625,,,, +US-NM-88013,US,NM,88013,7.5625,,,, +US-NM-88020,US,NM,88020,5.9375,,,, +US-NM-88021,US,NM,88021,6.375,,,, +US-NM-88022,US,NM,88022,6.1875,,,, +US-NM-88023,US,NM,88023,7.25,,,, +US-NM-88024,US,NM,88024,7.5625,,,, +US-NM-88025,US,NM,88025,6.1875,,,, +US-NM-88026,US,NM,88026,7.25,,,, +US-NM-88027,US,NM,88027,6.375,,,, +US-NM-88028,US,NM,88028,6.1875,,,, +US-NM-88029,US,NM,88029,7.5625,,,, +US-NM-88030,US,NM,88030,6.5,,,, +US-NM-88031,US,NM,88031,7.5,,,, +US-NM-88032,US,NM,88032,6.375,,,, +US-NM-88033,US,NM,88033,6.375,,,, +US-NM-88034,US,NM,88034,6.1875,,,, +US-NM-88036,US,NM,88036,7.375,,,, +US-NM-88038,US,NM,88038,6.1875,,,, +US-NM-88039,US,NM,88039,5.625,,,, +US-NM-88040,US,NM,88040,6.1875,,,, +US-NM-88041,US,NM,88041,6.1875,,,, +US-NM-88042,US,NM,88042,6.3125,,,, +US-NM-88043,US,NM,88043,7.25,,,, +US-NM-88044,US,NM,88044,6.375,,,, +US-NM-88045,US,NM,88045,7.25,,,, +US-NM-88046,US,NM,88046,7.8125,,,, +US-NM-88047,US,NM,88047,6.375,,,, +US-NM-88048,US,NM,88048,6.375,,,, +US-NM-88049,US,NM,88049,6.1875,,,, +US-NM-88051,US,NM,88051,6.1875,,,, +US-NM-88052,US,NM,88052,6.375,,,, +US-NM-88053,US,NM,88053,7.375,,,, +US-NM-88054,US,NM,88054,6.375,,,, +US-NM-88055,US,NM,88055,7.25,,,, +US-NM-88056,US,NM,88056,5.9375,,,, +US-NM-88058,US,NM,88058,6.375,,,, +US-NM-88061,US,NM,88061,7.375,,,, +US-NM-88062,US,NM,88062,7.375,,,, +US-NM-88063,US,NM,88063,7.6875,,,, +US-NM-88065,US,NM,88065,6.1875,,,, +US-NM-88072,US,NM,88072,6.375,,,, +US-NM-88081,US,NM,88081,6.375,,,, +US-NM-88101,US,NM,88101,7.8125,,,, +US-NM-88102,US,NM,88102,7.8125,,,, +US-NM-88103,US,NM,88103,5.875,,,, +US-NM-88112,US,NM,88112,5.875,,,, +US-NM-88113,US,NM,88113,6.6875,,,, +US-NM-88114,US,NM,88114,5.5,,,, +US-NM-88115,US,NM,88115,6.9375,,,, +US-NM-88116,US,NM,88116,6.1875,,,, +US-NM-88118,US,NM,88118,6.1875,,,, +US-NM-88119,US,NM,88119,6.3125,,,, +US-NM-88120,US,NM,88120,5.875,,,, +US-NM-88121,US,NM,88121,6.4375,,,, +US-NM-88122,US,NM,88122,7.5625,,,, +US-NM-88123,US,NM,88123,6.1875,,,, +US-NM-88124,US,NM,88124,7.5,,,, +US-NM-88125,US,NM,88125,6.1875,,,, +US-NM-88126,US,NM,88126,6.1875,,,, +US-NM-88130,US,NM,88130,7.75,,,, +US-NM-88132,US,NM,88132,6.1875,,,, +US-NM-88133,US,NM,88133,5.875,,,, +US-NM-88134,US,NM,88134,6.3125,,,, +US-NM-88135,US,NM,88135,5.875,,,, +US-NM-88136,US,NM,88136,6.3125,,,, +US-NM-88201,US,NM,88201,7.125,,,, +US-NM-88202,US,NM,88202,7.125,,,, +US-NM-88203,US,NM,88203,7.125,,,, +US-NM-88210,US,NM,88210,7.4375,,,, +US-NM-88211,US,NM,88211,7.4375,,,, +US-NM-88213,US,NM,88213,5.5,,,, +US-NM-88220,US,NM,88220,7.4375,,,, +US-NM-88221,US,NM,88221,7.4375,,,, +US-NM-88230,US,NM,88230,6.0625,,,, +US-NM-88231,US,NM,88231,6.8125,,,, +US-NM-88232,US,NM,88232,7.125,,,, +US-NM-88240,US,NM,88240,6.8125,,,, +US-NM-88241,US,NM,88241,6.8125,,,, +US-NM-88242,US,NM,88242,5.5,,,, +US-NM-88244,US,NM,88244,6.8125,,,, +US-NM-88250,US,NM,88250,6.625,,,, +US-NM-88252,US,NM,88252,7.0625,,,, +US-NM-88253,US,NM,88253,5.75,,,, +US-NM-88254,US,NM,88254,5.75,,,, +US-NM-88255,US,NM,88255,5.75,,,, +US-NM-88256,US,NM,88256,5.75,,,, +US-NM-88260,US,NM,88260,6.875,,,, +US-NM-88262,US,NM,88262,6.875,,,, +US-NM-88263,US,NM,88263,5.75,,,, +US-NM-88264,US,NM,88264,5.5,,,, +US-NM-88265,US,NM,88265,5.5,,,, +US-NM-88267,US,NM,88267,5.5,,,, +US-NM-88268,US,NM,88268,5.75,,,, +US-NM-88301,US,NM,88301,5.6875,,,, +US-NM-88310,US,NM,88310,7.625,,,, +US-NM-88311,US,NM,88311,7.625,,,, +US-NM-88312,US,NM,88312,5.6875,,,, +US-NM-88314,US,NM,88314,5.9375,,,, +US-NM-88316,US,NM,88316,7,,,, +US-NM-88317,US,NM,88317,5.9375,,,, +US-NM-88318,US,NM,88318,7.125,,,, +US-NM-88321,US,NM,88321,7.0625,,,, +US-NM-88323,US,NM,88323,5.6875,,,, +US-NM-88324,US,NM,88324,5.6875,,,, +US-NM-88325,US,NM,88325,5.9375,,,, +US-NM-88330,US,NM,88330,5.9375,,,, +US-NM-88336,US,NM,88336,5.6875,,,, +US-NM-88337,US,NM,88337,5.9375,,,, +US-NM-88338,US,NM,88338,5.6875,,,, +US-NM-88339,US,NM,88339,5.9375,,,, +US-NM-88340,US,NM,88340,5.9375,,,, +US-NM-88341,US,NM,88341,5.6875,,,, +US-NM-88342,US,NM,88342,5.9375,,,, +US-NM-88343,US,NM,88343,5.6875,,,, +US-NM-88344,US,NM,88344,6.0625,,,, +US-NM-88345,US,NM,88345,8.625,,,, +US-NM-88346,US,NM,88346,7.625,,,, +US-NM-88347,US,NM,88347,5.9375,,,, +US-NM-88348,US,NM,88348,5.6875,,,, +US-NM-88349,US,NM,88349,5.9375,,,, +US-NM-88350,US,NM,88350,7.375,,,, +US-NM-88351,US,NM,88351,5.6875,,,, +US-NM-88352,US,NM,88352,7.375,,,, +US-NM-88353,US,NM,88353,7.5,,,, +US-NM-88354,US,NM,88354,5.9375,,,, +US-NM-88355,US,NM,88355,8.625,,,, +US-NM-88401,US,NM,88401,8.125,,,, +US-NM-88410,US,NM,88410,6.0625,,,, +US-NM-88411,US,NM,88411,6.4375,,,, +US-NM-88414,US,NM,88414,6.0625,,,, +US-NM-88415,US,NM,88415,7.875,,,, +US-NM-88416,US,NM,88416,8.125,,,, +US-NM-88417,US,NM,88417,6.4375,,,, +US-NM-88418,US,NM,88418,7.5,,,, +US-NM-88419,US,NM,88419,6.0625,,,, +US-NM-88421,US,NM,88421,6.5,,,, +US-NM-88422,US,NM,88422,6.0625,,,, +US-NM-88424,US,NM,88424,6.0625,,,, +US-NM-88426,US,NM,88426,8.125,,,, +US-NM-88427,US,NM,88427,6.4375,,,, +US-NM-88430,US,NM,88430,6.4375,,,, +US-NM-88431,US,NM,88431,6.4375,,,, +US-NM-88434,US,NM,88434,6.4375,,,, +US-NM-88435,US,NM,88435,8,,,, +US-NM-88436,US,NM,88436,6.0625,,,, +US-NM-88439,US,NM,88439,6.5,,,, +US-NV-88901,US,NV,88901,8.1,,,, +US-NV-88905,US,NV,88905,8.1,,,, +US-NV-89001,US,NV,89001,7.1,,,, +US-NV-89002,US,NV,89002,8.1,,,, +US-NV-89003,US,NV,89003,7.1,,,, +US-NV-89004,US,NV,89004,8.1,,,, +US-NV-89005,US,NV,89005,8.1,,,, +US-NV-89006,US,NV,89006,8.1,,,, +US-NV-89007,US,NV,89007,8.1,,,, +US-NV-89008,US,NV,89008,7.1,,,, +US-NV-89009,US,NV,89009,8.1,,,, +US-NV-89010,US,NV,89010,6.85,,,, +US-NV-89011,US,NV,89011,8.1,,,, +US-NV-89012,US,NV,89012,8.1,,,, +US-NV-89013,US,NV,89013,6.85,,,, +US-NV-89014,US,NV,89014,8.1,,,, +US-NV-89015,US,NV,89015,8.1,,,, +US-NV-89016,US,NV,89016,8.1,,,, +US-NV-89017,US,NV,89017,7.1,,,, +US-NV-89018,US,NV,89018,8.1,,,, +US-NV-89019,US,NV,89019,8.1,,,, +US-NV-89020,US,NV,89020,7.1,,,, +US-NV-89021,US,NV,89021,8.1,,,, +US-NV-89022,US,NV,89022,7.1,,,, +US-NV-89023,US,NV,89023,7.1,,,, +US-NV-89024,US,NV,89024,8.1,,,, +US-NV-89025,US,NV,89025,8.1,,,, +US-NV-89026,US,NV,89026,8.1,,,, +US-NV-89027,US,NV,89027,8.1,,,, +US-NV-89028,US,NV,89028,8.1,,,, +US-NV-89029,US,NV,89029,8.1,,,, +US-NV-89030,US,NV,89030,8.1,,,, +US-NV-89031,US,NV,89031,8.1,,,, +US-NV-89032,US,NV,89032,8.1,,,, +US-NV-89033,US,NV,89033,8.1,,,, +US-NV-89034,US,NV,89034,8.1,,,, +US-NV-89036,US,NV,89036,8.1,,,, +US-NV-89037,US,NV,89037,8.1,,,, +US-NV-89039,US,NV,89039,8.1,,,, +US-NV-89040,US,NV,89040,8.1,,,, +US-NV-89041,US,NV,89041,7.1,,,, +US-NV-89042,US,NV,89042,7.1,,,, +US-NV-89043,US,NV,89043,7.1,,,, +US-NV-89044,US,NV,89044,8.1,,,, +US-NV-89045,US,NV,89045,7.1,,,, +US-NV-89046,US,NV,89046,8.1,,,, +US-NV-89047,US,NV,89047,6.85,,,, +US-NV-89048,US,NV,89048,7.1,,,, +US-NV-89049,US,NV,89049,7.1,,,, +US-NV-89052,US,NV,89052,8.1,,,, +US-NV-89053,US,NV,89053,8.1,,,, +US-NV-89054,US,NV,89054,8.1,,,, +US-NV-89060,US,NV,89060,7.1,,,, +US-NV-89061,US,NV,89061,7.1,,,, +US-NV-89067,US,NV,89067,8.1,,,, +US-NV-89070,US,NV,89070,8.1,,,, +US-NV-89074,US,NV,89074,8.1,,,, +US-NV-89077,US,NV,89077,8.1,,,, +US-NV-89081,US,NV,89081,8.1,,,, +US-NV-89084,US,NV,89084,8.1,,,, +US-NV-89085,US,NV,89085,8.1,,,, +US-NV-89086,US,NV,89086,8.1,,,, +US-NV-89087,US,NV,89087,8.1,,,, +US-NV-89101,US,NV,89101,8.1,,,, +US-NV-89102,US,NV,89102,8.1,,,, +US-NV-89103,US,NV,89103,8.1,,,, +US-NV-89104,US,NV,89104,8.1,,,, +US-NV-89105,US,NV,89105,8.1,,,, +US-NV-89106,US,NV,89106,8.1,,,, +US-NV-89107,US,NV,89107,8.1,,,, +US-NV-89108,US,NV,89108,8.1,,,, +US-NV-89109,US,NV,89109,8.1,,,, +US-NV-89110,US,NV,89110,8.1,,,, +US-NV-89111,US,NV,89111,8.1,,,, +US-NV-89112,US,NV,89112,8.1,,,, +US-NV-89113,US,NV,89113,8.1,,,, +US-NV-89114,US,NV,89114,8.1,,,, +US-NV-89115,US,NV,89115,8.1,,,, +US-NV-89116,US,NV,89116,8.1,,,, +US-NV-89117,US,NV,89117,8.1,,,, +US-NV-89118,US,NV,89118,8.1,,,, +US-NV-89119,US,NV,89119,8.1,,,, +US-NV-89120,US,NV,89120,8.1,,,, +US-NV-89121,US,NV,89121,8.1,,,, +US-NV-89122,US,NV,89122,8.1,,,, +US-NV-89123,US,NV,89123,8.1,,,, +US-NV-89124,US,NV,89124,8.1,,,, +US-NV-89125,US,NV,89125,8.1,,,, +US-NV-89126,US,NV,89126,8.1,,,, +US-NV-89127,US,NV,89127,8.1,,,, +US-NV-89128,US,NV,89128,8.1,,,, +US-NV-89129,US,NV,89129,8.1,,,, +US-NV-89130,US,NV,89130,8.1,,,, +US-NV-89131,US,NV,89131,8.1,,,, +US-NV-89132,US,NV,89132,8.1,,,, +US-NV-89133,US,NV,89133,8.1,,,, +US-NV-89134,US,NV,89134,8.1,,,, +US-NV-89135,US,NV,89135,8.1,,,, +US-NV-89136,US,NV,89136,8.1,,,, +US-NV-89137,US,NV,89137,8.1,,,, +US-NV-89138,US,NV,89138,8.1,,,, +US-NV-89139,US,NV,89139,8.1,,,, +US-NV-89140,US,NV,89140,8.1,,,, +US-NV-89141,US,NV,89141,8.1,,,, +US-NV-89142,US,NV,89142,8.1,,,, +US-NV-89143,US,NV,89143,8.1,,,, +US-NV-89144,US,NV,89144,8.1,,,, +US-NV-89145,US,NV,89145,8.1,,,, +US-NV-89146,US,NV,89146,8.1,,,, +US-NV-89147,US,NV,89147,8.1,,,, +US-NV-89148,US,NV,89148,8.1,,,, +US-NV-89149,US,NV,89149,8.1,,,, +US-NV-89150,US,NV,89150,8.1,,,, +US-NV-89151,US,NV,89151,8.1,,,, +US-NV-89152,US,NV,89152,8.1,,,, +US-NV-89153,US,NV,89153,8.1,,,, +US-NV-89154,US,NV,89154,8.1,,,, +US-NV-89155,US,NV,89155,8.1,,,, +US-NV-89156,US,NV,89156,8.1,,,, +US-NV-89157,US,NV,89157,8.1,,,, +US-NV-89158,US,NV,89158,8.1,,,, +US-NV-89159,US,NV,89159,8.1,,,, +US-NV-89160,US,NV,89160,8.1,,,, +US-NV-89161,US,NV,89161,8.1,,,, +US-NV-89162,US,NV,89162,8.1,,,, +US-NV-89163,US,NV,89163,8.1,,,, +US-NV-89164,US,NV,89164,8.1,,,, +US-NV-89165,US,NV,89165,8.1,,,, +US-NV-89166,US,NV,89166,8.1,,,, +US-NV-89169,US,NV,89169,8.1,,,, +US-NV-89170,US,NV,89170,8.1,,,, +US-NV-89173,US,NV,89173,8.1,,,, +US-NV-89177,US,NV,89177,8.1,,,, +US-NV-89178,US,NV,89178,8.1,,,, +US-NV-89179,US,NV,89179,8.1,,,, +US-NV-89180,US,NV,89180,8.1,,,, +US-NV-89183,US,NV,89183,8.1,,,, +US-NV-89185,US,NV,89185,8.1,,,, +US-NV-89191,US,NV,89191,8.1,,,, +US-NV-89193,US,NV,89193,8.1,,,, +US-NV-89195,US,NV,89195,8.1,,,, +US-NV-89199,US,NV,89199,8.1,,,, +US-NV-89301,US,NV,89301,7.725,,,, +US-NV-89310,US,NV,89310,7.1,,,, +US-NV-89311,US,NV,89311,7.725,,,, +US-NV-89314,US,NV,89314,7.1,,,, +US-NV-89315,US,NV,89315,7.725,,,, +US-NV-89316,US,NV,89316,6.85,,,, +US-NV-89317,US,NV,89317,7.725,,,, +US-NV-89318,US,NV,89318,7.725,,,, +US-NV-89319,US,NV,89319,7.725,,,, +US-NV-89402,US,NV,89402,7.725,,,, +US-NV-89403,US,NV,89403,7.1,,,, +US-NV-89404,US,NV,89404,6.85,,,, +US-NV-89405,US,NV,89405,7.725,,,, +US-NV-89406,US,NV,89406,7.6,,,, +US-NV-89407,US,NV,89407,7.6,,,, +US-NV-89408,US,NV,89408,7.1,,,, +US-NV-89409,US,NV,89409,7.1,,,, +US-NV-89410,US,NV,89410,7.1,,,, +US-NV-89411,US,NV,89411,7.1,,,, +US-NV-89412,US,NV,89412,7.725,,,, +US-NV-89413,US,NV,89413,7.1,,,, +US-NV-89414,US,NV,89414,6.85,,,, +US-NV-89415,US,NV,89415,6.85,,,, +US-NV-89418,US,NV,89418,7.1,,,, +US-NV-89419,US,NV,89419,7.1,,,, +US-NV-89420,US,NV,89420,6.85,,,, +US-NV-89421,US,NV,89421,6.85,,,, +US-NV-89422,US,NV,89422,6.85,,,, +US-NV-89423,US,NV,89423,7.1,,,, +US-NV-89424,US,NV,89424,7.725,,,, +US-NV-89425,US,NV,89425,6.85,,,, +US-NV-89426,US,NV,89426,6.85,,,, +US-NV-89427,US,NV,89427,6.85,,,, +US-NV-89428,US,NV,89428,7.1,,,, +US-NV-89429,US,NV,89429,7.1,,,, +US-NV-89430,US,NV,89430,7.1,,,, +US-NV-89431,US,NV,89431,7.725,,,, +US-NV-89432,US,NV,89432,7.725,,,, +US-NV-89433,US,NV,89433,7.725,,,, +US-NV-89434,US,NV,89434,7.725,,,, +US-NV-89435,US,NV,89435,7.725,,,, +US-NV-89436,US,NV,89436,7.725,,,, +US-NV-89438,US,NV,89438,6.85,,,, +US-NV-89439,US,NV,89439,7.725,,,, +US-NV-89440,US,NV,89440,7.6,,,, +US-NV-89441,US,NV,89441,7.725,,,, +US-NV-89442,US,NV,89442,7.725,,,, +US-NV-89444,US,NV,89444,7.1,,,, +US-NV-89445,US,NV,89445,6.85,,,, +US-NV-89446,US,NV,89446,6.85,,,, +US-NV-89447,US,NV,89447,7.1,,,, +US-NV-89448,US,NV,89448,7.1,,,, +US-NV-89449,US,NV,89449,7.1,,,, +US-NV-89450,US,NV,89450,7.725,,,, +US-NV-89451,US,NV,89451,7.725,,,, +US-NV-89452,US,NV,89452,7.725,,,, +US-NV-89460,US,NV,89460,7.1,,,, +US-NV-89496,US,NV,89496,7.6,,,, +US-NV-89501,US,NV,89501,7.725,,,, +US-NV-89502,US,NV,89502,7.725,,,, +US-NV-89503,US,NV,89503,7.725,,,, +US-NV-89504,US,NV,89504,7.725,,,, +US-NV-89505,US,NV,89505,7.725,,,, +US-NV-89506,US,NV,89506,7.725,,,, +US-NV-89507,US,NV,89507,7.725,,,, +US-NV-89508,US,NV,89508,7.725,,,, +US-NV-89509,US,NV,89509,7.725,,,, +US-NV-89510,US,NV,89510,7.725,,,, +US-NV-89511,US,NV,89511,7.725,,,, +US-NV-89512,US,NV,89512,7.725,,,, +US-NV-89513,US,NV,89513,7.725,,,, +US-NV-89515,US,NV,89515,7.725,,,, +US-NV-89519,US,NV,89519,7.725,,,, +US-NV-89520,US,NV,89520,7.725,,,, +US-NV-89521,US,NV,89521,7.725,,,, +US-NV-89523,US,NV,89523,7.725,,,, +US-NV-89533,US,NV,89533,7.725,,,, +US-NV-89555,US,NV,89555,7.725,,,, +US-NV-89557,US,NV,89557,7.725,,,, +US-NV-89570,US,NV,89570,7.725,,,, +US-NV-89595,US,NV,89595,7.725,,,, +US-NV-89599,US,NV,89599,7.725,,,, +US-NV-89701,US,NV,89701,7.475,,,, +US-NV-89702,US,NV,89702,7.475,,,, +US-NV-89703,US,NV,89703,7.475,,,, +US-NV-89704,US,NV,89704,7.725,,,, +US-NV-89705,US,NV,89705,7.1,,,, +US-NV-89706,US,NV,89706,7.475,,,, +US-NV-89711,US,NV,89711,7.475,,,, +US-NV-89712,US,NV,89712,7.475,,,, +US-NV-89713,US,NV,89713,7.475,,,, +US-NV-89714,US,NV,89714,7.475,,,, +US-NV-89721,US,NV,89721,7.475,,,, +US-NV-89801,US,NV,89801,6.85,,,, +US-NV-89802,US,NV,89802,6.85,,,, +US-NV-89803,US,NV,89803,6.85,,,, +US-NV-89815,US,NV,89815,6.85,,,, +US-NV-89820,US,NV,89820,7.1,,,, +US-NV-89821,US,NV,89821,6.85,,,, +US-NV-89822,US,NV,89822,6.85,,,, +US-NV-89823,US,NV,89823,6.85,,,, +US-NV-89825,US,NV,89825,6.85,,,, +US-NV-89826,US,NV,89826,6.85,,,, +US-NV-89828,US,NV,89828,6.85,,,, +US-NV-89830,US,NV,89830,6.85,,,, +US-NV-89831,US,NV,89831,6.85,,,, +US-NV-89832,US,NV,89832,6.85,,,, +US-NV-89834,US,NV,89834,6.85,,,, +US-NV-89835,US,NV,89835,6.85,,,, +US-NV-89883,US,NV,89883,6.85,,,, +US-NY-00501,US,NY,00501,8.625,,,, +US-NY-00544,US,NY,00544,8.625,,,, +US-NY-06390,US,NY,06390,8.625,,,, +US-NY-10001,US,NY,10001,8.875,,,, +US-NY-10002,US,NY,10002,8.875,,,, +US-NY-10003,US,NY,10003,8.875,,,, +US-NY-10004,US,NY,10004,8.875,,,, +US-NY-10005,US,NY,10005,8.875,,,, +US-NY-10006,US,NY,10006,8.875,,,, +US-NY-10007,US,NY,10007,8.875,,,, +US-NY-10008,US,NY,10008,8.875,,,, +US-NY-10009,US,NY,10009,8.875,,,, +US-NY-10010,US,NY,10010,8.875,,,, +US-NY-10011,US,NY,10011,8.875,,,, +US-NY-10012,US,NY,10012,8.875,,,, +US-NY-10013,US,NY,10013,8.875,,,, +US-NY-10014,US,NY,10014,8.875,,,, +US-NY-10016,US,NY,10016,8.875,,,, +US-NY-10017,US,NY,10017,8.875,,,, +US-NY-10018,US,NY,10018,8.875,,,, +US-NY-10019,US,NY,10019,8.875,,,, +US-NY-10020,US,NY,10020,8.875,,,, +US-NY-10021,US,NY,10021,8.875,,,, +US-NY-10022,US,NY,10022,8.875,,,, +US-NY-10023,US,NY,10023,8.875,,,, +US-NY-10024,US,NY,10024,8.875,,,, +US-NY-10025,US,NY,10025,8.875,,,, +US-NY-10026,US,NY,10026,8.875,,,, +US-NY-10027,US,NY,10027,8.875,,,, +US-NY-10028,US,NY,10028,8.875,,,, +US-NY-10029,US,NY,10029,8.875,,,, +US-NY-10030,US,NY,10030,8.875,,,, +US-NY-10031,US,NY,10031,8.875,,,, +US-NY-10032,US,NY,10032,8.875,,,, +US-NY-10033,US,NY,10033,8.875,,,, +US-NY-10034,US,NY,10034,8.875,,,, +US-NY-10035,US,NY,10035,8.875,,,, +US-NY-10036,US,NY,10036,8.875,,,, +US-NY-10037,US,NY,10037,8.875,,,, +US-NY-10038,US,NY,10038,8.875,,,, +US-NY-10039,US,NY,10039,8.875,,,, +US-NY-10040,US,NY,10040,8.875,,,, +US-NY-10041,US,NY,10041,8.875,,,, +US-NY-10043,US,NY,10043,8.875,,,, +US-NY-10044,US,NY,10044,8.875,,,, +US-NY-10045,US,NY,10045,8.875,,,, +US-NY-10055,US,NY,10055,8.875,,,, +US-NY-10060,US,NY,10060,8.875,,,, +US-NY-10065,US,NY,10065,8.875,,,, +US-NY-10069,US,NY,10069,8.875,,,, +US-NY-10075,US,NY,10075,8.875,,,, +US-NY-10080,US,NY,10080,8.875,,,, +US-NY-10081,US,NY,10081,8.875,,,, +US-NY-10087,US,NY,10087,8.875,,,, +US-NY-10090,US,NY,10090,8.875,,,, +US-NY-10095,US,NY,10095,8.875,,,, +US-NY-10101,US,NY,10101,8.875,,,, +US-NY-10102,US,NY,10102,8.875,,,, +US-NY-10103,US,NY,10103,8.875,,,, +US-NY-10104,US,NY,10104,8.875,,,, +US-NY-10105,US,NY,10105,8.875,,,, +US-NY-10106,US,NY,10106,8.875,,,, +US-NY-10107,US,NY,10107,8.875,,,, +US-NY-10108,US,NY,10108,8.875,,,, +US-NY-10109,US,NY,10109,8.875,,,, +US-NY-10110,US,NY,10110,8.875,,,, +US-NY-10111,US,NY,10111,8.875,,,, +US-NY-10112,US,NY,10112,8.875,,,, +US-NY-10113,US,NY,10113,8.875,,,, +US-NY-10114,US,NY,10114,8.875,,,, +US-NY-10115,US,NY,10115,8.875,,,, +US-NY-10116,US,NY,10116,8.875,,,, +US-NY-10117,US,NY,10117,8.875,,,, +US-NY-10118,US,NY,10118,8.875,,,, +US-NY-10119,US,NY,10119,8.875,,,, +US-NY-10120,US,NY,10120,8.875,,,, +US-NY-10121,US,NY,10121,8.875,,,, +US-NY-10122,US,NY,10122,8.875,,,, +US-NY-10123,US,NY,10123,8.875,,,, +US-NY-10124,US,NY,10124,8.875,,,, +US-NY-10125,US,NY,10125,8.875,,,, +US-NY-10126,US,NY,10126,8.875,,,, +US-NY-10128,US,NY,10128,8.875,,,, +US-NY-10129,US,NY,10129,8.875,,,, +US-NY-10130,US,NY,10130,8.875,,,, +US-NY-10131,US,NY,10131,8.875,,,, +US-NY-10132,US,NY,10132,8.875,,,, +US-NY-10133,US,NY,10133,8.875,,,, +US-NY-10138,US,NY,10138,8.875,,,, +US-NY-10150,US,NY,10150,8.875,,,, +US-NY-10151,US,NY,10151,8.875,,,, +US-NY-10152,US,NY,10152,8.875,,,, +US-NY-10153,US,NY,10153,8.875,,,, +US-NY-10154,US,NY,10154,8.875,,,, +US-NY-10155,US,NY,10155,8.875,,,, +US-NY-10156,US,NY,10156,8.875,,,, +US-NY-10157,US,NY,10157,8.875,,,, +US-NY-10158,US,NY,10158,8.875,,,, +US-NY-10159,US,NY,10159,8.875,,,, +US-NY-10160,US,NY,10160,8.875,,,, +US-NY-10161,US,NY,10161,8.875,,,, +US-NY-10162,US,NY,10162,8.875,,,, +US-NY-10163,US,NY,10163,8.875,,,, +US-NY-10164,US,NY,10164,8.875,,,, +US-NY-10165,US,NY,10165,8.875,,,, +US-NY-10166,US,NY,10166,8.875,,,, +US-NY-10167,US,NY,10167,8.875,,,, +US-NY-10168,US,NY,10168,8.875,,,, +US-NY-10169,US,NY,10169,8.875,,,, +US-NY-10170,US,NY,10170,8.875,,,, +US-NY-10171,US,NY,10171,8.875,,,, +US-NY-10172,US,NY,10172,8.875,,,, +US-NY-10173,US,NY,10173,8.875,,,, +US-NY-10174,US,NY,10174,8.875,,,, +US-NY-10175,US,NY,10175,8.875,,,, +US-NY-10176,US,NY,10176,8.875,,,, +US-NY-10177,US,NY,10177,8.875,,,, +US-NY-10178,US,NY,10178,8.875,,,, +US-NY-10179,US,NY,10179,8.875,,,, +US-NY-10185,US,NY,10185,8.875,,,, +US-NY-10199,US,NY,10199,8.875,,,, +US-NY-10203,US,NY,10203,8.875,,,, +US-NY-10211,US,NY,10211,8.875,,,, +US-NY-10212,US,NY,10212,8.875,,,, +US-NY-10213,US,NY,10213,8.875,,,, +US-NY-10242,US,NY,10242,8.875,,,, +US-NY-10249,US,NY,10249,8.875,,,, +US-NY-10256,US,NY,10256,8.875,,,, +US-NY-10257,US,NY,10257,8.875,,,, +US-NY-10258,US,NY,10258,8.875,,,, +US-NY-10259,US,NY,10259,8.875,,,, +US-NY-10260,US,NY,10260,8.875,,,, +US-NY-10261,US,NY,10261,8.875,,,, +US-NY-10265,US,NY,10265,8.875,,,, +US-NY-10268,US,NY,10268,8.875,,,, +US-NY-10269,US,NY,10269,8.875,,,, +US-NY-10270,US,NY,10270,8.875,,,, +US-NY-10271,US,NY,10271,8.875,,,, +US-NY-10272,US,NY,10272,8.875,,,, +US-NY-10273,US,NY,10273,8.875,,,, +US-NY-10274,US,NY,10274,8.875,,,, +US-NY-10275,US,NY,10275,8.875,,,, +US-NY-10276,US,NY,10276,8.875,,,, +US-NY-10277,US,NY,10277,8.875,,,, +US-NY-10278,US,NY,10278,8.875,,,, +US-NY-10279,US,NY,10279,8.875,,,, +US-NY-10280,US,NY,10280,8.875,,,, +US-NY-10281,US,NY,10281,8.875,,,, +US-NY-10282,US,NY,10282,8.875,,,, +US-NY-10285,US,NY,10285,8.875,,,, +US-NY-10286,US,NY,10286,8.875,,,, +US-NY-10292,US,NY,10292,8.875,,,, +US-NY-10301,US,NY,10301,8.875,,,, +US-NY-10302,US,NY,10302,8.875,,,, +US-NY-10303,US,NY,10303,8.875,,,, +US-NY-10304,US,NY,10304,8.875,,,, +US-NY-10305,US,NY,10305,8.875,,,, +US-NY-10306,US,NY,10306,8.875,,,, +US-NY-10307,US,NY,10307,8.875,,,, +US-NY-10308,US,NY,10308,8.875,,,, +US-NY-10309,US,NY,10309,8.875,,,, +US-NY-10310,US,NY,10310,8.875,,,, +US-NY-10311,US,NY,10311,8.875,,,, +US-NY-10312,US,NY,10312,8.875,,,, +US-NY-10313,US,NY,10313,8.875,,,, +US-NY-10314,US,NY,10314,8.875,,,, +US-NY-10451,US,NY,10451,8.875,,,, +US-NY-10452,US,NY,10452,8.875,,,, +US-NY-10453,US,NY,10453,8.875,,,, +US-NY-10454,US,NY,10454,8.875,,,, +US-NY-10455,US,NY,10455,8.875,,,, +US-NY-10456,US,NY,10456,8.875,,,, +US-NY-10457,US,NY,10457,8.875,,,, +US-NY-10458,US,NY,10458,8.875,,,, +US-NY-10459,US,NY,10459,8.875,,,, +US-NY-10460,US,NY,10460,8.875,,,, +US-NY-10461,US,NY,10461,8.875,,,, +US-NY-10462,US,NY,10462,8.875,,,, +US-NY-10463,US,NY,10463,8.875,,,, +US-NY-10464,US,NY,10464,8.875,,,, +US-NY-10465,US,NY,10465,8.875,,,, +US-NY-10466,US,NY,10466,8.875,,,, +US-NY-10467,US,NY,10467,8.875,,,, +US-NY-10468,US,NY,10468,8.875,,,, +US-NY-10469,US,NY,10469,8.875,,,, +US-NY-10470,US,NY,10470,8.875,,,, +US-NY-10471,US,NY,10471,8.875,,,, +US-NY-10472,US,NY,10472,8.875,,,, +US-NY-10473,US,NY,10473,8.875,,,, +US-NY-10474,US,NY,10474,8.875,,,, +US-NY-10475,US,NY,10475,8.875,,,, +US-NY-10499,US,NY,10499,8.875,,,, +US-NY-10501,US,NY,10501,7.375,,,, +US-NY-10502,US,NY,10502,7.375,,,, +US-NY-10503,US,NY,10503,7.375,,,, +US-NY-10504,US,NY,10504,7.375,,,, +US-NY-10505,US,NY,10505,7.375,,,, +US-NY-10506,US,NY,10506,7.375,,,, +US-NY-10507,US,NY,10507,7.375,,,, +US-NY-10509,US,NY,10509,8.375,,,, +US-NY-10510,US,NY,10510,7.375,,,, +US-NY-10511,US,NY,10511,7.375,,,, +US-NY-10512,US,NY,10512,8.375,,,, +US-NY-10514,US,NY,10514,7.375,,,, +US-NY-10516,US,NY,10516,8.375,,,, +US-NY-10517,US,NY,10517,7.375,,,, +US-NY-10518,US,NY,10518,7.375,,,, +US-NY-10519,US,NY,10519,7.375,,,, +US-NY-10520,US,NY,10520,7.375,,,, +US-NY-10521,US,NY,10521,7.375,,,, +US-NY-10522,US,NY,10522,7.375,,,, +US-NY-10523,US,NY,10523,7.375,,,, +US-NY-10524,US,NY,10524,8.375,,,, +US-NY-10526,US,NY,10526,7.375,,,, +US-NY-10527,US,NY,10527,7.375,,,, +US-NY-10528,US,NY,10528,7.375,,,, +US-NY-10530,US,NY,10530,7.375,,,, +US-NY-10532,US,NY,10532,7.375,,,, +US-NY-10533,US,NY,10533,7.375,,,, +US-NY-10535,US,NY,10535,7.375,,,, +US-NY-10536,US,NY,10536,7.375,,,, +US-NY-10537,US,NY,10537,8.375,,,, +US-NY-10538,US,NY,10538,7.375,,,, +US-NY-10540,US,NY,10540,7.375,,,, +US-NY-10541,US,NY,10541,8.375,,,, +US-NY-10542,US,NY,10542,8.375,,,, +US-NY-10543,US,NY,10543,7.375,,,, +US-NY-10545,US,NY,10545,7.375,,,, +US-NY-10546,US,NY,10546,7.375,,,, +US-NY-10547,US,NY,10547,7.375,,,, +US-NY-10548,US,NY,10548,7.375,,,, +US-NY-10549,US,NY,10549,7.375,,,, +US-NY-10550,US,NY,10550,8.375,,,, +US-NY-10551,US,NY,10551,8.375,,,, +US-NY-10552,US,NY,10552,8.375,,,, +US-NY-10553,US,NY,10553,8.375,,,, +US-NY-10560,US,NY,10560,7.375,,,, +US-NY-10562,US,NY,10562,7.375,,,, +US-NY-10566,US,NY,10566,7.375,,,, +US-NY-10567,US,NY,10567,7.375,,,, +US-NY-10570,US,NY,10570,7.375,,,, +US-NY-10573,US,NY,10573,7.375,,,, +US-NY-10576,US,NY,10576,7.375,,,, +US-NY-10577,US,NY,10577,7.375,,,, +US-NY-10578,US,NY,10578,7.375,,,, +US-NY-10579,US,NY,10579,8.375,,,, +US-NY-10580,US,NY,10580,7.375,,,, +US-NY-10583,US,NY,10583,7.375,,,, +US-NY-10587,US,NY,10587,7.375,,,, +US-NY-10588,US,NY,10588,7.375,,,, +US-NY-10589,US,NY,10589,7.375,,,, +US-NY-10590,US,NY,10590,7.375,,,, +US-NY-10591,US,NY,10591,7.375,,,, +US-NY-10594,US,NY,10594,7.375,,,, +US-NY-10595,US,NY,10595,7.375,,,, +US-NY-10596,US,NY,10596,7.375,,,, +US-NY-10597,US,NY,10597,7.375,,,, +US-NY-10598,US,NY,10598,7.375,,,, +US-NY-10601,US,NY,10601,8.375,,,, +US-NY-10602,US,NY,10602,8.375,,,, +US-NY-10603,US,NY,10603,7.375,,,, +US-NY-10604,US,NY,10604,7.375,,,, +US-NY-10605,US,NY,10605,8.375,,,, +US-NY-10606,US,NY,10606,8.375,,,, +US-NY-10607,US,NY,10607,7.375,,,, +US-NY-10610,US,NY,10610,8.375,,,, +US-NY-10701,US,NY,10701,8.375,,,, +US-NY-10702,US,NY,10702,8.375,,,, +US-NY-10703,US,NY,10703,8.375,,,, +US-NY-10704,US,NY,10704,8.375,,,, +US-NY-10705,US,NY,10705,8.375,,,, +US-NY-10706,US,NY,10706,7.375,,,, +US-NY-10707,US,NY,10707,7.375,,,, +US-NY-10708,US,NY,10708,8.375,,,, +US-NY-10709,US,NY,10709,7.375,,,, +US-NY-10710,US,NY,10710,8.375,,,, +US-NY-10801,US,NY,10801,8.375,,,, +US-NY-10802,US,NY,10802,8.375,,,, +US-NY-10803,US,NY,10803,7.375,,,, +US-NY-10804,US,NY,10804,8.375,,,, +US-NY-10805,US,NY,10805,8.375,,,, +US-NY-10901,US,NY,10901,8.375,,,, +US-NY-10910,US,NY,10910,8.125,,,, +US-NY-10911,US,NY,10911,8.125,,,, +US-NY-10912,US,NY,10912,8.125,,,, +US-NY-10913,US,NY,10913,8.375,,,, +US-NY-10914,US,NY,10914,8.125,,,, +US-NY-10915,US,NY,10915,8.125,,,, +US-NY-10916,US,NY,10916,8.125,,,, +US-NY-10917,US,NY,10917,8.125,,,, +US-NY-10918,US,NY,10918,8.125,,,, +US-NY-10919,US,NY,10919,8.125,,,, +US-NY-10920,US,NY,10920,8.375,,,, +US-NY-10921,US,NY,10921,8.125,,,, +US-NY-10922,US,NY,10922,8.125,,,, +US-NY-10923,US,NY,10923,8.375,,,, +US-NY-10924,US,NY,10924,8.125,,,, +US-NY-10925,US,NY,10925,8.125,,,, +US-NY-10926,US,NY,10926,8.125,,,, +US-NY-10927,US,NY,10927,8.375,,,, +US-NY-10928,US,NY,10928,8.125,,,, +US-NY-10930,US,NY,10930,8.125,,,, +US-NY-10931,US,NY,10931,8.375,,,, +US-NY-10932,US,NY,10932,8.125,,,, +US-NY-10933,US,NY,10933,8.125,,,, +US-NY-10940,US,NY,10940,8.125,,,, +US-NY-10941,US,NY,10941,8.125,,,, +US-NY-10949,US,NY,10949,8.125,,,, +US-NY-10950,US,NY,10950,8.125,,,, +US-NY-10952,US,NY,10952,8.375,,,, +US-NY-10953,US,NY,10953,8.125,,,, +US-NY-10954,US,NY,10954,8.375,,,, +US-NY-10956,US,NY,10956,8.375,,,, +US-NY-10958,US,NY,10958,8.125,,,, +US-NY-10959,US,NY,10959,8.125,,,, +US-NY-10960,US,NY,10960,8.375,,,, +US-NY-10962,US,NY,10962,8.375,,,, +US-NY-10963,US,NY,10963,8.125,,,, +US-NY-10964,US,NY,10964,8.375,,,, +US-NY-10965,US,NY,10965,8.375,,,, +US-NY-10968,US,NY,10968,8.375,,,, +US-NY-10969,US,NY,10969,8.125,,,, +US-NY-10970,US,NY,10970,8.375,,,, +US-NY-10973,US,NY,10973,8.125,,,, +US-NY-10974,US,NY,10974,8.375,,,, +US-NY-10975,US,NY,10975,8.125,,,, +US-NY-10976,US,NY,10976,8.375,,,, +US-NY-10977,US,NY,10977,8.375,,,, +US-NY-10979,US,NY,10979,8.125,,,, +US-NY-10980,US,NY,10980,8.375,,,, +US-NY-10981,US,NY,10981,8.125,,,, +US-NY-10982,US,NY,10982,8.375,,,, +US-NY-10983,US,NY,10983,8.375,,,, +US-NY-10984,US,NY,10984,8.375,,,, +US-NY-10985,US,NY,10985,8.125,,,, +US-NY-10986,US,NY,10986,8.375,,,, +US-NY-10987,US,NY,10987,8.125,,,, +US-NY-10988,US,NY,10988,8.125,,,, +US-NY-10989,US,NY,10989,8.375,,,, +US-NY-10990,US,NY,10990,8.125,,,, +US-NY-10992,US,NY,10992,8.125,,,, +US-NY-10993,US,NY,10993,8.375,,,, +US-NY-10994,US,NY,10994,8.375,,,, +US-NY-10996,US,NY,10996,8.125,,,, +US-NY-10997,US,NY,10997,8.125,,,, +US-NY-10998,US,NY,10998,8.125,,,, +US-NY-11001,US,NY,11001,8.625,,,, +US-NY-11002,US,NY,11002,8.625,,,, +US-NY-11003,US,NY,11003,8.625,,,, +US-NY-11004,US,NY,11004,8.875,,,, +US-NY-11005,US,NY,11005,8.875,,,, +US-NY-11010,US,NY,11010,8.625,,,, +US-NY-11020,US,NY,11020,8.625,,,, +US-NY-11021,US,NY,11021,8.625,,,, +US-NY-11022,US,NY,11022,8.625,,,, +US-NY-11023,US,NY,11023,8.625,,,, +US-NY-11024,US,NY,11024,8.625,,,, +US-NY-11026,US,NY,11026,8.625,,,, +US-NY-11027,US,NY,11027,8.625,,,, +US-NY-11030,US,NY,11030,8.625,,,, +US-NY-11040,US,NY,11040,8.625,,,, +US-NY-11042,US,NY,11042,8.625,,,, +US-NY-11050,US,NY,11050,8.625,,,, +US-NY-11051,US,NY,11051,8.625,,,, +US-NY-11052,US,NY,11052,8.625,,,, +US-NY-11053,US,NY,11053,8.625,,,, +US-NY-11054,US,NY,11054,8.625,,,, +US-NY-11055,US,NY,11055,8.625,,,, +US-NY-11096,US,NY,11096,8.625,,,, +US-NY-11101,US,NY,11101,8.875,,,, +US-NY-11102,US,NY,11102,8.875,,,, +US-NY-11103,US,NY,11103,8.875,,,, +US-NY-11104,US,NY,11104,8.875,,,, +US-NY-11105,US,NY,11105,8.875,,,, +US-NY-11106,US,NY,11106,8.875,,,, +US-NY-11109,US,NY,11109,8.875,,,, +US-NY-11120,US,NY,11120,8.875,,,, +US-NY-11201,US,NY,11201,8.875,,,, +US-NY-11202,US,NY,11202,8.875,,,, +US-NY-11203,US,NY,11203,8.875,,,, +US-NY-11204,US,NY,11204,8.875,,,, +US-NY-11205,US,NY,11205,8.875,,,, +US-NY-11206,US,NY,11206,8.875,,,, +US-NY-11207,US,NY,11207,8.875,,,, +US-NY-11208,US,NY,11208,8.875,,,, +US-NY-11209,US,NY,11209,8.875,,,, +US-NY-11210,US,NY,11210,8.875,,,, +US-NY-11211,US,NY,11211,8.875,,,, +US-NY-11212,US,NY,11212,8.875,,,, +US-NY-11213,US,NY,11213,8.875,,,, +US-NY-11214,US,NY,11214,8.875,,,, +US-NY-11215,US,NY,11215,8.875,,,, +US-NY-11216,US,NY,11216,8.875,,,, +US-NY-11217,US,NY,11217,8.875,,,, +US-NY-11218,US,NY,11218,8.875,,,, +US-NY-11219,US,NY,11219,8.875,,,, +US-NY-11220,US,NY,11220,8.875,,,, +US-NY-11221,US,NY,11221,8.875,,,, +US-NY-11222,US,NY,11222,8.875,,,, +US-NY-11223,US,NY,11223,8.875,,,, +US-NY-11224,US,NY,11224,8.875,,,, +US-NY-11225,US,NY,11225,8.875,,,, +US-NY-11226,US,NY,11226,8.875,,,, +US-NY-11228,US,NY,11228,8.875,,,, +US-NY-11229,US,NY,11229,8.875,,,, +US-NY-11230,US,NY,11230,8.875,,,, +US-NY-11231,US,NY,11231,8.875,,,, +US-NY-11232,US,NY,11232,8.875,,,, +US-NY-11233,US,NY,11233,8.875,,,, +US-NY-11234,US,NY,11234,8.875,,,, +US-NY-11235,US,NY,11235,8.875,,,, +US-NY-11236,US,NY,11236,8.875,,,, +US-NY-11237,US,NY,11237,8.875,,,, +US-NY-11238,US,NY,11238,8.875,,,, +US-NY-11239,US,NY,11239,8.875,,,, +US-NY-11241,US,NY,11241,8.875,,,, +US-NY-11242,US,NY,11242,8.875,,,, +US-NY-11243,US,NY,11243,8.875,,,, +US-NY-11245,US,NY,11245,8.875,,,, +US-NY-11247,US,NY,11247,8.875,,,, +US-NY-11249,US,NY,11249,8.875,,,, +US-NY-11252,US,NY,11252,8.875,,,, +US-NY-11256,US,NY,11256,8.875,,,, +US-NY-11351,US,NY,11351,8.875,,,, +US-NY-11352,US,NY,11352,8.875,,,, +US-NY-11354,US,NY,11354,8.875,,,, +US-NY-11355,US,NY,11355,8.875,,,, +US-NY-11356,US,NY,11356,8.875,,,, +US-NY-11357,US,NY,11357,8.875,,,, +US-NY-11358,US,NY,11358,8.875,,,, +US-NY-11359,US,NY,11359,8.875,,,, +US-NY-11360,US,NY,11360,8.875,,,, +US-NY-11361,US,NY,11361,8.875,,,, +US-NY-11362,US,NY,11362,8.875,,,, +US-NY-11363,US,NY,11363,8.875,,,, +US-NY-11364,US,NY,11364,8.875,,,, +US-NY-11365,US,NY,11365,8.875,,,, +US-NY-11366,US,NY,11366,8.875,,,, +US-NY-11367,US,NY,11367,8.875,,,, +US-NY-11368,US,NY,11368,8.875,,,, +US-NY-11369,US,NY,11369,8.875,,,, +US-NY-11370,US,NY,11370,8.875,,,, +US-NY-11371,US,NY,11371,8.875,,,, +US-NY-11372,US,NY,11372,8.875,,,, +US-NY-11373,US,NY,11373,8.875,,,, +US-NY-11374,US,NY,11374,8.875,,,, +US-NY-11375,US,NY,11375,8.875,,,, +US-NY-11377,US,NY,11377,8.875,,,, +US-NY-11378,US,NY,11378,8.875,,,, +US-NY-11379,US,NY,11379,8.875,,,, +US-NY-11380,US,NY,11380,8.875,,,, +US-NY-11381,US,NY,11381,8.875,,,, +US-NY-11385,US,NY,11385,8.875,,,, +US-NY-11386,US,NY,11386,8.875,,,, +US-NY-11405,US,NY,11405,8.875,,,, +US-NY-11411,US,NY,11411,8.875,,,, +US-NY-11412,US,NY,11412,8.875,,,, +US-NY-11413,US,NY,11413,8.875,,,, +US-NY-11414,US,NY,11414,8.875,,,, +US-NY-11415,US,NY,11415,8.875,,,, +US-NY-11416,US,NY,11416,8.875,,,, +US-NY-11417,US,NY,11417,8.875,,,, +US-NY-11418,US,NY,11418,8.875,,,, +US-NY-11419,US,NY,11419,8.875,,,, +US-NY-11420,US,NY,11420,8.875,,,, +US-NY-11421,US,NY,11421,8.875,,,, +US-NY-11422,US,NY,11422,8.875,,,, +US-NY-11423,US,NY,11423,8.875,,,, +US-NY-11424,US,NY,11424,8.875,,,, +US-NY-11425,US,NY,11425,8.875,,,, +US-NY-11426,US,NY,11426,8.875,,,, +US-NY-11427,US,NY,11427,8.875,,,, +US-NY-11428,US,NY,11428,8.875,,,, +US-NY-11429,US,NY,11429,8.875,,,, +US-NY-11430,US,NY,11430,8.875,,,, +US-NY-11431,US,NY,11431,8.875,,,, +US-NY-11432,US,NY,11432,8.875,,,, +US-NY-11433,US,NY,11433,8.875,,,, +US-NY-11434,US,NY,11434,8.875,,,, +US-NY-11435,US,NY,11435,8.875,,,, +US-NY-11436,US,NY,11436,8.875,,,, +US-NY-11439,US,NY,11439,8.875,,,, +US-NY-11451,US,NY,11451,8.875,,,, +US-NY-11499,US,NY,11499,8.875,,,, +US-NY-11501,US,NY,11501,8.625,,,, +US-NY-11507,US,NY,11507,8.625,,,, +US-NY-11509,US,NY,11509,8.625,,,, +US-NY-11510,US,NY,11510,8.625,,,, +US-NY-11514,US,NY,11514,8.625,,,, +US-NY-11516,US,NY,11516,8.625,,,, +US-NY-11518,US,NY,11518,8.625,,,, +US-NY-11520,US,NY,11520,8.625,,,, +US-NY-11530,US,NY,11530,8.625,,,, +US-NY-11531,US,NY,11531,8.625,,,, +US-NY-11542,US,NY,11542,8.625,,,, +US-NY-11545,US,NY,11545,8.625,,,, +US-NY-11547,US,NY,11547,8.625,,,, +US-NY-11548,US,NY,11548,8.625,,,, +US-NY-11549,US,NY,11549,8.625,,,, +US-NY-11550,US,NY,11550,8.625,,,, +US-NY-11551,US,NY,11551,8.625,,,, +US-NY-11552,US,NY,11552,8.625,,,, +US-NY-11553,US,NY,11553,8.625,,,, +US-NY-11554,US,NY,11554,8.625,,,, +US-NY-11555,US,NY,11555,8.625,,,, +US-NY-11556,US,NY,11556,8.625,,,, +US-NY-11557,US,NY,11557,8.625,,,, +US-NY-11558,US,NY,11558,8.625,,,, +US-NY-11559,US,NY,11559,8.625,,,, +US-NY-11560,US,NY,11560,8.625,,,, +US-NY-11561,US,NY,11561,8.625,,,, +US-NY-11563,US,NY,11563,8.625,,,, +US-NY-11565,US,NY,11565,8.625,,,, +US-NY-11566,US,NY,11566,8.625,,,, +US-NY-11568,US,NY,11568,8.625,,,, +US-NY-11569,US,NY,11569,8.625,,,, +US-NY-11570,US,NY,11570,8.625,,,, +US-NY-11571,US,NY,11571,8.625,,,, +US-NY-11572,US,NY,11572,8.625,,,, +US-NY-11575,US,NY,11575,8.625,,,, +US-NY-11576,US,NY,11576,8.625,,,, +US-NY-11577,US,NY,11577,8.625,,,, +US-NY-11579,US,NY,11579,8.625,,,, +US-NY-11580,US,NY,11580,8.625,,,, +US-NY-11581,US,NY,11581,8.625,,,, +US-NY-11582,US,NY,11582,8.625,,,, +US-NY-11590,US,NY,11590,8.625,,,, +US-NY-11596,US,NY,11596,8.625,,,, +US-NY-11598,US,NY,11598,8.625,,,, +US-NY-11599,US,NY,11599,8.625,,,, +US-NY-11690,US,NY,11690,8.875,,,, +US-NY-11691,US,NY,11691,8.875,,,, +US-NY-11692,US,NY,11692,8.875,,,, +US-NY-11693,US,NY,11693,8.875,,,, +US-NY-11694,US,NY,11694,8.875,,,, +US-NY-11695,US,NY,11695,8.875,,,, +US-NY-11697,US,NY,11697,8.875,,,, +US-NY-11701,US,NY,11701,8.625,,,, +US-NY-11702,US,NY,11702,8.625,,,, +US-NY-11703,US,NY,11703,8.625,,,, +US-NY-11704,US,NY,11704,8.625,,,, +US-NY-11705,US,NY,11705,8.625,,,, +US-NY-11706,US,NY,11706,8.625,,,, +US-NY-11707,US,NY,11707,8.625,,,, +US-NY-11709,US,NY,11709,8.625,,,, +US-NY-11710,US,NY,11710,8.625,,,, +US-NY-11713,US,NY,11713,8.625,,,, +US-NY-11714,US,NY,11714,8.625,,,, +US-NY-11715,US,NY,11715,8.625,,,, +US-NY-11716,US,NY,11716,8.625,,,, +US-NY-11717,US,NY,11717,8.625,,,, +US-NY-11718,US,NY,11718,8.625,,,, +US-NY-11719,US,NY,11719,8.625,,,, +US-NY-11720,US,NY,11720,8.625,,,, +US-NY-11721,US,NY,11721,8.625,,,, +US-NY-11722,US,NY,11722,8.625,,,, +US-NY-11724,US,NY,11724,8.625,,,, +US-NY-11725,US,NY,11725,8.625,,,, +US-NY-11726,US,NY,11726,8.625,,,, +US-NY-11727,US,NY,11727,8.625,,,, +US-NY-11729,US,NY,11729,8.625,,,, +US-NY-11730,US,NY,11730,8.625,,,, +US-NY-11731,US,NY,11731,8.625,,,, +US-NY-11732,US,NY,11732,8.625,,,, +US-NY-11733,US,NY,11733,8.625,,,, +US-NY-11735,US,NY,11735,8.625,,,, +US-NY-11737,US,NY,11737,8.625,,,, +US-NY-11738,US,NY,11738,8.625,,,, +US-NY-11739,US,NY,11739,8.625,,,, +US-NY-11740,US,NY,11740,8.625,,,, +US-NY-11741,US,NY,11741,8.625,,,, +US-NY-11742,US,NY,11742,8.625,,,, +US-NY-11743,US,NY,11743,8.625,,,, +US-NY-11746,US,NY,11746,8.625,,,, +US-NY-11747,US,NY,11747,8.625,,,, +US-NY-11749,US,NY,11749,8.625,,,, +US-NY-11751,US,NY,11751,8.625,,,, +US-NY-11752,US,NY,11752,8.625,,,, +US-NY-11753,US,NY,11753,8.625,,,, +US-NY-11754,US,NY,11754,8.625,,,, +US-NY-11755,US,NY,11755,8.625,,,, +US-NY-11756,US,NY,11756,8.625,,,, +US-NY-11757,US,NY,11757,8.625,,,, +US-NY-11758,US,NY,11758,8.625,,,, +US-NY-11760,US,NY,11760,8.625,,,, +US-NY-11762,US,NY,11762,8.625,,,, +US-NY-11763,US,NY,11763,8.625,,,, +US-NY-11764,US,NY,11764,8.625,,,, +US-NY-11765,US,NY,11765,8.625,,,, +US-NY-11766,US,NY,11766,8.625,,,, +US-NY-11767,US,NY,11767,8.625,,,, +US-NY-11768,US,NY,11768,8.625,,,, +US-NY-11769,US,NY,11769,8.625,,,, +US-NY-11770,US,NY,11770,8.625,,,, +US-NY-11771,US,NY,11771,8.625,,,, +US-NY-11772,US,NY,11772,8.625,,,, +US-NY-11773,US,NY,11773,8.625,,,, +US-NY-11775,US,NY,11775,8.625,,,, +US-NY-11776,US,NY,11776,8.625,,,, +US-NY-11777,US,NY,11777,8.625,,,, +US-NY-11778,US,NY,11778,8.625,,,, +US-NY-11779,US,NY,11779,8.625,,,, +US-NY-11780,US,NY,11780,8.625,,,, +US-NY-11782,US,NY,11782,8.625,,,, +US-NY-11783,US,NY,11783,8.625,,,, +US-NY-11784,US,NY,11784,8.625,,,, +US-NY-11786,US,NY,11786,8.625,,,, +US-NY-11787,US,NY,11787,8.625,,,, +US-NY-11788,US,NY,11788,8.625,,,, +US-NY-11789,US,NY,11789,8.625,,,, +US-NY-11790,US,NY,11790,8.625,,,, +US-NY-11791,US,NY,11791,8.625,,,, +US-NY-11792,US,NY,11792,8.625,,,, +US-NY-11793,US,NY,11793,8.625,,,, +US-NY-11794,US,NY,11794,8.625,,,, +US-NY-11795,US,NY,11795,8.625,,,, +US-NY-11796,US,NY,11796,8.625,,,, +US-NY-11797,US,NY,11797,8.625,,,, +US-NY-11798,US,NY,11798,8.625,,,, +US-NY-11801,US,NY,11801,8.625,,,, +US-NY-11802,US,NY,11802,8.625,,,, +US-NY-11803,US,NY,11803,8.625,,,, +US-NY-11804,US,NY,11804,8.625,,,, +US-NY-11815,US,NY,11815,8.625,,,, +US-NY-11819,US,NY,11819,8.625,,,, +US-NY-11853,US,NY,11853,8.625,,,, +US-NY-11854,US,NY,11854,8.625,,,, +US-NY-11901,US,NY,11901,8.625,,,, +US-NY-11930,US,NY,11930,8.625,,,, +US-NY-11931,US,NY,11931,8.625,,,, +US-NY-11932,US,NY,11932,8.625,,,, +US-NY-11933,US,NY,11933,8.625,,,, +US-NY-11934,US,NY,11934,8.625,,,, +US-NY-11935,US,NY,11935,8.625,,,, +US-NY-11937,US,NY,11937,8.625,,,, +US-NY-11939,US,NY,11939,8.625,,,, +US-NY-11940,US,NY,11940,8.625,,,, +US-NY-11941,US,NY,11941,8.625,,,, +US-NY-11942,US,NY,11942,8.625,,,, +US-NY-11944,US,NY,11944,8.625,,,, +US-NY-11946,US,NY,11946,8.625,,,, +US-NY-11947,US,NY,11947,8.625,,,, +US-NY-11948,US,NY,11948,8.625,,,, +US-NY-11949,US,NY,11949,8.625,,,, +US-NY-11950,US,NY,11950,8.625,,,, +US-NY-11951,US,NY,11951,8.625,,,, +US-NY-11952,US,NY,11952,8.625,,,, +US-NY-11953,US,NY,11953,8.625,,,, +US-NY-11954,US,NY,11954,8.625,,,, +US-NY-11955,US,NY,11955,8.625,,,, +US-NY-11956,US,NY,11956,8.625,,,, +US-NY-11957,US,NY,11957,8.625,,,, +US-NY-11958,US,NY,11958,8.625,,,, +US-NY-11959,US,NY,11959,8.625,,,, +US-NY-11960,US,NY,11960,8.625,,,, +US-NY-11961,US,NY,11961,8.625,,,, +US-NY-11962,US,NY,11962,8.625,,,, +US-NY-11963,US,NY,11963,8.625,,,, +US-NY-11964,US,NY,11964,8.625,,,, +US-NY-11965,US,NY,11965,8.625,,,, +US-NY-11967,US,NY,11967,8.625,,,, +US-NY-11968,US,NY,11968,8.625,,,, +US-NY-11969,US,NY,11969,8.625,,,, +US-NY-11970,US,NY,11970,8.625,,,, +US-NY-11971,US,NY,11971,8.625,,,, +US-NY-11972,US,NY,11972,8.625,,,, +US-NY-11973,US,NY,11973,8.625,,,, +US-NY-11975,US,NY,11975,8.625,,,, +US-NY-11976,US,NY,11976,8.625,,,, +US-NY-11977,US,NY,11977,8.625,,,, +US-NY-11978,US,NY,11978,8.625,,,, +US-NY-11980,US,NY,11980,8.625,,,, +US-NY-12007,US,NY,12007,8,,,, +US-NY-12008,US,NY,12008,8,,,, +US-NY-12009,US,NY,12009,8,,,, +US-NY-12010,US,NY,12010,8,,,, +US-NY-12015,US,NY,12015,8,,,, +US-NY-12016,US,NY,12016,8,,,, +US-NY-12017,US,NY,12017,8,,,, +US-NY-12018,US,NY,12018,8,,,, +US-NY-12019,US,NY,12019,7,,,, +US-NY-12020,US,NY,12020,7,,,, +US-NY-12022,US,NY,12022,8,,,, +US-NY-12023,US,NY,12023,8,,,, +US-NY-12024,US,NY,12024,8,,,, +US-NY-12025,US,NY,12025,8,,,, +US-NY-12027,US,NY,12027,7,,,, +US-NY-12028,US,NY,12028,7,,,, +US-NY-12029,US,NY,12029,8,,,, +US-NY-12031,US,NY,12031,8,,,, +US-NY-12032,US,NY,12032,8,,,, +US-NY-12033,US,NY,12033,8,,,, +US-NY-12035,US,NY,12035,8,,,, +US-NY-12036,US,NY,12036,8,,,, +US-NY-12037,US,NY,12037,8,,,, +US-NY-12040,US,NY,12040,8,,,, +US-NY-12041,US,NY,12041,8,,,, +US-NY-12042,US,NY,12042,8,,,, +US-NY-12043,US,NY,12043,8,,,, +US-NY-12045,US,NY,12045,8,,,, +US-NY-12046,US,NY,12046,8,,,, +US-NY-12047,US,NY,12047,8,,,, +US-NY-12050,US,NY,12050,8,,,, +US-NY-12051,US,NY,12051,8,,,, +US-NY-12052,US,NY,12052,8,,,, +US-NY-12053,US,NY,12053,8,,,, +US-NY-12054,US,NY,12054,8,,,, +US-NY-12055,US,NY,12055,8,,,, +US-NY-12056,US,NY,12056,8,,,, +US-NY-12057,US,NY,12057,7,,,, +US-NY-12058,US,NY,12058,8,,,, +US-NY-12059,US,NY,12059,8,,,, +US-NY-12060,US,NY,12060,8,,,, +US-NY-12061,US,NY,12061,8,,,, +US-NY-12062,US,NY,12062,8,,,, +US-NY-12063,US,NY,12063,8,,,, +US-NY-12064,US,NY,12064,8,,,, +US-NY-12065,US,NY,12065,7,,,, +US-NY-12066,US,NY,12066,8,,,, +US-NY-12067,US,NY,12067,8,,,, +US-NY-12068,US,NY,12068,8,,,, +US-NY-12069,US,NY,12069,8,,,, +US-NY-12070,US,NY,12070,8,,,, +US-NY-12071,US,NY,12071,8,,,, +US-NY-12072,US,NY,12072,8,,,, +US-NY-12073,US,NY,12073,8,,,, +US-NY-12074,US,NY,12074,7,,,, +US-NY-12075,US,NY,12075,8,,,, +US-NY-12076,US,NY,12076,8,,,, +US-NY-12077,US,NY,12077,8,,,, +US-NY-12078,US,NY,12078,8,,,, +US-NY-12082,US,NY,12082,8,,,, +US-NY-12083,US,NY,12083,8,,,, +US-NY-12084,US,NY,12084,8,,,, +US-NY-12085,US,NY,12085,8,,,, +US-NY-12086,US,NY,12086,8,,,, +US-NY-12087,US,NY,12087,8,,,, +US-NY-12089,US,NY,12089,8,,,, +US-NY-12090,US,NY,12090,8,,,, +US-NY-12092,US,NY,12092,8,,,, +US-NY-12093,US,NY,12093,8,,,, +US-NY-12094,US,NY,12094,8,,,, +US-NY-12095,US,NY,12095,8,,,, +US-NY-12106,US,NY,12106,8,,,, +US-NY-12107,US,NY,12107,8,,,, +US-NY-12108,US,NY,12108,7,,,, +US-NY-12110,US,NY,12110,8,,,, +US-NY-12115,US,NY,12115,8,,,, +US-NY-12116,US,NY,12116,8,,,, +US-NY-12117,US,NY,12117,8,,,, +US-NY-12118,US,NY,12118,7,,,, +US-NY-12120,US,NY,12120,8,,,, +US-NY-12121,US,NY,12121,8,,,, +US-NY-12122,US,NY,12122,8,,,, +US-NY-12123,US,NY,12123,8,,,, +US-NY-12124,US,NY,12124,8,,,, +US-NY-12125,US,NY,12125,8,,,, +US-NY-12128,US,NY,12128,8,,,, +US-NY-12130,US,NY,12130,8,,,, +US-NY-12131,US,NY,12131,8,,,, +US-NY-12132,US,NY,12132,8,,,, +US-NY-12133,US,NY,12133,8,,,, +US-NY-12134,US,NY,12134,8,,,, +US-NY-12136,US,NY,12136,8,,,, +US-NY-12137,US,NY,12137,8,,,, +US-NY-12138,US,NY,12138,8,,,, +US-NY-12139,US,NY,12139,7,,,, +US-NY-12140,US,NY,12140,8,,,, +US-NY-12141,US,NY,12141,8,,,, +US-NY-12143,US,NY,12143,8,,,, +US-NY-12144,US,NY,12144,8,,,, +US-NY-12147,US,NY,12147,8,,,, +US-NY-12148,US,NY,12148,7,,,, +US-NY-12149,US,NY,12149,8,,,, +US-NY-12150,US,NY,12150,8,,,, +US-NY-12151,US,NY,12151,7,,,, +US-NY-12153,US,NY,12153,8,,,, +US-NY-12154,US,NY,12154,8,,,, +US-NY-12155,US,NY,12155,8,,,, +US-NY-12156,US,NY,12156,8,,,, +US-NY-12157,US,NY,12157,8,,,, +US-NY-12158,US,NY,12158,8,,,, +US-NY-12159,US,NY,12159,8,,,, +US-NY-12160,US,NY,12160,8,,,, +US-NY-12161,US,NY,12161,8,,,, +US-NY-12164,US,NY,12164,7,,,, +US-NY-12165,US,NY,12165,8,,,, +US-NY-12166,US,NY,12166,8,,,, +US-NY-12167,US,NY,12167,8,,,, +US-NY-12168,US,NY,12168,8,,,, +US-NY-12169,US,NY,12169,8,,,, +US-NY-12170,US,NY,12170,7,,,, +US-NY-12172,US,NY,12172,8,,,, +US-NY-12173,US,NY,12173,8,,,, +US-NY-12174,US,NY,12174,8,,,, +US-NY-12175,US,NY,12175,8,,,, +US-NY-12176,US,NY,12176,8,,,, +US-NY-12177,US,NY,12177,8,,,, +US-NY-12180,US,NY,12180,8,,,, +US-NY-12181,US,NY,12181,8,,,, +US-NY-12182,US,NY,12182,8,,,, +US-NY-12183,US,NY,12183,8,,,, +US-NY-12184,US,NY,12184,8,,,, +US-NY-12185,US,NY,12185,8,,,, +US-NY-12186,US,NY,12186,8,,,, +US-NY-12187,US,NY,12187,8,,,, +US-NY-12188,US,NY,12188,7,,,, +US-NY-12189,US,NY,12189,8,,,, +US-NY-12190,US,NY,12190,7,,,, +US-NY-12192,US,NY,12192,8,,,, +US-NY-12193,US,NY,12193,8,,,, +US-NY-12194,US,NY,12194,8,,,, +US-NY-12195,US,NY,12195,8,,,, +US-NY-12196,US,NY,12196,8,,,, +US-NY-12197,US,NY,12197,8,,,, +US-NY-12198,US,NY,12198,8,,,, +US-NY-12201,US,NY,12201,8,,,, +US-NY-12202,US,NY,12202,8,,,, +US-NY-12203,US,NY,12203,8,,,, +US-NY-12204,US,NY,12204,8,,,, +US-NY-12205,US,NY,12205,8,,,, +US-NY-12206,US,NY,12206,8,,,, +US-NY-12207,US,NY,12207,8,,,, +US-NY-12208,US,NY,12208,8,,,, +US-NY-12209,US,NY,12209,8,,,, +US-NY-12210,US,NY,12210,8,,,, +US-NY-12211,US,NY,12211,8,,,, +US-NY-12212,US,NY,12212,8,,,, +US-NY-12214,US,NY,12214,8,,,, +US-NY-12220,US,NY,12220,8,,,, +US-NY-12222,US,NY,12222,8,,,, +US-NY-12223,US,NY,12223,8,,,, +US-NY-12224,US,NY,12224,8,,,, +US-NY-12225,US,NY,12225,8,,,, +US-NY-12226,US,NY,12226,8,,,, +US-NY-12227,US,NY,12227,8,,,, +US-NY-12228,US,NY,12228,8,,,, +US-NY-12229,US,NY,12229,8,,,, +US-NY-12230,US,NY,12230,8,,,, +US-NY-12231,US,NY,12231,8,,,, +US-NY-12232,US,NY,12232,8,,,, +US-NY-12233,US,NY,12233,8,,,, +US-NY-12234,US,NY,12234,8,,,, +US-NY-12235,US,NY,12235,8,,,, +US-NY-12236,US,NY,12236,8,,,, +US-NY-12237,US,NY,12237,8,,,, +US-NY-12238,US,NY,12238,8,,,, +US-NY-12239,US,NY,12239,8,,,, +US-NY-12240,US,NY,12240,8,,,, +US-NY-12241,US,NY,12241,8,,,, +US-NY-12242,US,NY,12242,8,,,, +US-NY-12243,US,NY,12243,8,,,, +US-NY-12244,US,NY,12244,8,,,, +US-NY-12245,US,NY,12245,8,,,, +US-NY-12246,US,NY,12246,8,,,, +US-NY-12247,US,NY,12247,8,,,, +US-NY-12248,US,NY,12248,8,,,, +US-NY-12249,US,NY,12249,8,,,, +US-NY-12250,US,NY,12250,8,,,, +US-NY-12252,US,NY,12252,8,,,, +US-NY-12255,US,NY,12255,8,,,, +US-NY-12256,US,NY,12256,8,,,, +US-NY-12257,US,NY,12257,8,,,, +US-NY-12260,US,NY,12260,8,,,, +US-NY-12261,US,NY,12261,8,,,, +US-NY-12288,US,NY,12288,8,,,, +US-NY-12301,US,NY,12301,8,,,, +US-NY-12302,US,NY,12302,8,,,, +US-NY-12303,US,NY,12303,8,,,, +US-NY-12304,US,NY,12304,8,,,, +US-NY-12305,US,NY,12305,8,,,, +US-NY-12306,US,NY,12306,8,,,, +US-NY-12307,US,NY,12307,8,,,, +US-NY-12308,US,NY,12308,8,,,, +US-NY-12309,US,NY,12309,8,,,, +US-NY-12325,US,NY,12325,8,,,, +US-NY-12345,US,NY,12345,8,,,, +US-NY-12401,US,NY,12401,8,,,, +US-NY-12402,US,NY,12402,8,,,, +US-NY-12404,US,NY,12404,8,,,, +US-NY-12405,US,NY,12405,8,,,, +US-NY-12406,US,NY,12406,8,,,, +US-NY-12407,US,NY,12407,8,,,, +US-NY-12409,US,NY,12409,8,,,, +US-NY-12410,US,NY,12410,8,,,, +US-NY-12411,US,NY,12411,8,,,, +US-NY-12412,US,NY,12412,8,,,, +US-NY-12413,US,NY,12413,8,,,, +US-NY-12414,US,NY,12414,8,,,, +US-NY-12416,US,NY,12416,8,,,, +US-NY-12417,US,NY,12417,8,,,, +US-NY-12418,US,NY,12418,8,,,, +US-NY-12419,US,NY,12419,8,,,, +US-NY-12420,US,NY,12420,8,,,, +US-NY-12421,US,NY,12421,8,,,, +US-NY-12422,US,NY,12422,8,,,, +US-NY-12423,US,NY,12423,8,,,, +US-NY-12424,US,NY,12424,8,,,, +US-NY-12427,US,NY,12427,8,,,, +US-NY-12428,US,NY,12428,8,,,, +US-NY-12429,US,NY,12429,8,,,, +US-NY-12430,US,NY,12430,8,,,, +US-NY-12431,US,NY,12431,8,,,, +US-NY-12432,US,NY,12432,8,,,, +US-NY-12433,US,NY,12433,8,,,, +US-NY-12434,US,NY,12434,8,,,, +US-NY-12435,US,NY,12435,8,,,, +US-NY-12436,US,NY,12436,8,,,, +US-NY-12438,US,NY,12438,8,,,, +US-NY-12439,US,NY,12439,8,,,, +US-NY-12440,US,NY,12440,8,,,, +US-NY-12441,US,NY,12441,8,,,, +US-NY-12442,US,NY,12442,8,,,, +US-NY-12443,US,NY,12443,8,,,, +US-NY-12444,US,NY,12444,8,,,, +US-NY-12446,US,NY,12446,8,,,, +US-NY-12448,US,NY,12448,8,,,, +US-NY-12449,US,NY,12449,8,,,, +US-NY-12450,US,NY,12450,8,,,, +US-NY-12451,US,NY,12451,8,,,, +US-NY-12452,US,NY,12452,8,,,, +US-NY-12453,US,NY,12453,8,,,, +US-NY-12454,US,NY,12454,8,,,, +US-NY-12455,US,NY,12455,8,,,, +US-NY-12456,US,NY,12456,8,,,, +US-NY-12457,US,NY,12457,8,,,, +US-NY-12458,US,NY,12458,8,,,, +US-NY-12459,US,NY,12459,8,,,, +US-NY-12460,US,NY,12460,8,,,, +US-NY-12461,US,NY,12461,8,,,, +US-NY-12463,US,NY,12463,8,,,, +US-NY-12464,US,NY,12464,8,,,, +US-NY-12465,US,NY,12465,8,,,, +US-NY-12466,US,NY,12466,8,,,, +US-NY-12468,US,NY,12468,8,,,, +US-NY-12469,US,NY,12469,8,,,, +US-NY-12470,US,NY,12470,8,,,, +US-NY-12471,US,NY,12471,8,,,, +US-NY-12472,US,NY,12472,8,,,, +US-NY-12473,US,NY,12473,8,,,, +US-NY-12474,US,NY,12474,8,,,, +US-NY-12475,US,NY,12475,8,,,, +US-NY-12477,US,NY,12477,8,,,, +US-NY-12480,US,NY,12480,8,,,, +US-NY-12481,US,NY,12481,8,,,, +US-NY-12482,US,NY,12482,8,,,, +US-NY-12483,US,NY,12483,8,,,, +US-NY-12484,US,NY,12484,8,,,, +US-NY-12485,US,NY,12485,8,,,, +US-NY-12486,US,NY,12486,8,,,, +US-NY-12487,US,NY,12487,8,,,, +US-NY-12489,US,NY,12489,8,,,, +US-NY-12490,US,NY,12490,8,,,, +US-NY-12491,US,NY,12491,8,,,, +US-NY-12492,US,NY,12492,8,,,, +US-NY-12493,US,NY,12493,8,,,, +US-NY-12494,US,NY,12494,8,,,, +US-NY-12495,US,NY,12495,8,,,, +US-NY-12496,US,NY,12496,8,,,, +US-NY-12498,US,NY,12498,8,,,, +US-NY-12501,US,NY,12501,8.125,,,, +US-NY-12502,US,NY,12502,8,,,, +US-NY-12503,US,NY,12503,8,,,, +US-NY-12504,US,NY,12504,8.125,,,, +US-NY-12506,US,NY,12506,8.125,,,, +US-NY-12507,US,NY,12507,8.125,,,, +US-NY-12508,US,NY,12508,8.125,,,, +US-NY-12510,US,NY,12510,8.125,,,, +US-NY-12511,US,NY,12511,8.125,,,, +US-NY-12512,US,NY,12512,8.125,,,, +US-NY-12513,US,NY,12513,8,,,, +US-NY-12514,US,NY,12514,8.125,,,, +US-NY-12515,US,NY,12515,8,,,, +US-NY-12516,US,NY,12516,8,,,, +US-NY-12517,US,NY,12517,8,,,, +US-NY-12518,US,NY,12518,8.125,,,, +US-NY-12520,US,NY,12520,8.125,,,, +US-NY-12521,US,NY,12521,8,,,, +US-NY-12522,US,NY,12522,8.125,,,, +US-NY-12523,US,NY,12523,8,,,, +US-NY-12524,US,NY,12524,8.125,,,, +US-NY-12525,US,NY,12525,8,,,, +US-NY-12526,US,NY,12526,8,,,, +US-NY-12527,US,NY,12527,8.125,,,, +US-NY-12528,US,NY,12528,8,,,, +US-NY-12529,US,NY,12529,8,,,, +US-NY-12530,US,NY,12530,8,,,, +US-NY-12531,US,NY,12531,8.125,,,, +US-NY-12533,US,NY,12533,8.125,,,, +US-NY-12534,US,NY,12534,8,,,, +US-NY-12537,US,NY,12537,8.125,,,, +US-NY-12538,US,NY,12538,8.125,,,, +US-NY-12540,US,NY,12540,8.125,,,, +US-NY-12541,US,NY,12541,8,,,, +US-NY-12542,US,NY,12542,8,,,, +US-NY-12543,US,NY,12543,8.125,,,, +US-NY-12544,US,NY,12544,8,,,, +US-NY-12545,US,NY,12545,8.125,,,, +US-NY-12546,US,NY,12546,8.125,,,, +US-NY-12547,US,NY,12547,8,,,, +US-NY-12548,US,NY,12548,8,,,, +US-NY-12549,US,NY,12549,8.125,,,, +US-NY-12550,US,NY,12550,8.125,,,, +US-NY-12551,US,NY,12551,8.125,,,, +US-NY-12552,US,NY,12552,8.125,,,, +US-NY-12553,US,NY,12553,8.125,,,, +US-NY-12555,US,NY,12555,8.125,,,, +US-NY-12561,US,NY,12561,8,,,, +US-NY-12563,US,NY,12563,8.375,,,, +US-NY-12564,US,NY,12564,8.125,,,, +US-NY-12565,US,NY,12565,8,,,, +US-NY-12566,US,NY,12566,8,,,, +US-NY-12567,US,NY,12567,8.125,,,, +US-NY-12568,US,NY,12568,8,,,, +US-NY-12569,US,NY,12569,8.125,,,, +US-NY-12570,US,NY,12570,8.125,,,, +US-NY-12571,US,NY,12571,8.125,,,, +US-NY-12572,US,NY,12572,8.125,,,, +US-NY-12574,US,NY,12574,8.125,,,, +US-NY-12575,US,NY,12575,8.125,,,, +US-NY-12577,US,NY,12577,8.125,,,, +US-NY-12578,US,NY,12578,8.125,,,, +US-NY-12580,US,NY,12580,8.125,,,, +US-NY-12581,US,NY,12581,8.125,,,, +US-NY-12582,US,NY,12582,8.125,,,, +US-NY-12583,US,NY,12583,8.125,,,, +US-NY-12584,US,NY,12584,8.125,,,, +US-NY-12585,US,NY,12585,8.125,,,, +US-NY-12586,US,NY,12586,8.125,,,, +US-NY-12588,US,NY,12588,8,,,, +US-NY-12589,US,NY,12589,8,,,, +US-NY-12590,US,NY,12590,8.125,,,, +US-NY-12592,US,NY,12592,8.125,,,, +US-NY-12594,US,NY,12594,8.125,,,, +US-NY-12601,US,NY,12601,8.125,,,, +US-NY-12602,US,NY,12602,8.125,,,, +US-NY-12603,US,NY,12603,8.125,,,, +US-NY-12604,US,NY,12604,8.125,,,, +US-NY-12701,US,NY,12701,8,,,, +US-NY-12719,US,NY,12719,8,,,, +US-NY-12720,US,NY,12720,8,,,, +US-NY-12721,US,NY,12721,8,,,, +US-NY-12722,US,NY,12722,8,,,, +US-NY-12723,US,NY,12723,8,,,, +US-NY-12724,US,NY,12724,8,,,, +US-NY-12725,US,NY,12725,8,,,, +US-NY-12726,US,NY,12726,8,,,, +US-NY-12727,US,NY,12727,8,,,, +US-NY-12729,US,NY,12729,8.125,,,, +US-NY-12732,US,NY,12732,8,,,, +US-NY-12733,US,NY,12733,8,,,, +US-NY-12734,US,NY,12734,8,,,, +US-NY-12736,US,NY,12736,8,,,, +US-NY-12737,US,NY,12737,8,,,, +US-NY-12738,US,NY,12738,8,,,, +US-NY-12740,US,NY,12740,8,,,, +US-NY-12741,US,NY,12741,8,,,, +US-NY-12742,US,NY,12742,8,,,, +US-NY-12743,US,NY,12743,8,,,, +US-NY-12745,US,NY,12745,8,,,, +US-NY-12746,US,NY,12746,8.125,,,, +US-NY-12747,US,NY,12747,8,,,, +US-NY-12748,US,NY,12748,8,,,, +US-NY-12749,US,NY,12749,8,,,, +US-NY-12750,US,NY,12750,8,,,, +US-NY-12751,US,NY,12751,8,,,, +US-NY-12752,US,NY,12752,8,,,, +US-NY-12754,US,NY,12754,8,,,, +US-NY-12758,US,NY,12758,8,,,, +US-NY-12759,US,NY,12759,8,,,, +US-NY-12760,US,NY,12760,8,,,, +US-NY-12762,US,NY,12762,8,,,, +US-NY-12763,US,NY,12763,8,,,, +US-NY-12764,US,NY,12764,8,,,, +US-NY-12765,US,NY,12765,8,,,, +US-NY-12766,US,NY,12766,8,,,, +US-NY-12767,US,NY,12767,8,,,, +US-NY-12768,US,NY,12768,8,,,, +US-NY-12769,US,NY,12769,8,,,, +US-NY-12770,US,NY,12770,8,,,, +US-NY-12771,US,NY,12771,8.125,,,, +US-NY-12775,US,NY,12775,8,,,, +US-NY-12776,US,NY,12776,8,,,, +US-NY-12777,US,NY,12777,8,,,, +US-NY-12778,US,NY,12778,8,,,, +US-NY-12779,US,NY,12779,8,,,, +US-NY-12780,US,NY,12780,8.125,,,, +US-NY-12781,US,NY,12781,8,,,, +US-NY-12783,US,NY,12783,8,,,, +US-NY-12784,US,NY,12784,8,,,, +US-NY-12785,US,NY,12785,8.125,,,, +US-NY-12786,US,NY,12786,8,,,, +US-NY-12787,US,NY,12787,8,,,, +US-NY-12788,US,NY,12788,8,,,, +US-NY-12789,US,NY,12789,8,,,, +US-NY-12790,US,NY,12790,8,,,, +US-NY-12791,US,NY,12791,8,,,, +US-NY-12792,US,NY,12792,8,,,, +US-NY-12801,US,NY,12801,7,,,, +US-NY-12803,US,NY,12803,7,,,, +US-NY-12804,US,NY,12804,7,,,, +US-NY-12808,US,NY,12808,7,,,, +US-NY-12809,US,NY,12809,7,,,, +US-NY-12810,US,NY,12810,7,,,, +US-NY-12811,US,NY,12811,7,,,, +US-NY-12812,US,NY,12812,7,,,, +US-NY-12814,US,NY,12814,7,,,, +US-NY-12815,US,NY,12815,7,,,, +US-NY-12816,US,NY,12816,7,,,, +US-NY-12817,US,NY,12817,7,,,, +US-NY-12819,US,NY,12819,7,,,, +US-NY-12820,US,NY,12820,7,,,, +US-NY-12821,US,NY,12821,7,,,, +US-NY-12822,US,NY,12822,7,,,, +US-NY-12823,US,NY,12823,7,,,, +US-NY-12824,US,NY,12824,7,,,, +US-NY-12827,US,NY,12827,7,,,, +US-NY-12828,US,NY,12828,7,,,, +US-NY-12831,US,NY,12831,7,,,, +US-NY-12832,US,NY,12832,7,,,, +US-NY-12833,US,NY,12833,7,,,, +US-NY-12834,US,NY,12834,7,,,, +US-NY-12835,US,NY,12835,7,,,, +US-NY-12836,US,NY,12836,7,,,, +US-NY-12837,US,NY,12837,7,,,, +US-NY-12838,US,NY,12838,7,,,, +US-NY-12839,US,NY,12839,7,,,, +US-NY-12841,US,NY,12841,7,,,, +US-NY-12842,US,NY,12842,7,,,, +US-NY-12843,US,NY,12843,7,,,, +US-NY-12844,US,NY,12844,7,,,, +US-NY-12845,US,NY,12845,7,,,, +US-NY-12846,US,NY,12846,7,,,, +US-NY-12847,US,NY,12847,7,,,, +US-NY-12848,US,NY,12848,7,,,, +US-NY-12849,US,NY,12849,7,,,, +US-NY-12850,US,NY,12850,7,,,, +US-NY-12851,US,NY,12851,7.75,,,, +US-NY-12852,US,NY,12852,7.75,,,, +US-NY-12853,US,NY,12853,7,,,, +US-NY-12854,US,NY,12854,7,,,, +US-NY-12855,US,NY,12855,7.75,,,, +US-NY-12856,US,NY,12856,7,,,, +US-NY-12857,US,NY,12857,7.75,,,, +US-NY-12858,US,NY,12858,7.75,,,, +US-NY-12859,US,NY,12859,7,,,, +US-NY-12860,US,NY,12860,7,,,, +US-NY-12861,US,NY,12861,7,,,, +US-NY-12862,US,NY,12862,7,,,, +US-NY-12863,US,NY,12863,7,,,, +US-NY-12864,US,NY,12864,7,,,, +US-NY-12865,US,NY,12865,7,,,, +US-NY-12866,US,NY,12866,7,,,, +US-NY-12870,US,NY,12870,7.75,,,, +US-NY-12871,US,NY,12871,7,,,, +US-NY-12872,US,NY,12872,7.75,,,, +US-NY-12873,US,NY,12873,7,,,, +US-NY-12874,US,NY,12874,7,,,, +US-NY-12878,US,NY,12878,7,,,, +US-NY-12879,US,NY,12879,7.75,,,, +US-NY-12883,US,NY,12883,7.75,,,, +US-NY-12884,US,NY,12884,7,,,, +US-NY-12885,US,NY,12885,7,,,, +US-NY-12886,US,NY,12886,7,,,, +US-NY-12887,US,NY,12887,7,,,, +US-NY-12901,US,NY,12901,8,,,, +US-NY-12903,US,NY,12903,8,,,, +US-NY-12910,US,NY,12910,8,,,, +US-NY-12911,US,NY,12911,8,,,, +US-NY-12912,US,NY,12912,8,,,, +US-NY-12913,US,NY,12913,7.75,,,, +US-NY-12914,US,NY,12914,8,,,, +US-NY-12915,US,NY,12915,8,,,, +US-NY-12916,US,NY,12916,8,,,, +US-NY-12917,US,NY,12917,8,,,, +US-NY-12918,US,NY,12918,8,,,, +US-NY-12919,US,NY,12919,8,,,, +US-NY-12920,US,NY,12920,8,,,, +US-NY-12921,US,NY,12921,8,,,, +US-NY-12922,US,NY,12922,7,,,, +US-NY-12923,US,NY,12923,8,,,, +US-NY-12924,US,NY,12924,8,,,, +US-NY-12926,US,NY,12926,8,,,, +US-NY-12927,US,NY,12927,7,,,, +US-NY-12928,US,NY,12928,7.75,,,, +US-NY-12929,US,NY,12929,8,,,, +US-NY-12930,US,NY,12930,8,,,, +US-NY-12932,US,NY,12932,7.75,,,, +US-NY-12933,US,NY,12933,8,,,, +US-NY-12934,US,NY,12934,8,,,, +US-NY-12935,US,NY,12935,8,,,, +US-NY-12936,US,NY,12936,7.75,,,, +US-NY-12937,US,NY,12937,8,,,, +US-NY-12939,US,NY,12939,8,,,, +US-NY-12941,US,NY,12941,7.75,,,, +US-NY-12942,US,NY,12942,7.75,,,, +US-NY-12943,US,NY,12943,7.75,,,, +US-NY-12944,US,NY,12944,7.75,,,, +US-NY-12945,US,NY,12945,8,,,, +US-NY-12946,US,NY,12946,7.75,,,, +US-NY-12949,US,NY,12949,7,,,, +US-NY-12950,US,NY,12950,7.75,,,, +US-NY-12952,US,NY,12952,8,,,, +US-NY-12953,US,NY,12953,8,,,, +US-NY-12955,US,NY,12955,8,,,, +US-NY-12956,US,NY,12956,7.75,,,, +US-NY-12957,US,NY,12957,8,,,, +US-NY-12958,US,NY,12958,8,,,, +US-NY-12959,US,NY,12959,8,,,, +US-NY-12960,US,NY,12960,7.75,,,, +US-NY-12961,US,NY,12961,7.75,,,, +US-NY-12962,US,NY,12962,8,,,, +US-NY-12964,US,NY,12964,7.75,,,, +US-NY-12965,US,NY,12965,7,,,, +US-NY-12966,US,NY,12966,8,,,, +US-NY-12967,US,NY,12967,7,,,, +US-NY-12969,US,NY,12969,8,,,, +US-NY-12970,US,NY,12970,8,,,, +US-NY-12972,US,NY,12972,8,,,, +US-NY-12973,US,NY,12973,7,,,, +US-NY-12974,US,NY,12974,7.75,,,, +US-NY-12975,US,NY,12975,7.75,,,, +US-NY-12976,US,NY,12976,8,,,, +US-NY-12977,US,NY,12977,7.75,,,, +US-NY-12978,US,NY,12978,8,,,, +US-NY-12979,US,NY,12979,8,,,, +US-NY-12980,US,NY,12980,8,,,, +US-NY-12981,US,NY,12981,8,,,, +US-NY-12983,US,NY,12983,8,,,, +US-NY-12985,US,NY,12985,8,,,, +US-NY-12986,US,NY,12986,8,,,, +US-NY-12987,US,NY,12987,7.75,,,, +US-NY-12989,US,NY,12989,8,,,, +US-NY-12992,US,NY,12992,8,,,, +US-NY-12993,US,NY,12993,7.75,,,, +US-NY-12995,US,NY,12995,8,,,, +US-NY-12996,US,NY,12996,7.75,,,, +US-NY-12997,US,NY,12997,7.75,,,, +US-NY-12998,US,NY,12998,7.75,,,, +US-NY-13020,US,NY,13020,8,,,, +US-NY-13021,US,NY,13021,8,,,, +US-NY-13022,US,NY,13022,8,,,, +US-NY-13024,US,NY,13024,8,,,, +US-NY-13026,US,NY,13026,8,,,, +US-NY-13027,US,NY,13027,8,,,, +US-NY-13028,US,NY,13028,8,,,, +US-NY-13029,US,NY,13029,8,,,, +US-NY-13030,US,NY,13030,8,,,, +US-NY-13031,US,NY,13031,8,,,, +US-NY-13032,US,NY,13032,8,,,, +US-NY-13033,US,NY,13033,8,,,, +US-NY-13034,US,NY,13034,8,,,, +US-NY-13035,US,NY,13035,8,,,, +US-NY-13036,US,NY,13036,8,,,, +US-NY-13037,US,NY,13037,8,,,, +US-NY-13039,US,NY,13039,8,,,, +US-NY-13040,US,NY,13040,8,,,, +US-NY-13041,US,NY,13041,8,,,, +US-NY-13042,US,NY,13042,8.75,,,, +US-NY-13043,US,NY,13043,8,,,, +US-NY-13044,US,NY,13044,8,,,, +US-NY-13045,US,NY,13045,8,,,, +US-NY-13051,US,NY,13051,8,,,, +US-NY-13052,US,NY,13052,8,,,, +US-NY-13053,US,NY,13053,8,,,, +US-NY-13054,US,NY,13054,8.75,,,, +US-NY-13056,US,NY,13056,8,,,, +US-NY-13057,US,NY,13057,8,,,, +US-NY-13060,US,NY,13060,8,,,, +US-NY-13061,US,NY,13061,8,,,, +US-NY-13062,US,NY,13062,8,,,, +US-NY-13063,US,NY,13063,8,,,, +US-NY-13064,US,NY,13064,8,,,, +US-NY-13065,US,NY,13065,8,,,, +US-NY-13066,US,NY,13066,8,,,, +US-NY-13068,US,NY,13068,8,,,, +US-NY-13069,US,NY,13069,8,,,, +US-NY-13071,US,NY,13071,8,,,, +US-NY-13072,US,NY,13072,8,,,, +US-NY-13073,US,NY,13073,8,,,, +US-NY-13074,US,NY,13074,8,,,, +US-NY-13076,US,NY,13076,8,,,, +US-NY-13077,US,NY,13077,8,,,, +US-NY-13078,US,NY,13078,8,,,, +US-NY-13080,US,NY,13080,8,,,, +US-NY-13081,US,NY,13081,8,,,, +US-NY-13082,US,NY,13082,8,,,, +US-NY-13083,US,NY,13083,8,,,, +US-NY-13084,US,NY,13084,8,,,, +US-NY-13087,US,NY,13087,8,,,, +US-NY-13088,US,NY,13088,8,,,, +US-NY-13089,US,NY,13089,8,,,, +US-NY-13090,US,NY,13090,8,,,, +US-NY-13092,US,NY,13092,8,,,, +US-NY-13093,US,NY,13093,8,,,, +US-NY-13101,US,NY,13101,8,,,, +US-NY-13102,US,NY,13102,8,,,, +US-NY-13103,US,NY,13103,8,,,, +US-NY-13104,US,NY,13104,8,,,, +US-NY-13107,US,NY,13107,8,,,, +US-NY-13108,US,NY,13108,8,,,, +US-NY-13110,US,NY,13110,8,,,, +US-NY-13111,US,NY,13111,8,,,, +US-NY-13112,US,NY,13112,8,,,, +US-NY-13113,US,NY,13113,8,,,, +US-NY-13114,US,NY,13114,8,,,, +US-NY-13115,US,NY,13115,8,,,, +US-NY-13116,US,NY,13116,8,,,, +US-NY-13117,US,NY,13117,8,,,, +US-NY-13118,US,NY,13118,8,,,, +US-NY-13119,US,NY,13119,8,,,, +US-NY-13120,US,NY,13120,8,,,, +US-NY-13121,US,NY,13121,8,,,, +US-NY-13122,US,NY,13122,8,,,, +US-NY-13123,US,NY,13123,8.75,,,, +US-NY-13124,US,NY,13124,8,,,, +US-NY-13126,US,NY,13126,8,,,, +US-NY-13131,US,NY,13131,8,,,, +US-NY-13132,US,NY,13132,8,,,, +US-NY-13134,US,NY,13134,8,,,, +US-NY-13135,US,NY,13135,8,,,, +US-NY-13136,US,NY,13136,8,,,, +US-NY-13137,US,NY,13137,8,,,, +US-NY-13138,US,NY,13138,8,,,, +US-NY-13139,US,NY,13139,8,,,, +US-NY-13140,US,NY,13140,8,,,, +US-NY-13141,US,NY,13141,8,,,, +US-NY-13142,US,NY,13142,8,,,, +US-NY-13143,US,NY,13143,8,,,, +US-NY-13144,US,NY,13144,8,,,, +US-NY-13145,US,NY,13145,8,,,, +US-NY-13146,US,NY,13146,8,,,, +US-NY-13147,US,NY,13147,8,,,, +US-NY-13148,US,NY,13148,8,,,, +US-NY-13152,US,NY,13152,8,,,, +US-NY-13153,US,NY,13153,8,,,, +US-NY-13154,US,NY,13154,8,,,, +US-NY-13155,US,NY,13155,8,,,, +US-NY-13156,US,NY,13156,8,,,, +US-NY-13157,US,NY,13157,8.75,,,, +US-NY-13158,US,NY,13158,8,,,, +US-NY-13159,US,NY,13159,8,,,, +US-NY-13160,US,NY,13160,8,,,, +US-NY-13162,US,NY,13162,8.75,,,, +US-NY-13163,US,NY,13163,8,,,, +US-NY-13164,US,NY,13164,8,,,, +US-NY-13165,US,NY,13165,8,,,, +US-NY-13166,US,NY,13166,8,,,, +US-NY-13167,US,NY,13167,8,,,, +US-NY-13201,US,NY,13201,8,,,, +US-NY-13202,US,NY,13202,8,,,, +US-NY-13203,US,NY,13203,8,,,, +US-NY-13204,US,NY,13204,8,,,, +US-NY-13205,US,NY,13205,8,,,, +US-NY-13206,US,NY,13206,8,,,, +US-NY-13207,US,NY,13207,8,,,, +US-NY-13208,US,NY,13208,8,,,, +US-NY-13209,US,NY,13209,8,,,, +US-NY-13210,US,NY,13210,8,,,, +US-NY-13211,US,NY,13211,8,,,, +US-NY-13212,US,NY,13212,8,,,, +US-NY-13214,US,NY,13214,8,,,, +US-NY-13215,US,NY,13215,8,,,, +US-NY-13217,US,NY,13217,8,,,, +US-NY-13218,US,NY,13218,8,,,, +US-NY-13219,US,NY,13219,8,,,, +US-NY-13220,US,NY,13220,8,,,, +US-NY-13221,US,NY,13221,8,,,, +US-NY-13224,US,NY,13224,8,,,, +US-NY-13225,US,NY,13225,8,,,, +US-NY-13235,US,NY,13235,8,,,, +US-NY-13244,US,NY,13244,8,,,, +US-NY-13250,US,NY,13250,8,,,, +US-NY-13251,US,NY,13251,8,,,, +US-NY-13252,US,NY,13252,8,,,, +US-NY-13261,US,NY,13261,8,,,, +US-NY-13290,US,NY,13290,8,,,, +US-NY-13301,US,NY,13301,8.75,,,, +US-NY-13302,US,NY,13302,8,,,, +US-NY-13303,US,NY,13303,8.75,,,, +US-NY-13304,US,NY,13304,8.75,,,, +US-NY-13305,US,NY,13305,7.75,,,, +US-NY-13308,US,NY,13308,8.75,,,, +US-NY-13309,US,NY,13309,8.75,,,, +US-NY-13310,US,NY,13310,8,,,, +US-NY-13312,US,NY,13312,7.75,,,, +US-NY-13313,US,NY,13313,8.75,,,, +US-NY-13314,US,NY,13314,8,,,, +US-NY-13315,US,NY,13315,8,,,, +US-NY-13316,US,NY,13316,8.75,,,, +US-NY-13317,US,NY,13317,8,,,, +US-NY-13318,US,NY,13318,8.75,,,, +US-NY-13319,US,NY,13319,8.75,,,, +US-NY-13320,US,NY,13320,8,,,, +US-NY-13321,US,NY,13321,8.75,,,, +US-NY-13322,US,NY,13322,8.75,,,, +US-NY-13323,US,NY,13323,8.75,,,, +US-NY-13324,US,NY,13324,8.25,,,, +US-NY-13325,US,NY,13325,7.75,,,, +US-NY-13326,US,NY,13326,8,,,, +US-NY-13327,US,NY,13327,7.75,,,, +US-NY-13328,US,NY,13328,8.75,,,, +US-NY-13329,US,NY,13329,8.25,,,, +US-NY-13331,US,NY,13331,8.25,,,, +US-NY-13332,US,NY,13332,8,,,, +US-NY-13333,US,NY,13333,8,,,, +US-NY-13334,US,NY,13334,8,,,, +US-NY-13335,US,NY,13335,8,,,, +US-NY-13337,US,NY,13337,8,,,, +US-NY-13338,US,NY,13338,8.75,,,, +US-NY-13339,US,NY,13339,8,,,, +US-NY-13340,US,NY,13340,8.25,,,, +US-NY-13341,US,NY,13341,8.75,,,, +US-NY-13342,US,NY,13342,8,,,, +US-NY-13343,US,NY,13343,7.75,,,, +US-NY-13345,US,NY,13345,7.75,,,, +US-NY-13346,US,NY,13346,8,,,, +US-NY-13348,US,NY,13348,8,,,, +US-NY-13350,US,NY,13350,8.25,,,, +US-NY-13352,US,NY,13352,8.75,,,, +US-NY-13353,US,NY,13353,7,,,, +US-NY-13354,US,NY,13354,8.75,,,, +US-NY-13355,US,NY,13355,8,,,, +US-NY-13357,US,NY,13357,8.25,,,, +US-NY-13360,US,NY,13360,7,,,, +US-NY-13361,US,NY,13361,8.25,,,, +US-NY-13362,US,NY,13362,8.75,,,, +US-NY-13363,US,NY,13363,8.75,,,, +US-NY-13364,US,NY,13364,8,,,, +US-NY-13365,US,NY,13365,8.25,,,, +US-NY-13367,US,NY,13367,7.75,,,, +US-NY-13368,US,NY,13368,7.75,,,, +US-NY-13401,US,NY,13401,8.75,,,, +US-NY-13402,US,NY,13402,8,,,, +US-NY-13403,US,NY,13403,8.75,,,, +US-NY-13404,US,NY,13404,7.75,,,, +US-NY-13406,US,NY,13406,8.25,,,, +US-NY-13407,US,NY,13407,8.25,,,, +US-NY-13408,US,NY,13408,8,,,, +US-NY-13409,US,NY,13409,8,,,, +US-NY-13410,US,NY,13410,8,,,, +US-NY-13411,US,NY,13411,8,,,, +US-NY-13413,US,NY,13413,8.75,,,, +US-NY-13415,US,NY,13415,8,,,, +US-NY-13416,US,NY,13416,8.25,,,, +US-NY-13417,US,NY,13417,8.75,,,, +US-NY-13418,US,NY,13418,8,,,, +US-NY-13420,US,NY,13420,8.25,,,, +US-NY-13421,US,NY,13421,8,,,, +US-NY-13424,US,NY,13424,8.75,,,, +US-NY-13425,US,NY,13425,8.75,,,, +US-NY-13426,US,NY,13426,8,,,, +US-NY-13428,US,NY,13428,8,,,, +US-NY-13431,US,NY,13431,8.25,,,, +US-NY-13433,US,NY,13433,7.75,,,, +US-NY-13435,US,NY,13435,8.75,,,, +US-NY-13436,US,NY,13436,7,,,, +US-NY-13437,US,NY,13437,8,,,, +US-NY-13438,US,NY,13438,8.75,,,, +US-NY-13439,US,NY,13439,8,,,, +US-NY-13440,US,NY,13440,8.75,,,, +US-NY-13441,US,NY,13441,8.75,,,, +US-NY-13442,US,NY,13442,8.75,,,, +US-NY-13449,US,NY,13449,8.75,,,, +US-NY-13450,US,NY,13450,8,,,, +US-NY-13452,US,NY,13452,8,,,, +US-NY-13454,US,NY,13454,8.25,,,, +US-NY-13455,US,NY,13455,8.75,,,, +US-NY-13456,US,NY,13456,8.75,,,, +US-NY-13457,US,NY,13457,8,,,, +US-NY-13459,US,NY,13459,8,,,, +US-NY-13460,US,NY,13460,8,,,, +US-NY-13461,US,NY,13461,8.75,,,, +US-NY-13464,US,NY,13464,8,,,, +US-NY-13465,US,NY,13465,8,,,, +US-NY-13468,US,NY,13468,8,,,, +US-NY-13469,US,NY,13469,8.75,,,, +US-NY-13470,US,NY,13470,8,,,, +US-NY-13471,US,NY,13471,8.75,,,, +US-NY-13472,US,NY,13472,8.25,,,, +US-NY-13473,US,NY,13473,7.75,,,, +US-NY-13475,US,NY,13475,8,,,, +US-NY-13476,US,NY,13476,8.75,,,, +US-NY-13477,US,NY,13477,8.75,,,, +US-NY-13478,US,NY,13478,8.75,,,, +US-NY-13479,US,NY,13479,8.75,,,, +US-NY-13480,US,NY,13480,8.75,,,, +US-NY-13482,US,NY,13482,8,,,, +US-NY-13483,US,NY,13483,8.75,,,, +US-NY-13484,US,NY,13484,8,,,, +US-NY-13485,US,NY,13485,8,,,, +US-NY-13486,US,NY,13486,8.75,,,, +US-NY-13488,US,NY,13488,8,,,, +US-NY-13489,US,NY,13489,7.75,,,, +US-NY-13490,US,NY,13490,8.75,,,, +US-NY-13491,US,NY,13491,8.25,,,, +US-NY-13492,US,NY,13492,8.75,,,, +US-NY-13493,US,NY,13493,8,,,, +US-NY-13494,US,NY,13494,8.75,,,, +US-NY-13495,US,NY,13495,8.75,,,, +US-NY-13501,US,NY,13501,8.75,,,, +US-NY-13502,US,NY,13502,8.75,,,, +US-NY-13503,US,NY,13503,8.75,,,, +US-NY-13504,US,NY,13504,8.75,,,, +US-NY-13505,US,NY,13505,8.75,,,, +US-NY-13599,US,NY,13599,8.75,,,, +US-NY-13601,US,NY,13601,7.75,,,, +US-NY-13602,US,NY,13602,7.75,,,, +US-NY-13603,US,NY,13603,7.75,,,, +US-NY-13605,US,NY,13605,7.75,,,, +US-NY-13606,US,NY,13606,7.75,,,, +US-NY-13607,US,NY,13607,7.75,,,, +US-NY-13608,US,NY,13608,7.75,,,, +US-NY-13611,US,NY,13611,7.75,,,, +US-NY-13612,US,NY,13612,7.75,,,, +US-NY-13613,US,NY,13613,7,,,, +US-NY-13614,US,NY,13614,7,,,, +US-NY-13615,US,NY,13615,7.75,,,, +US-NY-13616,US,NY,13616,7.75,,,, +US-NY-13617,US,NY,13617,7,,,, +US-NY-13618,US,NY,13618,7.75,,,, +US-NY-13619,US,NY,13619,7.75,,,, +US-NY-13620,US,NY,13620,7.75,,,, +US-NY-13621,US,NY,13621,7,,,, +US-NY-13622,US,NY,13622,7.75,,,, +US-NY-13623,US,NY,13623,7,,,, +US-NY-13624,US,NY,13624,7.75,,,, +US-NY-13625,US,NY,13625,7,,,, +US-NY-13626,US,NY,13626,7.75,,,, +US-NY-13627,US,NY,13627,7.75,,,, +US-NY-13628,US,NY,13628,7.75,,,, +US-NY-13630,US,NY,13630,7,,,, +US-NY-13631,US,NY,13631,7.75,,,, +US-NY-13632,US,NY,13632,7.75,,,, +US-NY-13633,US,NY,13633,7,,,, +US-NY-13634,US,NY,13634,7.75,,,, +US-NY-13635,US,NY,13635,7,,,, +US-NY-13636,US,NY,13636,7.75,,,, +US-NY-13637,US,NY,13637,7.75,,,, +US-NY-13638,US,NY,13638,7.75,,,, +US-NY-13639,US,NY,13639,7,,,, +US-NY-13640,US,NY,13640,7.75,,,, +US-NY-13641,US,NY,13641,7.75,,,, +US-NY-13642,US,NY,13642,7,,,, +US-NY-13643,US,NY,13643,7.75,,,, +US-NY-13645,US,NY,13645,7,,,, +US-NY-13646,US,NY,13646,7,,,, +US-NY-13647,US,NY,13647,7,,,, +US-NY-13648,US,NY,13648,7.75,,,, +US-NY-13649,US,NY,13649,7,,,, +US-NY-13650,US,NY,13650,7.75,,,, +US-NY-13651,US,NY,13651,7.75,,,, +US-NY-13652,US,NY,13652,7,,,, +US-NY-13654,US,NY,13654,7,,,, +US-NY-13655,US,NY,13655,8,,,, +US-NY-13656,US,NY,13656,7.75,,,, +US-NY-13657,US,NY,13657,7.75,,,, +US-NY-13658,US,NY,13658,7,,,, +US-NY-13659,US,NY,13659,7.75,,,, +US-NY-13660,US,NY,13660,7,,,, +US-NY-13661,US,NY,13661,7.75,,,, +US-NY-13662,US,NY,13662,7,,,, +US-NY-13664,US,NY,13664,7,,,, +US-NY-13665,US,NY,13665,7.75,,,, +US-NY-13666,US,NY,13666,7,,,, +US-NY-13667,US,NY,13667,7,,,, +US-NY-13668,US,NY,13668,7,,,, +US-NY-13669,US,NY,13669,7,,,, +US-NY-13670,US,NY,13670,7,,,, +US-NY-13671,US,NY,13671,7.75,,,, +US-NY-13672,US,NY,13672,7,,,, +US-NY-13673,US,NY,13673,7.75,,,, +US-NY-13674,US,NY,13674,7.75,,,, +US-NY-13675,US,NY,13675,7.75,,,, +US-NY-13676,US,NY,13676,7,,,, +US-NY-13677,US,NY,13677,7,,,, +US-NY-13678,US,NY,13678,7,,,, +US-NY-13679,US,NY,13679,7.75,,,, +US-NY-13680,US,NY,13680,7,,,, +US-NY-13681,US,NY,13681,7,,,, +US-NY-13682,US,NY,13682,7.75,,,, +US-NY-13683,US,NY,13683,7,,,, +US-NY-13684,US,NY,13684,7,,,, +US-NY-13685,US,NY,13685,7.75,,,, +US-NY-13687,US,NY,13687,7,,,, +US-NY-13690,US,NY,13690,7,,,, +US-NY-13691,US,NY,13691,7.75,,,, +US-NY-13692,US,NY,13692,7.75,,,, +US-NY-13693,US,NY,13693,7.75,,,, +US-NY-13694,US,NY,13694,7,,,, +US-NY-13695,US,NY,13695,7,,,, +US-NY-13696,US,NY,13696,7,,,, +US-NY-13697,US,NY,13697,7,,,, +US-NY-13699,US,NY,13699,7,,,, +US-NY-13730,US,NY,13730,8,,,, +US-NY-13731,US,NY,13731,8,,,, +US-NY-13732,US,NY,13732,8,,,, +US-NY-13733,US,NY,13733,8,,,, +US-NY-13734,US,NY,13734,8,,,, +US-NY-13736,US,NY,13736,8,,,, +US-NY-13737,US,NY,13737,8,,,, +US-NY-13738,US,NY,13738,8,,,, +US-NY-13739,US,NY,13739,8,,,, +US-NY-13740,US,NY,13740,8,,,, +US-NY-13743,US,NY,13743,8,,,, +US-NY-13744,US,NY,13744,8,,,, +US-NY-13745,US,NY,13745,8,,,, +US-NY-13746,US,NY,13746,8,,,, +US-NY-13747,US,NY,13747,8,,,, +US-NY-13748,US,NY,13748,8,,,, +US-NY-13749,US,NY,13749,8,,,, +US-NY-13750,US,NY,13750,8,,,, +US-NY-13751,US,NY,13751,8,,,, +US-NY-13752,US,NY,13752,8,,,, +US-NY-13753,US,NY,13753,8,,,, +US-NY-13754,US,NY,13754,8,,,, +US-NY-13755,US,NY,13755,8,,,, +US-NY-13756,US,NY,13756,8,,,, +US-NY-13757,US,NY,13757,8,,,, +US-NY-13758,US,NY,13758,8,,,, +US-NY-13760,US,NY,13760,8,,,, +US-NY-13761,US,NY,13761,8,,,, +US-NY-13762,US,NY,13762,8,,,, +US-NY-13763,US,NY,13763,8,,,, +US-NY-13774,US,NY,13774,8,,,, +US-NY-13775,US,NY,13775,8,,,, +US-NY-13776,US,NY,13776,8,,,, +US-NY-13777,US,NY,13777,8,,,, +US-NY-13778,US,NY,13778,8,,,, +US-NY-13780,US,NY,13780,8,,,, +US-NY-13782,US,NY,13782,8,,,, +US-NY-13783,US,NY,13783,8,,,, +US-NY-13784,US,NY,13784,8,,,, +US-NY-13786,US,NY,13786,8,,,, +US-NY-13787,US,NY,13787,8,,,, +US-NY-13788,US,NY,13788,8,,,, +US-NY-13790,US,NY,13790,8,,,, +US-NY-13794,US,NY,13794,8,,,, +US-NY-13795,US,NY,13795,8,,,, +US-NY-13796,US,NY,13796,8,,,, +US-NY-13797,US,NY,13797,8,,,, +US-NY-13801,US,NY,13801,8,,,, +US-NY-13802,US,NY,13802,8,,,, +US-NY-13803,US,NY,13803,8,,,, +US-NY-13804,US,NY,13804,8,,,, +US-NY-13806,US,NY,13806,8,,,, +US-NY-13807,US,NY,13807,8,,,, +US-NY-13808,US,NY,13808,8,,,, +US-NY-13809,US,NY,13809,8,,,, +US-NY-13810,US,NY,13810,8,,,, +US-NY-13811,US,NY,13811,8,,,, +US-NY-13812,US,NY,13812,8,,,, +US-NY-13813,US,NY,13813,8,,,, +US-NY-13814,US,NY,13814,8,,,, +US-NY-13815,US,NY,13815,8,,,, +US-NY-13820,US,NY,13820,8,,,, +US-NY-13825,US,NY,13825,8,,,, +US-NY-13826,US,NY,13826,8,,,, +US-NY-13827,US,NY,13827,8,,,, +US-NY-13830,US,NY,13830,8,,,, +US-NY-13832,US,NY,13832,8,,,, +US-NY-13833,US,NY,13833,8,,,, +US-NY-13834,US,NY,13834,8,,,, +US-NY-13835,US,NY,13835,8,,,, +US-NY-13838,US,NY,13838,8,,,, +US-NY-13839,US,NY,13839,8,,,, +US-NY-13840,US,NY,13840,8,,,, +US-NY-13841,US,NY,13841,8,,,, +US-NY-13842,US,NY,13842,8,,,, +US-NY-13843,US,NY,13843,8,,,, +US-NY-13844,US,NY,13844,8,,,, +US-NY-13845,US,NY,13845,8,,,, +US-NY-13846,US,NY,13846,8,,,, +US-NY-13847,US,NY,13847,8,,,, +US-NY-13848,US,NY,13848,8,,,, +US-NY-13849,US,NY,13849,8,,,, +US-NY-13850,US,NY,13850,8,,,, +US-NY-13851,US,NY,13851,8,,,, +US-NY-13856,US,NY,13856,8,,,, +US-NY-13859,US,NY,13859,8,,,, +US-NY-13860,US,NY,13860,8,,,, +US-NY-13861,US,NY,13861,8,,,, +US-NY-13862,US,NY,13862,8,,,, +US-NY-13863,US,NY,13863,8,,,, +US-NY-13864,US,NY,13864,8,,,, +US-NY-13865,US,NY,13865,8,,,, +US-NY-13901,US,NY,13901,8,,,, +US-NY-13902,US,NY,13902,8,,,, +US-NY-13903,US,NY,13903,8,,,, +US-NY-13904,US,NY,13904,8,,,, +US-NY-13905,US,NY,13905,8,,,, +US-NY-14001,US,NY,14001,8.75,,,, +US-NY-14004,US,NY,14004,8.75,,,, +US-NY-14005,US,NY,14005,8,,,, +US-NY-14006,US,NY,14006,8.75,,,, +US-NY-14008,US,NY,14008,8,,,, +US-NY-14009,US,NY,14009,8,,,, +US-NY-14010,US,NY,14010,8.75,,,, +US-NY-14011,US,NY,14011,8,,,, +US-NY-14012,US,NY,14012,8,,,, +US-NY-14013,US,NY,14013,8,,,, +US-NY-14020,US,NY,14020,8,,,, +US-NY-14021,US,NY,14021,8,,,, +US-NY-14024,US,NY,14024,8,,,, +US-NY-14025,US,NY,14025,8.75,,,, +US-NY-14026,US,NY,14026,8.75,,,, +US-NY-14027,US,NY,14027,8.75,,,, +US-NY-14028,US,NY,14028,8,,,, +US-NY-14029,US,NY,14029,8.5,,,, +US-NY-14030,US,NY,14030,8.75,,,, +US-NY-14031,US,NY,14031,8.75,,,, +US-NY-14032,US,NY,14032,8.75,,,, +US-NY-14033,US,NY,14033,8.75,,,, +US-NY-14034,US,NY,14034,8.75,,,, +US-NY-14035,US,NY,14035,8.75,,,, +US-NY-14036,US,NY,14036,8,,,, +US-NY-14037,US,NY,14037,8,,,, +US-NY-14038,US,NY,14038,8.75,,,, +US-NY-14039,US,NY,14039,8,,,, +US-NY-14040,US,NY,14040,8,,,, +US-NY-14041,US,NY,14041,8,,,, +US-NY-14042,US,NY,14042,8,,,, +US-NY-14043,US,NY,14043,8.75,,,, +US-NY-14047,US,NY,14047,8.75,,,, +US-NY-14048,US,NY,14048,7.5,,,, +US-NY-14051,US,NY,14051,8.75,,,, +US-NY-14052,US,NY,14052,8.75,,,, +US-NY-14054,US,NY,14054,8,,,, +US-NY-14055,US,NY,14055,8.75,,,, +US-NY-14056,US,NY,14056,8,,,, +US-NY-14057,US,NY,14057,8.75,,,, +US-NY-14058,US,NY,14058,8,,,, +US-NY-14059,US,NY,14059,8.75,,,, +US-NY-14060,US,NY,14060,8.5,,,, +US-NY-14061,US,NY,14061,8.75,,,, +US-NY-14062,US,NY,14062,7.5,,,, +US-NY-14063,US,NY,14063,7.5,,,, +US-NY-14065,US,NY,14065,8,,,, +US-NY-14066,US,NY,14066,8,,,, +US-NY-14067,US,NY,14067,8,,,, +US-NY-14068,US,NY,14068,8.75,,,, +US-NY-14069,US,NY,14069,8.75,,,, +US-NY-14070,US,NY,14070,8,,,, +US-NY-14072,US,NY,14072,8.75,,,, +US-NY-14075,US,NY,14075,8.75,,,, +US-NY-14080,US,NY,14080,8.75,,,, +US-NY-14081,US,NY,14081,8.75,,,, +US-NY-14082,US,NY,14082,8,,,, +US-NY-14083,US,NY,14083,8,,,, +US-NY-14085,US,NY,14085,8.75,,,, +US-NY-14086,US,NY,14086,8.75,,,, +US-NY-14091,US,NY,14091,8.75,,,, +US-NY-14092,US,NY,14092,8,,,, +US-NY-14094,US,NY,14094,8,,,, +US-NY-14095,US,NY,14095,8,,,, +US-NY-14098,US,NY,14098,8,,,, +US-NY-14101,US,NY,14101,8,,,, +US-NY-14102,US,NY,14102,8.75,,,, +US-NY-14103,US,NY,14103,8,,,, +US-NY-14105,US,NY,14105,8,,,, +US-NY-14107,US,NY,14107,8,,,, +US-NY-14108,US,NY,14108,8,,,, +US-NY-14109,US,NY,14109,8,,,, +US-NY-14110,US,NY,14110,8.75,,,, +US-NY-14111,US,NY,14111,8.75,,,, +US-NY-14112,US,NY,14112,8.75,,,, +US-NY-14113,US,NY,14113,8,,,, +US-NY-14120,US,NY,14120,8,,,, +US-NY-14125,US,NY,14125,8,,,, +US-NY-14126,US,NY,14126,8,,,, +US-NY-14127,US,NY,14127,8.75,,,, +US-NY-14129,US,NY,14129,8,,,, +US-NY-14130,US,NY,14130,8,,,, +US-NY-14131,US,NY,14131,8,,,, +US-NY-14132,US,NY,14132,8,,,, +US-NY-14133,US,NY,14133,8,,,, +US-NY-14134,US,NY,14134,8.75,,,, +US-NY-14135,US,NY,14135,7.5,,,, +US-NY-14136,US,NY,14136,7.5,,,, +US-NY-14138,US,NY,14138,8,,,, +US-NY-14139,US,NY,14139,8.75,,,, +US-NY-14140,US,NY,14140,8.75,,,, +US-NY-14141,US,NY,14141,8.75,,,, +US-NY-14143,US,NY,14143,8,,,, +US-NY-14144,US,NY,14144,8,,,, +US-NY-14145,US,NY,14145,8,,,, +US-NY-14150,US,NY,14150,8.75,,,, +US-NY-14151,US,NY,14151,8.75,,,, +US-NY-14166,US,NY,14166,7.5,,,, +US-NY-14167,US,NY,14167,8,,,, +US-NY-14168,US,NY,14168,8,,,, +US-NY-14169,US,NY,14169,8.75,,,, +US-NY-14170,US,NY,14170,8.75,,,, +US-NY-14171,US,NY,14171,8,,,, +US-NY-14172,US,NY,14172,8,,,, +US-NY-14173,US,NY,14173,8,,,, +US-NY-14174,US,NY,14174,8,,,, +US-NY-14201,US,NY,14201,8.75,,,, +US-NY-14202,US,NY,14202,8.75,,,, +US-NY-14203,US,NY,14203,8.75,,,, +US-NY-14204,US,NY,14204,8.75,,,, +US-NY-14205,US,NY,14205,8.75,,,, +US-NY-14206,US,NY,14206,8.75,,,, +US-NY-14207,US,NY,14207,8.75,,,, +US-NY-14208,US,NY,14208,8.75,,,, +US-NY-14209,US,NY,14209,8.75,,,, +US-NY-14210,US,NY,14210,8.75,,,, +US-NY-14211,US,NY,14211,8.75,,,, +US-NY-14212,US,NY,14212,8.75,,,, +US-NY-14213,US,NY,14213,8.75,,,, +US-NY-14214,US,NY,14214,8.75,,,, +US-NY-14215,US,NY,14215,8.75,,,, +US-NY-14216,US,NY,14216,8.75,,,, +US-NY-14217,US,NY,14217,8.75,,,, +US-NY-14218,US,NY,14218,8.75,,,, +US-NY-14219,US,NY,14219,8.75,,,, +US-NY-14220,US,NY,14220,8.75,,,, +US-NY-14221,US,NY,14221,8.75,,,, +US-NY-14222,US,NY,14222,8.75,,,, +US-NY-14223,US,NY,14223,8.75,,,, +US-NY-14224,US,NY,14224,8.75,,,, +US-NY-14225,US,NY,14225,8.75,,,, +US-NY-14226,US,NY,14226,8.75,,,, +US-NY-14227,US,NY,14227,8.75,,,, +US-NY-14228,US,NY,14228,8.75,,,, +US-NY-14231,US,NY,14231,8.75,,,, +US-NY-14233,US,NY,14233,8.75,,,, +US-NY-14240,US,NY,14240,8.75,,,, +US-NY-14241,US,NY,14241,8.75,,,, +US-NY-14260,US,NY,14260,8.75,,,, +US-NY-14261,US,NY,14261,8.75,,,, +US-NY-14263,US,NY,14263,8.75,,,, +US-NY-14264,US,NY,14264,8.75,,,, +US-NY-14265,US,NY,14265,8.75,,,, +US-NY-14267,US,NY,14267,8.75,,,, +US-NY-14269,US,NY,14269,8.75,,,, +US-NY-14270,US,NY,14270,8.75,,,, +US-NY-14272,US,NY,14272,8.75,,,, +US-NY-14273,US,NY,14273,8.75,,,, +US-NY-14276,US,NY,14276,8.75,,,, +US-NY-14280,US,NY,14280,8.75,,,, +US-NY-14301,US,NY,14301,8,,,, +US-NY-14302,US,NY,14302,8,,,, +US-NY-14303,US,NY,14303,8,,,, +US-NY-14304,US,NY,14304,8,,,, +US-NY-14305,US,NY,14305,8,,,, +US-NY-14410,US,NY,14410,8,,,, +US-NY-14411,US,NY,14411,8,,,, +US-NY-14413,US,NY,14413,8,,,, +US-NY-14414,US,NY,14414,8,,,, +US-NY-14415,US,NY,14415,8,,,, +US-NY-14416,US,NY,14416,8,,,, +US-NY-14418,US,NY,14418,8,,,, +US-NY-14420,US,NY,14420,8,,,, +US-NY-14422,US,NY,14422,8,,,, +US-NY-14423,US,NY,14423,8,,,, +US-NY-14424,US,NY,14424,7.5,,,, +US-NY-14425,US,NY,14425,7.5,,,, +US-NY-14427,US,NY,14427,8,,,, +US-NY-14428,US,NY,14428,8,,,, +US-NY-14429,US,NY,14429,8,,,, +US-NY-14430,US,NY,14430,8,,,, +US-NY-14432,US,NY,14432,7.5,,,, +US-NY-14433,US,NY,14433,8,,,, +US-NY-14435,US,NY,14435,8,,,, +US-NY-14437,US,NY,14437,8,,,, +US-NY-14441,US,NY,14441,8,,,, +US-NY-14443,US,NY,14443,7.5,,,, +US-NY-14445,US,NY,14445,8,,,, +US-NY-14449,US,NY,14449,8,,,, +US-NY-14450,US,NY,14450,8,,,, +US-NY-14452,US,NY,14452,8,,,, +US-NY-14453,US,NY,14453,7.5,,,, +US-NY-14454,US,NY,14454,8,,,, +US-NY-14456,US,NY,14456,7.5,,,, +US-NY-14461,US,NY,14461,7.5,,,, +US-NY-14462,US,NY,14462,8,,,, +US-NY-14463,US,NY,14463,7.5,,,, +US-NY-14464,US,NY,14464,8,,,, +US-NY-14466,US,NY,14466,7.5,,,, +US-NY-14467,US,NY,14467,8,,,, +US-NY-14468,US,NY,14468,8,,,, +US-NY-14469,US,NY,14469,7.5,,,, +US-NY-14470,US,NY,14470,8,,,, +US-NY-14471,US,NY,14471,7.5,,,, +US-NY-14472,US,NY,14472,8,,,, +US-NY-14475,US,NY,14475,7.5,,,, +US-NY-14476,US,NY,14476,8,,,, +US-NY-14477,US,NY,14477,8,,,, +US-NY-14478,US,NY,14478,8,,,, +US-NY-14479,US,NY,14479,8,,,, +US-NY-14480,US,NY,14480,8,,,, +US-NY-14481,US,NY,14481,8,,,, +US-NY-14482,US,NY,14482,8,,,, +US-NY-14485,US,NY,14485,8,,,, +US-NY-14486,US,NY,14486,8,,,, +US-NY-14487,US,NY,14487,8,,,, +US-NY-14488,US,NY,14488,8,,,, +US-NY-14489,US,NY,14489,8,,,, +US-NY-14502,US,NY,14502,8,,,, +US-NY-14504,US,NY,14504,7.5,,,, +US-NY-14505,US,NY,14505,8,,,, +US-NY-14506,US,NY,14506,8,,,, +US-NY-14507,US,NY,14507,8,,,, +US-NY-14508,US,NY,14508,8,,,, +US-NY-14510,US,NY,14510,8,,,, +US-NY-14511,US,NY,14511,8,,,, +US-NY-14512,US,NY,14512,7.5,,,, +US-NY-14513,US,NY,14513,8,,,, +US-NY-14514,US,NY,14514,8,,,, +US-NY-14515,US,NY,14515,8,,,, +US-NY-14516,US,NY,14516,8,,,, +US-NY-14517,US,NY,14517,8,,,, +US-NY-14518,US,NY,14518,7.5,,,, +US-NY-14519,US,NY,14519,8,,,, +US-NY-14520,US,NY,14520,8,,,, +US-NY-14521,US,NY,14521,8,,,, +US-NY-14522,US,NY,14522,8,,,, +US-NY-14525,US,NY,14525,8,,,, +US-NY-14526,US,NY,14526,8,,,, +US-NY-14527,US,NY,14527,8,,,, +US-NY-14529,US,NY,14529,8,,,, +US-NY-14530,US,NY,14530,8,,,, +US-NY-14532,US,NY,14532,7.5,,,, +US-NY-14533,US,NY,14533,8,,,, +US-NY-14534,US,NY,14534,8,,,, +US-NY-14536,US,NY,14536,8,,,, +US-NY-14537,US,NY,14537,7.5,,,, +US-NY-14538,US,NY,14538,8,,,, +US-NY-14539,US,NY,14539,8,,,, +US-NY-14541,US,NY,14541,8,,,, +US-NY-14542,US,NY,14542,8,,,, +US-NY-14543,US,NY,14543,8,,,, +US-NY-14544,US,NY,14544,8,,,, +US-NY-14545,US,NY,14545,8,,,, +US-NY-14546,US,NY,14546,8,,,, +US-NY-14547,US,NY,14547,7.5,,,, +US-NY-14548,US,NY,14548,7.5,,,, +US-NY-14549,US,NY,14549,8,,,, +US-NY-14550,US,NY,14550,8,,,, +US-NY-14551,US,NY,14551,8,,,, +US-NY-14555,US,NY,14555,8,,,, +US-NY-14556,US,NY,14556,8,,,, +US-NY-14557,US,NY,14557,8,,,, +US-NY-14558,US,NY,14558,8,,,, +US-NY-14559,US,NY,14559,8,,,, +US-NY-14560,US,NY,14560,7.5,,,, +US-NY-14561,US,NY,14561,7.5,,,, +US-NY-14563,US,NY,14563,8,,,, +US-NY-14564,US,NY,14564,7.5,,,, +US-NY-14568,US,NY,14568,8,,,, +US-NY-14569,US,NY,14569,8,,,, +US-NY-14571,US,NY,14571,8,,,, +US-NY-14572,US,NY,14572,8,,,, +US-NY-14580,US,NY,14580,8,,,, +US-NY-14585,US,NY,14585,7.5,,,, +US-NY-14586,US,NY,14586,8,,,, +US-NY-14588,US,NY,14588,8,,,, +US-NY-14589,US,NY,14589,8,,,, +US-NY-14590,US,NY,14590,8,,,, +US-NY-14591,US,NY,14591,8,,,, +US-NY-14592,US,NY,14592,8,,,, +US-NY-14602,US,NY,14602,8,,,, +US-NY-14603,US,NY,14603,8,,,, +US-NY-14604,US,NY,14604,8,,,, +US-NY-14605,US,NY,14605,8,,,, +US-NY-14606,US,NY,14606,8,,,, +US-NY-14607,US,NY,14607,8,,,, +US-NY-14608,US,NY,14608,8,,,, +US-NY-14609,US,NY,14609,8,,,, +US-NY-14610,US,NY,14610,8,,,, +US-NY-14611,US,NY,14611,8,,,, +US-NY-14612,US,NY,14612,8,,,, +US-NY-14613,US,NY,14613,8,,,, +US-NY-14614,US,NY,14614,8,,,, +US-NY-14615,US,NY,14615,8,,,, +US-NY-14616,US,NY,14616,8,,,, +US-NY-14617,US,NY,14617,8,,,, +US-NY-14618,US,NY,14618,8,,,, +US-NY-14619,US,NY,14619,8,,,, +US-NY-14620,US,NY,14620,8,,,, +US-NY-14621,US,NY,14621,8,,,, +US-NY-14622,US,NY,14622,8,,,, +US-NY-14623,US,NY,14623,8,,,, +US-NY-14624,US,NY,14624,8,,,, +US-NY-14625,US,NY,14625,8,,,, +US-NY-14626,US,NY,14626,8,,,, +US-NY-14627,US,NY,14627,8,,,, +US-NY-14638,US,NY,14638,8,,,, +US-NY-14639,US,NY,14639,8,,,, +US-NY-14642,US,NY,14642,8,,,, +US-NY-14643,US,NY,14643,8,,,, +US-NY-14644,US,NY,14644,8,,,, +US-NY-14646,US,NY,14646,8,,,, +US-NY-14647,US,NY,14647,8,,,, +US-NY-14649,US,NY,14649,8,,,, +US-NY-14650,US,NY,14650,8,,,, +US-NY-14651,US,NY,14651,8,,,, +US-NY-14652,US,NY,14652,8,,,, +US-NY-14653,US,NY,14653,8,,,, +US-NY-14692,US,NY,14692,8,,,, +US-NY-14694,US,NY,14694,8,,,, +US-NY-14701,US,NY,14701,7.5,,,, +US-NY-14702,US,NY,14702,7.5,,,, +US-NY-14706,US,NY,14706,8,,,, +US-NY-14707,US,NY,14707,8.5,,,, +US-NY-14708,US,NY,14708,8.5,,,, +US-NY-14709,US,NY,14709,8.5,,,, +US-NY-14710,US,NY,14710,7.5,,,, +US-NY-14711,US,NY,14711,8.5,,,, +US-NY-14712,US,NY,14712,7.5,,,, +US-NY-14714,US,NY,14714,8.5,,,, +US-NY-14715,US,NY,14715,8.5,,,, +US-NY-14716,US,NY,14716,7.5,,,, +US-NY-14717,US,NY,14717,8.5,,,, +US-NY-14718,US,NY,14718,7.5,,,, +US-NY-14719,US,NY,14719,8,,,, +US-NY-14720,US,NY,14720,7.5,,,, +US-NY-14721,US,NY,14721,8.5,,,, +US-NY-14722,US,NY,14722,7.5,,,, +US-NY-14723,US,NY,14723,7.5,,,, +US-NY-14724,US,NY,14724,7.5,,,, +US-NY-14726,US,NY,14726,8,,,, +US-NY-14727,US,NY,14727,8.5,,,, +US-NY-14728,US,NY,14728,7.5,,,, +US-NY-14729,US,NY,14729,8,,,, +US-NY-14730,US,NY,14730,8,,,, +US-NY-14731,US,NY,14731,8,,,, +US-NY-14732,US,NY,14732,7.5,,,, +US-NY-14733,US,NY,14733,7.5,,,, +US-NY-14735,US,NY,14735,8.5,,,, +US-NY-14736,US,NY,14736,7.5,,,, +US-NY-14737,US,NY,14737,8,,,, +US-NY-14738,US,NY,14738,7.5,,,, +US-NY-14739,US,NY,14739,8.5,,,, +US-NY-14740,US,NY,14740,7.5,,,, +US-NY-14741,US,NY,14741,8,,,, +US-NY-14742,US,NY,14742,7.5,,,, +US-NY-14743,US,NY,14743,8,,,, +US-NY-14744,US,NY,14744,8.5,,,, +US-NY-14745,US,NY,14745,8.5,,,, +US-NY-14747,US,NY,14747,7.5,,,, +US-NY-14748,US,NY,14748,8,,,, +US-NY-14750,US,NY,14750,7.5,,,, +US-NY-14751,US,NY,14751,8,,,, +US-NY-14752,US,NY,14752,7.5,,,, +US-NY-14753,US,NY,14753,8,,,, +US-NY-14754,US,NY,14754,8.5,,,, +US-NY-14755,US,NY,14755,8,,,, +US-NY-14756,US,NY,14756,7.5,,,, +US-NY-14757,US,NY,14757,7.5,,,, +US-NY-14758,US,NY,14758,7.5,,,, +US-NY-14760,US,NY,14760,8,,,, +US-NY-14766,US,NY,14766,8,,,, +US-NY-14767,US,NY,14767,7.5,,,, +US-NY-14769,US,NY,14769,7.5,,,, +US-NY-14770,US,NY,14770,8,,,, +US-NY-14772,US,NY,14772,8,,,, +US-NY-14774,US,NY,14774,8.5,,,, +US-NY-14775,US,NY,14775,7.5,,,, +US-NY-14777,US,NY,14777,8.5,,,, +US-NY-14778,US,NY,14778,8,,,, +US-NY-14779,US,NY,14779,8,,,, +US-NY-14781,US,NY,14781,7.5,,,, +US-NY-14782,US,NY,14782,7.5,,,, +US-NY-14783,US,NY,14783,8,,,, +US-NY-14784,US,NY,14784,7.5,,,, +US-NY-14785,US,NY,14785,7.5,,,, +US-NY-14786,US,NY,14786,8.5,,,, +US-NY-14787,US,NY,14787,7.5,,,, +US-NY-14788,US,NY,14788,8,,,, +US-NY-14801,US,NY,14801,8,,,, +US-NY-14802,US,NY,14802,8.5,,,, +US-NY-14803,US,NY,14803,8.5,,,, +US-NY-14804,US,NY,14804,8.5,,,, +US-NY-14805,US,NY,14805,8,,,, +US-NY-14806,US,NY,14806,8.5,,,, +US-NY-14807,US,NY,14807,8,,,, +US-NY-14808,US,NY,14808,8,,,, +US-NY-14809,US,NY,14809,8,,,, +US-NY-14810,US,NY,14810,8,,,, +US-NY-14812,US,NY,14812,8,,,, +US-NY-14813,US,NY,14813,8.5,,,, +US-NY-14814,US,NY,14814,8,,,, +US-NY-14815,US,NY,14815,8,,,, +US-NY-14816,US,NY,14816,8,,,, +US-NY-14817,US,NY,14817,8,,,, +US-NY-14818,US,NY,14818,8,,,, +US-NY-14819,US,NY,14819,8,,,, +US-NY-14820,US,NY,14820,8,,,, +US-NY-14821,US,NY,14821,8,,,, +US-NY-14822,US,NY,14822,8.5,,,, +US-NY-14823,US,NY,14823,8,,,, +US-NY-14824,US,NY,14824,8,,,, +US-NY-14825,US,NY,14825,8,,,, +US-NY-14826,US,NY,14826,8,,,, +US-NY-14827,US,NY,14827,8,,,, +US-NY-14830,US,NY,14830,8,,,, +US-NY-14831,US,NY,14831,8,,,, +US-NY-14836,US,NY,14836,8,,,, +US-NY-14837,US,NY,14837,8,,,, +US-NY-14838,US,NY,14838,8,,,, +US-NY-14839,US,NY,14839,8,,,, +US-NY-14840,US,NY,14840,8,,,, +US-NY-14841,US,NY,14841,8,,,, +US-NY-14842,US,NY,14842,8,,,, +US-NY-14843,US,NY,14843,8,,,, +US-NY-14845,US,NY,14845,8,,,, +US-NY-14846,US,NY,14846,8,,,, +US-NY-14847,US,NY,14847,8,,,, +US-NY-14850,US,NY,14850,8,,,, +US-NY-14851,US,NY,14851,8,,,, +US-NY-14852,US,NY,14852,8,,,, +US-NY-14853,US,NY,14853,8,,,, +US-NY-14854,US,NY,14854,8,,,, +US-NY-14855,US,NY,14855,8,,,, +US-NY-14856,US,NY,14856,8,,,, +US-NY-14857,US,NY,14857,8,,,, +US-NY-14858,US,NY,14858,8,,,, +US-NY-14859,US,NY,14859,8,,,, +US-NY-14860,US,NY,14860,8,,,, +US-NY-14861,US,NY,14861,8,,,, +US-NY-14863,US,NY,14863,8,,,, +US-NY-14864,US,NY,14864,8,,,, +US-NY-14865,US,NY,14865,8,,,, +US-NY-14867,US,NY,14867,8,,,, +US-NY-14869,US,NY,14869,8,,,, +US-NY-14870,US,NY,14870,8,,,, +US-NY-14871,US,NY,14871,8,,,, +US-NY-14872,US,NY,14872,8,,,, +US-NY-14873,US,NY,14873,8,,,, +US-NY-14874,US,NY,14874,8,,,, +US-NY-14876,US,NY,14876,8,,,, +US-NY-14877,US,NY,14877,8,,,, +US-NY-14878,US,NY,14878,8,,,, +US-NY-14879,US,NY,14879,8,,,, +US-NY-14880,US,NY,14880,8.5,,,, +US-NY-14881,US,NY,14881,8,,,, +US-NY-14882,US,NY,14882,8,,,, +US-NY-14883,US,NY,14883,8,,,, +US-NY-14884,US,NY,14884,8.5,,,, +US-NY-14885,US,NY,14885,8,,,, +US-NY-14886,US,NY,14886,8,,,, +US-NY-14887,US,NY,14887,8,,,, +US-NY-14889,US,NY,14889,8,,,, +US-NY-14891,US,NY,14891,8,,,, +US-NY-14892,US,NY,14892,8,,,, +US-NY-14893,US,NY,14893,8,,,, +US-NY-14894,US,NY,14894,8,,,, +US-NY-14895,US,NY,14895,8.5,,,, +US-NY-14897,US,NY,14897,8.5,,,, +US-NY-14898,US,NY,14898,8,,,, +US-NY-14901,US,NY,14901,8,,,, +US-NY-14902,US,NY,14902,8,,,, +US-NY-14903,US,NY,14903,8,,,, +US-NY-14904,US,NY,14904,8,,,, +US-NY-14905,US,NY,14905,8,,,, +US-NY-14925,US,NY,14925,8,,,, +US-OH-43001,US,OH,43001,7.25,,,, +US-OH-43002,US,OH,43002,7,,,, +US-OH-43003,US,OH,43003,7,,,, +US-OH-43004,US,OH,43004,7,,,, +US-OH-43005,US,OH,43005,6.75,,,, +US-OH-43006,US,OH,43006,6.75,,,, +US-OH-43007,US,OH,43007,7,,,, +US-OH-43008,US,OH,43008,7.25,,,, +US-OH-43009,US,OH,43009,7.25,,,, +US-OH-43010,US,OH,43010,7.25,,,, +US-OH-43011,US,OH,43011,6.75,,,, +US-OH-43013,US,OH,43013,7.25,,,, +US-OH-43014,US,OH,43014,6.75,,,, +US-OH-43015,US,OH,43015,7,,,, +US-OH-43016,US,OH,43016,7,,,, +US-OH-43017,US,OH,43017,7,,,, +US-OH-43018,US,OH,43018,7.25,,,, +US-OH-43019,US,OH,43019,6.75,,,, +US-OH-43021,US,OH,43021,7,,,, +US-OH-43022,US,OH,43022,6.75,,,, +US-OH-43023,US,OH,43023,7.25,,,, +US-OH-43025,US,OH,43025,7.25,,,, +US-OH-43026,US,OH,43026,7,,,, +US-OH-43027,US,OH,43027,7.25,,,, +US-OH-43028,US,OH,43028,6.75,,,, +US-OH-43029,US,OH,43029,7,,,, +US-OH-43030,US,OH,43030,7.25,,,, +US-OH-43031,US,OH,43031,7.25,,,, +US-OH-43032,US,OH,43032,7,,,, +US-OH-43033,US,OH,43033,7.25,,,, +US-OH-43035,US,OH,43035,7,,,, +US-OH-43036,US,OH,43036,7,,,, +US-OH-43037,US,OH,43037,6.75,,,, +US-OH-43040,US,OH,43040,7,,,, +US-OH-43041,US,OH,43041,7,,,, +US-OH-43044,US,OH,43044,7.25,,,, +US-OH-43045,US,OH,43045,7,,,, +US-OH-43046,US,OH,43046,6.75,,,, +US-OH-43047,US,OH,43047,7.25,,,, +US-OH-43048,US,OH,43048,6.75,,,, +US-OH-43050,US,OH,43050,6.75,,,, +US-OH-43054,US,OH,43054,7,,,, +US-OH-43055,US,OH,43055,7.25,,,, +US-OH-43056,US,OH,43056,7.25,,,, +US-OH-43058,US,OH,43058,7.25,,,, +US-OH-43060,US,OH,43060,7.25,,,, +US-OH-43061,US,OH,43061,7,,,, +US-OH-43062,US,OH,43062,7.25,,,, +US-OH-43064,US,OH,43064,7,,,, +US-OH-43065,US,OH,43065,7,,,, +US-OH-43066,US,OH,43066,7,,,, +US-OH-43067,US,OH,43067,7,,,, +US-OH-43068,US,OH,43068,7,,,, +US-OH-43069,US,OH,43069,7.25,,,, +US-OH-43070,US,OH,43070,7.25,,,, +US-OH-43071,US,OH,43071,7.25,,,, +US-OH-43072,US,OH,43072,7.25,,,, +US-OH-43073,US,OH,43073,7.25,,,, +US-OH-43074,US,OH,43074,7,,,, +US-OH-43076,US,OH,43076,7.25,,,, +US-OH-43077,US,OH,43077,7,,,, +US-OH-43078,US,OH,43078,7.25,,,, +US-OH-43080,US,OH,43080,7.25,,,, +US-OH-43081,US,OH,43081,7,,,, +US-OH-43082,US,OH,43082,7,,,, +US-OH-43083,US,OH,43083,7.25,,,, +US-OH-43084,US,OH,43084,7.25,,,, +US-OH-43085,US,OH,43085,7,,,, +US-OH-43086,US,OH,43086,7,,,, +US-OH-43093,US,OH,43093,7.25,,,, +US-OH-43101,US,OH,43101,7.25,,,, +US-OH-43102,US,OH,43102,6.75,,,, +US-OH-43103,US,OH,43103,7.25,,,, +US-OH-43105,US,OH,43105,6.75,,,, +US-OH-43106,US,OH,43106,7.25,,,, +US-OH-43107,US,OH,43107,6.75,,,, +US-OH-43109,US,OH,43109,7,,,, +US-OH-43110,US,OH,43110,7,,,, +US-OH-43111,US,OH,43111,7,,,, +US-OH-43112,US,OH,43112,6.75,,,, +US-OH-43113,US,OH,43113,7.25,,,, +US-OH-43115,US,OH,43115,7.25,,,, +US-OH-43116,US,OH,43116,7.25,,,, +US-OH-43117,US,OH,43117,7.25,,,, +US-OH-43119,US,OH,43119,7,,,, +US-OH-43123,US,OH,43123,7,,,, +US-OH-43125,US,OH,43125,7,,,, +US-OH-43126,US,OH,43126,7,,,, +US-OH-43127,US,OH,43127,7,,,, +US-OH-43128,US,OH,43128,7.25,,,, +US-OH-43130,US,OH,43130,6.75,,,, +US-OH-43135,US,OH,43135,7,,,, +US-OH-43136,US,OH,43136,6.75,,,, +US-OH-43137,US,OH,43137,7,,,, +US-OH-43138,US,OH,43138,7,,,, +US-OH-43140,US,OH,43140,7,,,, +US-OH-43142,US,OH,43142,7.25,,,, +US-OH-43143,US,OH,43143,7,,,, +US-OH-43144,US,OH,43144,7,,,, +US-OH-43145,US,OH,43145,7.25,,,, +US-OH-43146,US,OH,43146,7.25,,,, +US-OH-43147,US,OH,43147,6.75,,,, +US-OH-43148,US,OH,43148,6.75,,,, +US-OH-43149,US,OH,43149,7,,,, +US-OH-43150,US,OH,43150,6.75,,,, +US-OH-43151,US,OH,43151,7,,,, +US-OH-43152,US,OH,43152,7,,,, +US-OH-43153,US,OH,43153,7,,,, +US-OH-43154,US,OH,43154,6.75,,,, +US-OH-43155,US,OH,43155,6.75,,,, +US-OH-43156,US,OH,43156,6.75,,,, +US-OH-43157,US,OH,43157,6.75,,,, +US-OH-43158,US,OH,43158,7,,,, +US-OH-43160,US,OH,43160,7.25,,,, +US-OH-43162,US,OH,43162,7,,,, +US-OH-43164,US,OH,43164,7.25,,,, +US-OH-43194,US,OH,43194,7,,,, +US-OH-43195,US,OH,43195,7,,,, +US-OH-43199,US,OH,43199,7,,,, +US-OH-43201,US,OH,43201,7,,,, +US-OH-43202,US,OH,43202,7,,,, +US-OH-43203,US,OH,43203,7,,,, +US-OH-43204,US,OH,43204,7,,,, +US-OH-43205,US,OH,43205,7,,,, +US-OH-43206,US,OH,43206,7,,,, +US-OH-43207,US,OH,43207,7,,,, +US-OH-43209,US,OH,43209,7,,,, +US-OH-43210,US,OH,43210,7,,,, +US-OH-43211,US,OH,43211,7,,,, +US-OH-43212,US,OH,43212,7,,,, +US-OH-43213,US,OH,43213,7,,,, +US-OH-43214,US,OH,43214,7,,,, +US-OH-43215,US,OH,43215,7,,,, +US-OH-43216,US,OH,43216,7,,,, +US-OH-43217,US,OH,43217,7,,,, +US-OH-43218,US,OH,43218,7,,,, +US-OH-43219,US,OH,43219,7,,,, +US-OH-43220,US,OH,43220,7,,,, +US-OH-43221,US,OH,43221,7,,,, +US-OH-43222,US,OH,43222,7,,,, +US-OH-43223,US,OH,43223,7,,,, +US-OH-43224,US,OH,43224,7,,,, +US-OH-43226,US,OH,43226,7,,,, +US-OH-43227,US,OH,43227,7,,,, +US-OH-43228,US,OH,43228,7,,,, +US-OH-43229,US,OH,43229,7,,,, +US-OH-43230,US,OH,43230,7,,,, +US-OH-43231,US,OH,43231,7,,,, +US-OH-43232,US,OH,43232,7,,,, +US-OH-43234,US,OH,43234,7,,,, +US-OH-43235,US,OH,43235,7,,,, +US-OH-43236,US,OH,43236,7,,,, +US-OH-43240,US,OH,43240,7.5,,,, +US-OH-43251,US,OH,43251,7,,,, +US-OH-43260,US,OH,43260,7,,,, +US-OH-43266,US,OH,43266,7,,,, +US-OH-43268,US,OH,43268,7,,,, +US-OH-43270,US,OH,43270,7,,,, +US-OH-43271,US,OH,43271,7,,,, +US-OH-43272,US,OH,43272,7,,,, +US-OH-43279,US,OH,43279,7,,,, +US-OH-43291,US,OH,43291,7,,,, +US-OH-43301,US,OH,43301,6.75,,,, +US-OH-43302,US,OH,43302,6.75,,,, +US-OH-43306,US,OH,43306,6.75,,,, +US-OH-43310,US,OH,43310,7.25,,,, +US-OH-43311,US,OH,43311,7.25,,,, +US-OH-43314,US,OH,43314,6.75,,,, +US-OH-43315,US,OH,43315,7.25,,,, +US-OH-43316,US,OH,43316,7.25,,,, +US-OH-43317,US,OH,43317,7.25,,,, +US-OH-43318,US,OH,43318,7.25,,,, +US-OH-43319,US,OH,43319,7.25,,,, +US-OH-43320,US,OH,43320,7.25,,,, +US-OH-43321,US,OH,43321,7.25,,,, +US-OH-43322,US,OH,43322,6.75,,,, +US-OH-43323,US,OH,43323,7.25,,,, +US-OH-43324,US,OH,43324,7.25,,,, +US-OH-43325,US,OH,43325,7.25,,,, +US-OH-43326,US,OH,43326,7.25,,,, +US-OH-43330,US,OH,43330,7.25,,,, +US-OH-43331,US,OH,43331,7.25,,,, +US-OH-43332,US,OH,43332,6.75,,,, +US-OH-43333,US,OH,43333,7.25,,,, +US-OH-43334,US,OH,43334,7.25,,,, +US-OH-43335,US,OH,43335,6.75,,,, +US-OH-43336,US,OH,43336,7.25,,,, +US-OH-43337,US,OH,43337,6.75,,,, +US-OH-43338,US,OH,43338,7.25,,,, +US-OH-43340,US,OH,43340,7.25,,,, +US-OH-43341,US,OH,43341,6.75,,,, +US-OH-43342,US,OH,43342,6.75,,,, +US-OH-43343,US,OH,43343,7.25,,,, +US-OH-43344,US,OH,43344,7,,,, +US-OH-43345,US,OH,43345,7.25,,,, +US-OH-43346,US,OH,43346,7.25,,,, +US-OH-43347,US,OH,43347,7.25,,,, +US-OH-43348,US,OH,43348,7.25,,,, +US-OH-43349,US,OH,43349,7.25,,,, +US-OH-43350,US,OH,43350,7.25,,,, +US-OH-43351,US,OH,43351,7.25,,,, +US-OH-43356,US,OH,43356,6.75,,,, +US-OH-43357,US,OH,43357,7.25,,,, +US-OH-43358,US,OH,43358,7.25,,,, +US-OH-43359,US,OH,43359,7.25,,,, +US-OH-43360,US,OH,43360,7.25,,,, +US-OH-43402,US,OH,43402,6.75,,,, +US-OH-43403,US,OH,43403,6.75,,,, +US-OH-43406,US,OH,43406,6.75,,,, +US-OH-43407,US,OH,43407,7.25,,,, +US-OH-43408,US,OH,43408,7,,,, +US-OH-43410,US,OH,43410,7.25,,,, +US-OH-43412,US,OH,43412,7,,,, +US-OH-43413,US,OH,43413,6.75,,,, +US-OH-43414,US,OH,43414,6.75,,,, +US-OH-43416,US,OH,43416,7,,,, +US-OH-43420,US,OH,43420,7.25,,,, +US-OH-43430,US,OH,43430,7,,,, +US-OH-43431,US,OH,43431,7.25,,,, +US-OH-43432,US,OH,43432,7,,,, +US-OH-43433,US,OH,43433,7,,,, +US-OH-43434,US,OH,43434,7,,,, +US-OH-43435,US,OH,43435,7.25,,,, +US-OH-43436,US,OH,43436,7,,,, +US-OH-43437,US,OH,43437,6.75,,,, +US-OH-43438,US,OH,43438,7,,,, +US-OH-43439,US,OH,43439,7,,,, +US-OH-43440,US,OH,43440,7,,,, +US-OH-43441,US,OH,43441,6.75,,,, +US-OH-43442,US,OH,43442,7.25,,,, +US-OH-43443,US,OH,43443,6.75,,,, +US-OH-43445,US,OH,43445,7,,,, +US-OH-43446,US,OH,43446,7,,,, +US-OH-43447,US,OH,43447,6.75,,,, +US-OH-43449,US,OH,43449,7,,,, +US-OH-43450,US,OH,43450,6.75,,,, +US-OH-43451,US,OH,43451,6.75,,,, +US-OH-43452,US,OH,43452,7,,,, +US-OH-43456,US,OH,43456,7,,,, +US-OH-43457,US,OH,43457,6.75,,,, +US-OH-43458,US,OH,43458,7,,,, +US-OH-43460,US,OH,43460,6.75,,,, +US-OH-43462,US,OH,43462,6.75,,,, +US-OH-43463,US,OH,43463,6.75,,,, +US-OH-43464,US,OH,43464,7.25,,,, +US-OH-43465,US,OH,43465,6.75,,,, +US-OH-43466,US,OH,43466,6.75,,,, +US-OH-43467,US,OH,43467,6.75,,,, +US-OH-43468,US,OH,43468,7,,,, +US-OH-43469,US,OH,43469,7.25,,,, +US-OH-43501,US,OH,43501,7.25,,,, +US-OH-43502,US,OH,43502,7.25,,,, +US-OH-43504,US,OH,43504,7,,,, +US-OH-43505,US,OH,43505,7.25,,,, +US-OH-43506,US,OH,43506,7.25,,,, +US-OH-43510,US,OH,43510,7.25,,,, +US-OH-43511,US,OH,43511,6.75,,,, +US-OH-43512,US,OH,43512,6.75,,,, +US-OH-43515,US,OH,43515,7.25,,,, +US-OH-43516,US,OH,43516,7.25,,,, +US-OH-43517,US,OH,43517,7.25,,,, +US-OH-43518,US,OH,43518,7.25,,,, +US-OH-43519,US,OH,43519,7.25,,,, +US-OH-43520,US,OH,43520,6.75,,,, +US-OH-43521,US,OH,43521,7.25,,,, +US-OH-43522,US,OH,43522,6.75,,,, +US-OH-43523,US,OH,43523,6.75,,,, +US-OH-43524,US,OH,43524,7.25,,,, +US-OH-43525,US,OH,43525,6.75,,,, +US-OH-43526,US,OH,43526,6.75,,,, +US-OH-43527,US,OH,43527,7.25,,,, +US-OH-43528,US,OH,43528,7,,,, +US-OH-43529,US,OH,43529,6.75,,,, +US-OH-43530,US,OH,43530,6.75,,,, +US-OH-43531,US,OH,43531,7.25,,,, +US-OH-43532,US,OH,43532,7.25,,,, +US-OH-43533,US,OH,43533,7.25,,,, +US-OH-43534,US,OH,43534,7.25,,,, +US-OH-43535,US,OH,43535,7.25,,,, +US-OH-43536,US,OH,43536,6.75,,,, +US-OH-43537,US,OH,43537,7,,,, +US-OH-43540,US,OH,43540,7.25,,,, +US-OH-43541,US,OH,43541,6.75,,,, +US-OH-43542,US,OH,43542,7,,,, +US-OH-43543,US,OH,43543,7.25,,,, +US-OH-43545,US,OH,43545,7.25,,,, +US-OH-43547,US,OH,43547,7,,,, +US-OH-43548,US,OH,43548,7.25,,,, +US-OH-43549,US,OH,43549,6.75,,,, +US-OH-43550,US,OH,43550,7.25,,,, +US-OH-43551,US,OH,43551,6.75,,,, +US-OH-43552,US,OH,43552,6.75,,,, +US-OH-43553,US,OH,43553,7.25,,,, +US-OH-43554,US,OH,43554,7.25,,,, +US-OH-43555,US,OH,43555,7.25,,,, +US-OH-43556,US,OH,43556,6.75,,,, +US-OH-43557,US,OH,43557,7.25,,,, +US-OH-43558,US,OH,43558,7.25,,,, +US-OH-43560,US,OH,43560,7,,,, +US-OH-43565,US,OH,43565,6.75,,,, +US-OH-43566,US,OH,43566,7,,,, +US-OH-43567,US,OH,43567,7.25,,,, +US-OH-43569,US,OH,43569,6.75,,,, +US-OH-43570,US,OH,43570,7.25,,,, +US-OH-43571,US,OH,43571,7,,,, +US-OH-43601,US,OH,43601,7,,,, +US-OH-43603,US,OH,43603,7,,,, +US-OH-43604,US,OH,43604,7,,,, +US-OH-43605,US,OH,43605,7,,,, +US-OH-43606,US,OH,43606,7,,,, +US-OH-43607,US,OH,43607,7,,,, +US-OH-43608,US,OH,43608,7,,,, +US-OH-43609,US,OH,43609,7,,,, +US-OH-43610,US,OH,43610,7,,,, +US-OH-43611,US,OH,43611,7,,,, +US-OH-43612,US,OH,43612,7,,,, +US-OH-43613,US,OH,43613,7,,,, +US-OH-43614,US,OH,43614,7,,,, +US-OH-43615,US,OH,43615,7,,,, +US-OH-43616,US,OH,43616,7,,,, +US-OH-43617,US,OH,43617,7,,,, +US-OH-43619,US,OH,43619,6.75,,,, +US-OH-43620,US,OH,43620,7,,,, +US-OH-43623,US,OH,43623,7,,,, +US-OH-43635,US,OH,43635,7,,,, +US-OH-43652,US,OH,43652,7,,,, +US-OH-43654,US,OH,43654,6.75,,,, +US-OH-43656,US,OH,43656,7,,,, +US-OH-43657,US,OH,43657,7,,,, +US-OH-43659,US,OH,43659,7,,,, +US-OH-43660,US,OH,43660,7,,,, +US-OH-43661,US,OH,43661,7,,,, +US-OH-43666,US,OH,43666,7,,,, +US-OH-43667,US,OH,43667,7,,,, +US-OH-43681,US,OH,43681,7,,,, +US-OH-43682,US,OH,43682,7,,,, +US-OH-43697,US,OH,43697,7,,,, +US-OH-43699,US,OH,43699,7,,,, +US-OH-43701,US,OH,43701,7.25,,,, +US-OH-43702,US,OH,43702,7.25,,,, +US-OH-43711,US,OH,43711,7.25,,,, +US-OH-43713,US,OH,43713,7.25,,,, +US-OH-43716,US,OH,43716,7.25,,,, +US-OH-43717,US,OH,43717,7.25,,,, +US-OH-43718,US,OH,43718,7.25,,,, +US-OH-43719,US,OH,43719,7.25,,,, +US-OH-43720,US,OH,43720,7.25,,,, +US-OH-43721,US,OH,43721,7.25,,,, +US-OH-43722,US,OH,43722,7.25,,,, +US-OH-43723,US,OH,43723,7.25,,,, +US-OH-43724,US,OH,43724,7.25,,,, +US-OH-43725,US,OH,43725,7.25,,,, +US-OH-43727,US,OH,43727,7.25,,,, +US-OH-43728,US,OH,43728,7.25,,,, +US-OH-43730,US,OH,43730,7.25,,,, +US-OH-43731,US,OH,43731,7.25,,,, +US-OH-43732,US,OH,43732,7.25,,,, +US-OH-43733,US,OH,43733,7.25,,,, +US-OH-43734,US,OH,43734,7.25,,,, +US-OH-43735,US,OH,43735,7.25,,,, +US-OH-43736,US,OH,43736,7.25,,,, +US-OH-43738,US,OH,43738,7.25,,,, +US-OH-43739,US,OH,43739,7.25,,,, +US-OH-43740,US,OH,43740,7.25,,,, +US-OH-43746,US,OH,43746,7.25,,,, +US-OH-43747,US,OH,43747,7.25,,,, +US-OH-43748,US,OH,43748,7.25,,,, +US-OH-43749,US,OH,43749,7.25,,,, +US-OH-43750,US,OH,43750,7.25,,,, +US-OH-43752,US,OH,43752,7.25,,,, +US-OH-43754,US,OH,43754,7.25,,,, +US-OH-43755,US,OH,43755,7.25,,,, +US-OH-43756,US,OH,43756,7.25,,,, +US-OH-43757,US,OH,43757,7.25,,,, +US-OH-43758,US,OH,43758,7.25,,,, +US-OH-43759,US,OH,43759,7.25,,,, +US-OH-43760,US,OH,43760,7.25,,,, +US-OH-43761,US,OH,43761,7.25,,,, +US-OH-43762,US,OH,43762,7.25,,,, +US-OH-43764,US,OH,43764,7.25,,,, +US-OH-43766,US,OH,43766,7.25,,,, +US-OH-43767,US,OH,43767,7.25,,,, +US-OH-43768,US,OH,43768,7.25,,,, +US-OH-43771,US,OH,43771,7.25,,,, +US-OH-43772,US,OH,43772,7.25,,,, +US-OH-43773,US,OH,43773,7.25,,,, +US-OH-43777,US,OH,43777,7.25,,,, +US-OH-43778,US,OH,43778,7.25,,,, +US-OH-43779,US,OH,43779,7.25,,,, +US-OH-43780,US,OH,43780,7.25,,,, +US-OH-43782,US,OH,43782,7.25,,,, +US-OH-43783,US,OH,43783,7.25,,,, +US-OH-43786,US,OH,43786,7.25,,,, +US-OH-43787,US,OH,43787,7.25,,,, +US-OH-43788,US,OH,43788,7.25,,,, +US-OH-43791,US,OH,43791,7.25,,,, +US-OH-43793,US,OH,43793,7.25,,,, +US-OH-43802,US,OH,43802,7.25,,,, +US-OH-43803,US,OH,43803,6.75,,,, +US-OH-43804,US,OH,43804,6.75,,,, +US-OH-43805,US,OH,43805,7.25,,,, +US-OH-43811,US,OH,43811,7.25,,,, +US-OH-43812,US,OH,43812,7.25,,,, +US-OH-43821,US,OH,43821,7.25,,,, +US-OH-43822,US,OH,43822,7.25,,,, +US-OH-43824,US,OH,43824,7.25,,,, +US-OH-43828,US,OH,43828,7.25,,,, +US-OH-43830,US,OH,43830,7.25,,,, +US-OH-43832,US,OH,43832,6.75,,,, +US-OH-43836,US,OH,43836,7.25,,,, +US-OH-43837,US,OH,43837,6.75,,,, +US-OH-43840,US,OH,43840,6.75,,,, +US-OH-43842,US,OH,43842,7.25,,,, +US-OH-43843,US,OH,43843,7.25,,,, +US-OH-43844,US,OH,43844,7.25,,,, +US-OH-43845,US,OH,43845,7.25,,,, +US-OH-43901,US,OH,43901,7.25,,,, +US-OH-43902,US,OH,43902,7.25,,,, +US-OH-43903,US,OH,43903,7.25,,,, +US-OH-43905,US,OH,43905,7.25,,,, +US-OH-43906,US,OH,43906,7.25,,,, +US-OH-43907,US,OH,43907,7.25,,,, +US-OH-43908,US,OH,43908,7.25,,,, +US-OH-43909,US,OH,43909,7.25,,,, +US-OH-43910,US,OH,43910,7.25,,,, +US-OH-43912,US,OH,43912,7.25,,,, +US-OH-43913,US,OH,43913,7.25,,,, +US-OH-43914,US,OH,43914,7.25,,,, +US-OH-43915,US,OH,43915,7.25,,,, +US-OH-43916,US,OH,43916,7.25,,,, +US-OH-43917,US,OH,43917,7.25,,,, +US-OH-43920,US,OH,43920,7.25,,,, +US-OH-43925,US,OH,43925,7.25,,,, +US-OH-43926,US,OH,43926,7.25,,,, +US-OH-43927,US,OH,43927,7.25,,,, +US-OH-43928,US,OH,43928,7.25,,,, +US-OH-43930,US,OH,43930,7.25,,,, +US-OH-43931,US,OH,43931,7.25,,,, +US-OH-43932,US,OH,43932,7.25,,,, +US-OH-43933,US,OH,43933,7.25,,,, +US-OH-43934,US,OH,43934,7.25,,,, +US-OH-43935,US,OH,43935,7.25,,,, +US-OH-43937,US,OH,43937,7.25,,,, +US-OH-43938,US,OH,43938,7.25,,,, +US-OH-43939,US,OH,43939,7.25,,,, +US-OH-43940,US,OH,43940,7.25,,,, +US-OH-43941,US,OH,43941,7.25,,,, +US-OH-43942,US,OH,43942,7.25,,,, +US-OH-43943,US,OH,43943,7.25,,,, +US-OH-43944,US,OH,43944,7.25,,,, +US-OH-43945,US,OH,43945,7.25,,,, +US-OH-43946,US,OH,43946,7.25,,,, +US-OH-43947,US,OH,43947,7.25,,,, +US-OH-43948,US,OH,43948,7.25,,,, +US-OH-43950,US,OH,43950,7.25,,,, +US-OH-43951,US,OH,43951,7.25,,,, +US-OH-43952,US,OH,43952,7.25,,,, +US-OH-43953,US,OH,43953,7.25,,,, +US-OH-43961,US,OH,43961,7.25,,,, +US-OH-43962,US,OH,43962,7.25,,,, +US-OH-43963,US,OH,43963,7.25,,,, +US-OH-43964,US,OH,43964,7.25,,,, +US-OH-43967,US,OH,43967,7.25,,,, +US-OH-43968,US,OH,43968,7.25,,,, +US-OH-43970,US,OH,43970,7.25,,,, +US-OH-43971,US,OH,43971,7.25,,,, +US-OH-43972,US,OH,43972,7.25,,,, +US-OH-43973,US,OH,43973,7.25,,,, +US-OH-43974,US,OH,43974,7.25,,,, +US-OH-43976,US,OH,43976,7.25,,,, +US-OH-43977,US,OH,43977,7.25,,,, +US-OH-43981,US,OH,43981,7.25,,,, +US-OH-43983,US,OH,43983,7.25,,,, +US-OH-43984,US,OH,43984,7.25,,,, +US-OH-43985,US,OH,43985,7.25,,,, +US-OH-43986,US,OH,43986,7.25,,,, +US-OH-43988,US,OH,43988,7.25,,,, +US-OH-44001,US,OH,44001,6.5,,,, +US-OH-44003,US,OH,44003,6.75,,,, +US-OH-44004,US,OH,44004,6.75,,,, +US-OH-44005,US,OH,44005,6.75,,,, +US-OH-44010,US,OH,44010,6.75,,,, +US-OH-44011,US,OH,44011,6.5,,,, +US-OH-44012,US,OH,44012,6.5,,,, +US-OH-44017,US,OH,44017,8,,,, +US-OH-44021,US,OH,44021,6.75,,,, +US-OH-44022,US,OH,44022,8,,,, +US-OH-44023,US,OH,44023,6.75,,,, +US-OH-44024,US,OH,44024,6.75,,,, +US-OH-44026,US,OH,44026,6.75,,,, +US-OH-44028,US,OH,44028,6.5,,,, +US-OH-44030,US,OH,44030,6.75,,,, +US-OH-44032,US,OH,44032,6.75,,,, +US-OH-44033,US,OH,44033,6.75,,,, +US-OH-44035,US,OH,44035,6.5,,,, +US-OH-44036,US,OH,44036,6.5,,,, +US-OH-44039,US,OH,44039,6.5,,,, +US-OH-44040,US,OH,44040,8,,,, +US-OH-44041,US,OH,44041,6.75,,,, +US-OH-44044,US,OH,44044,6.5,,,, +US-OH-44045,US,OH,44045,7,,,, +US-OH-44046,US,OH,44046,6.75,,,, +US-OH-44047,US,OH,44047,6.75,,,, +US-OH-44048,US,OH,44048,6.75,,,, +US-OH-44049,US,OH,44049,6.5,,,, +US-OH-44050,US,OH,44050,6.5,,,, +US-OH-44052,US,OH,44052,6.5,,,, +US-OH-44053,US,OH,44053,6.5,,,, +US-OH-44054,US,OH,44054,6.5,,,, +US-OH-44055,US,OH,44055,6.5,,,, +US-OH-44056,US,OH,44056,6.75,,,, +US-OH-44057,US,OH,44057,7,,,, +US-OH-44060,US,OH,44060,7,,,, +US-OH-44061,US,OH,44061,7,,,, +US-OH-44062,US,OH,44062,6.75,,,, +US-OH-44064,US,OH,44064,6.75,,,, +US-OH-44065,US,OH,44065,6.75,,,, +US-OH-44067,US,OH,44067,6.75,,,, +US-OH-44068,US,OH,44068,6.75,,,, +US-OH-44070,US,OH,44070,8,,,, +US-OH-44072,US,OH,44072,6.75,,,, +US-OH-44073,US,OH,44073,6.75,,,, +US-OH-44074,US,OH,44074,6.5,,,, +US-OH-44076,US,OH,44076,6.75,,,, +US-OH-44077,US,OH,44077,7,,,, +US-OH-44080,US,OH,44080,6.75,,,, +US-OH-44081,US,OH,44081,7,,,, +US-OH-44082,US,OH,44082,6.75,,,, +US-OH-44084,US,OH,44084,6.75,,,, +US-OH-44085,US,OH,44085,6.75,,,, +US-OH-44086,US,OH,44086,6.75,,,, +US-OH-44087,US,OH,44087,6.75,,,, +US-OH-44088,US,OH,44088,6.75,,,, +US-OH-44089,US,OH,44089,7.25,,,, +US-OH-44090,US,OH,44090,6.5,,,, +US-OH-44092,US,OH,44092,7,,,, +US-OH-44093,US,OH,44093,6.75,,,, +US-OH-44094,US,OH,44094,7,,,, +US-OH-44095,US,OH,44095,7,,,, +US-OH-44096,US,OH,44096,7,,,, +US-OH-44097,US,OH,44097,7,,,, +US-OH-44099,US,OH,44099,6.75,,,, +US-OH-44101,US,OH,44101,8,,,, +US-OH-44102,US,OH,44102,8,,,, +US-OH-44103,US,OH,44103,8,,,, +US-OH-44104,US,OH,44104,8,,,, +US-OH-44105,US,OH,44105,8,,,, +US-OH-44106,US,OH,44106,8,,,, +US-OH-44107,US,OH,44107,8,,,, +US-OH-44108,US,OH,44108,8,,,, +US-OH-44109,US,OH,44109,8,,,, +US-OH-44110,US,OH,44110,8,,,, +US-OH-44111,US,OH,44111,8,,,, +US-OH-44112,US,OH,44112,8,,,, +US-OH-44113,US,OH,44113,8,,,, +US-OH-44114,US,OH,44114,8,,,, +US-OH-44115,US,OH,44115,8,,,, +US-OH-44116,US,OH,44116,8,,,, +US-OH-44117,US,OH,44117,8,,,, +US-OH-44118,US,OH,44118,8,,,, +US-OH-44119,US,OH,44119,8,,,, +US-OH-44120,US,OH,44120,8,,,, +US-OH-44121,US,OH,44121,8,,,, +US-OH-44122,US,OH,44122,8,,,, +US-OH-44123,US,OH,44123,8,,,, +US-OH-44124,US,OH,44124,8,,,, +US-OH-44125,US,OH,44125,8,,,, +US-OH-44126,US,OH,44126,8,,,, +US-OH-44127,US,OH,44127,8,,,, +US-OH-44128,US,OH,44128,8,,,, +US-OH-44129,US,OH,44129,8,,,, +US-OH-44130,US,OH,44130,8,,,, +US-OH-44131,US,OH,44131,8,,,, +US-OH-44132,US,OH,44132,8,,,, +US-OH-44133,US,OH,44133,8,,,, +US-OH-44134,US,OH,44134,8,,,, +US-OH-44135,US,OH,44135,8,,,, +US-OH-44136,US,OH,44136,8,,,, +US-OH-44137,US,OH,44137,8,,,, +US-OH-44138,US,OH,44138,8,,,, +US-OH-44139,US,OH,44139,8,,,, +US-OH-44140,US,OH,44140,8,,,, +US-OH-44141,US,OH,44141,8,,,, +US-OH-44142,US,OH,44142,8,,,, +US-OH-44143,US,OH,44143,8,,,, +US-OH-44144,US,OH,44144,8,,,, +US-OH-44145,US,OH,44145,8,,,, +US-OH-44146,US,OH,44146,8,,,, +US-OH-44147,US,OH,44147,8,,,, +US-OH-44149,US,OH,44149,8,,,, +US-OH-44181,US,OH,44181,8,,,, +US-OH-44188,US,OH,44188,8,,,, +US-OH-44190,US,OH,44190,8,,,, +US-OH-44191,US,OH,44191,8,,,, +US-OH-44192,US,OH,44192,8,,,, +US-OH-44193,US,OH,44193,8,,,, +US-OH-44194,US,OH,44194,8,,,, +US-OH-44195,US,OH,44195,8,,,, +US-OH-44197,US,OH,44197,8,,,, +US-OH-44198,US,OH,44198,8,,,, +US-OH-44199,US,OH,44199,8,,,, +US-OH-44201,US,OH,44201,7,,,, +US-OH-44202,US,OH,44202,7,,,, +US-OH-44203,US,OH,44203,6.75,,,, +US-OH-44210,US,OH,44210,6.75,,,, +US-OH-44211,US,OH,44211,7,,,, +US-OH-44212,US,OH,44212,6.75,,,, +US-OH-44214,US,OH,44214,6.5,,,, +US-OH-44215,US,OH,44215,6.75,,,, +US-OH-44216,US,OH,44216,6.75,,,, +US-OH-44217,US,OH,44217,6.5,,,, +US-OH-44221,US,OH,44221,6.75,,,, +US-OH-44222,US,OH,44222,6.75,,,, +US-OH-44223,US,OH,44223,6.75,,,, +US-OH-44224,US,OH,44224,6.75,,,, +US-OH-44230,US,OH,44230,6.5,,,, +US-OH-44231,US,OH,44231,7,,,, +US-OH-44232,US,OH,44232,6.75,,,, +US-OH-44233,US,OH,44233,6.75,,,, +US-OH-44234,US,OH,44234,7,,,, +US-OH-44235,US,OH,44235,6.75,,,, +US-OH-44236,US,OH,44236,6.75,,,, +US-OH-44237,US,OH,44237,6.75,,,, +US-OH-44240,US,OH,44240,7,,,, +US-OH-44241,US,OH,44241,7,,,, +US-OH-44242,US,OH,44242,7,,,, +US-OH-44243,US,OH,44243,7,,,, +US-OH-44250,US,OH,44250,6.75,,,, +US-OH-44251,US,OH,44251,6.75,,,, +US-OH-44253,US,OH,44253,6.75,,,, +US-OH-44254,US,OH,44254,6.75,,,, +US-OH-44255,US,OH,44255,7,,,, +US-OH-44256,US,OH,44256,6.75,,,, +US-OH-44258,US,OH,44258,6.75,,,, +US-OH-44260,US,OH,44260,7,,,, +US-OH-44262,US,OH,44262,6.75,,,, +US-OH-44264,US,OH,44264,6.75,,,, +US-OH-44265,US,OH,44265,7,,,, +US-OH-44266,US,OH,44266,7,,,, +US-OH-44270,US,OH,44270,6.5,,,, +US-OH-44272,US,OH,44272,7,,,, +US-OH-44273,US,OH,44273,6.75,,,, +US-OH-44274,US,OH,44274,6.75,,,, +US-OH-44275,US,OH,44275,6.75,,,, +US-OH-44276,US,OH,44276,6.5,,,, +US-OH-44278,US,OH,44278,6.75,,,, +US-OH-44280,US,OH,44280,6.75,,,, +US-OH-44281,US,OH,44281,6.75,,,, +US-OH-44282,US,OH,44282,6.75,,,, +US-OH-44285,US,OH,44285,7,,,, +US-OH-44286,US,OH,44286,6.75,,,, +US-OH-44287,US,OH,44287,6.5,,,, +US-OH-44288,US,OH,44288,7,,,, +US-OH-44301,US,OH,44301,6.75,,,, +US-OH-44302,US,OH,44302,6.75,,,, +US-OH-44303,US,OH,44303,6.75,,,, +US-OH-44304,US,OH,44304,6.75,,,, +US-OH-44305,US,OH,44305,6.75,,,, +US-OH-44306,US,OH,44306,6.75,,,, +US-OH-44307,US,OH,44307,6.75,,,, +US-OH-44308,US,OH,44308,6.75,,,, +US-OH-44309,US,OH,44309,6.75,,,, +US-OH-44310,US,OH,44310,6.75,,,, +US-OH-44311,US,OH,44311,6.75,,,, +US-OH-44312,US,OH,44312,6.75,,,, +US-OH-44313,US,OH,44313,6.75,,,, +US-OH-44314,US,OH,44314,6.75,,,, +US-OH-44315,US,OH,44315,6.75,,,, +US-OH-44316,US,OH,44316,6.75,,,, +US-OH-44317,US,OH,44317,6.75,,,, +US-OH-44319,US,OH,44319,6.75,,,, +US-OH-44320,US,OH,44320,6.75,,,, +US-OH-44321,US,OH,44321,6.75,,,, +US-OH-44325,US,OH,44325,6.75,,,, +US-OH-44326,US,OH,44326,6.75,,,, +US-OH-44328,US,OH,44328,6.75,,,, +US-OH-44333,US,OH,44333,6.75,,,, +US-OH-44334,US,OH,44334,6.75,,,, +US-OH-44372,US,OH,44372,6.75,,,, +US-OH-44396,US,OH,44396,6.75,,,, +US-OH-44398,US,OH,44398,6.75,,,, +US-OH-44401,US,OH,44401,7,,,, +US-OH-44402,US,OH,44402,6.75,,,, +US-OH-44403,US,OH,44403,6.75,,,, +US-OH-44404,US,OH,44404,6.75,,,, +US-OH-44405,US,OH,44405,7,,,, +US-OH-44406,US,OH,44406,7,,,, +US-OH-44408,US,OH,44408,7.25,,,, +US-OH-44410,US,OH,44410,6.75,,,, +US-OH-44411,US,OH,44411,7,,,, +US-OH-44412,US,OH,44412,7,,,, +US-OH-44413,US,OH,44413,7.25,,,, +US-OH-44415,US,OH,44415,7.25,,,, +US-OH-44416,US,OH,44416,7,,,, +US-OH-44417,US,OH,44417,6.75,,,, +US-OH-44418,US,OH,44418,6.75,,,, +US-OH-44420,US,OH,44420,6.75,,,, +US-OH-44422,US,OH,44422,7,,,, +US-OH-44423,US,OH,44423,7.25,,,, +US-OH-44424,US,OH,44424,6.75,,,, +US-OH-44425,US,OH,44425,6.75,,,, +US-OH-44427,US,OH,44427,7.25,,,, +US-OH-44428,US,OH,44428,6.75,,,, +US-OH-44429,US,OH,44429,7,,,, +US-OH-44430,US,OH,44430,6.75,,,, +US-OH-44431,US,OH,44431,7.25,,,, +US-OH-44432,US,OH,44432,7.25,,,, +US-OH-44436,US,OH,44436,7,,,, +US-OH-44437,US,OH,44437,6.75,,,, +US-OH-44438,US,OH,44438,6.75,,,, +US-OH-44439,US,OH,44439,6.75,,,, +US-OH-44440,US,OH,44440,6.75,,,, +US-OH-44441,US,OH,44441,7.25,,,, +US-OH-44442,US,OH,44442,7,,,, +US-OH-44443,US,OH,44443,7,,,, +US-OH-44444,US,OH,44444,6.75,,,, +US-OH-44445,US,OH,44445,7.25,,,, +US-OH-44446,US,OH,44446,6.75,,,, +US-OH-44449,US,OH,44449,7,,,, +US-OH-44450,US,OH,44450,6.75,,,, +US-OH-44451,US,OH,44451,7,,,, +US-OH-44452,US,OH,44452,7,,,, +US-OH-44453,US,OH,44453,6.75,,,, +US-OH-44454,US,OH,44454,7,,,, +US-OH-44455,US,OH,44455,7.25,,,, +US-OH-44460,US,OH,44460,7.25,,,, +US-OH-44470,US,OH,44470,6.75,,,, +US-OH-44471,US,OH,44471,7,,,, +US-OH-44473,US,OH,44473,6.75,,,, +US-OH-44481,US,OH,44481,6.75,,,, +US-OH-44482,US,OH,44482,6.75,,,, +US-OH-44483,US,OH,44483,6.75,,,, +US-OH-44484,US,OH,44484,6.75,,,, +US-OH-44485,US,OH,44485,6.75,,,, +US-OH-44486,US,OH,44486,6.75,,,, +US-OH-44488,US,OH,44488,6.75,,,, +US-OH-44490,US,OH,44490,7.25,,,, +US-OH-44491,US,OH,44491,6.75,,,, +US-OH-44492,US,OH,44492,7.25,,,, +US-OH-44493,US,OH,44493,7.25,,,, +US-OH-44501,US,OH,44501,7,,,, +US-OH-44502,US,OH,44502,7,,,, +US-OH-44503,US,OH,44503,7,,,, +US-OH-44504,US,OH,44504,7,,,, +US-OH-44505,US,OH,44505,7,,,, +US-OH-44506,US,OH,44506,7,,,, +US-OH-44507,US,OH,44507,7,,,, +US-OH-44509,US,OH,44509,7,,,, +US-OH-44510,US,OH,44510,7,,,, +US-OH-44511,US,OH,44511,7,,,, +US-OH-44512,US,OH,44512,7,,,, +US-OH-44513,US,OH,44513,7,,,, +US-OH-44514,US,OH,44514,7,,,, +US-OH-44515,US,OH,44515,7,,,, +US-OH-44555,US,OH,44555,7,,,, +US-OH-44601,US,OH,44601,6.5,,,, +US-OH-44606,US,OH,44606,6.5,,,, +US-OH-44607,US,OH,44607,6.75,,,, +US-OH-44608,US,OH,44608,6.5,,,, +US-OH-44609,US,OH,44609,7,,,, +US-OH-44610,US,OH,44610,6.75,,,, +US-OH-44611,US,OH,44611,6.75,,,, +US-OH-44612,US,OH,44612,6.75,,,, +US-OH-44613,US,OH,44613,6.5,,,, +US-OH-44614,US,OH,44614,6.5,,,, +US-OH-44615,US,OH,44615,6.75,,,, +US-OH-44617,US,OH,44617,6.75,,,, +US-OH-44618,US,OH,44618,6.5,,,, +US-OH-44619,US,OH,44619,7,,,, +US-OH-44620,US,OH,44620,6.75,,,, +US-OH-44621,US,OH,44621,6.75,,,, +US-OH-44622,US,OH,44622,6.75,,,, +US-OH-44624,US,OH,44624,6.75,,,, +US-OH-44625,US,OH,44625,7.25,,,, +US-OH-44626,US,OH,44626,6.5,,,, +US-OH-44627,US,OH,44627,6.5,,,, +US-OH-44628,US,OH,44628,6.75,,,, +US-OH-44629,US,OH,44629,6.75,,,, +US-OH-44630,US,OH,44630,6.5,,,, +US-OH-44632,US,OH,44632,6.5,,,, +US-OH-44633,US,OH,44633,6.75,,,, +US-OH-44634,US,OH,44634,7.25,,,, +US-OH-44636,US,OH,44636,6.5,,,, +US-OH-44637,US,OH,44637,6.75,,,, +US-OH-44638,US,OH,44638,6.75,,,, +US-OH-44639,US,OH,44639,6.75,,,, +US-OH-44640,US,OH,44640,6.5,,,, +US-OH-44641,US,OH,44641,6.5,,,, +US-OH-44643,US,OH,44643,6.5,,,, +US-OH-44644,US,OH,44644,6.75,,,, +US-OH-44645,US,OH,44645,6.5,,,, +US-OH-44646,US,OH,44646,6.5,,,, +US-OH-44647,US,OH,44647,6.5,,,, +US-OH-44648,US,OH,44648,6.5,,,, +US-OH-44650,US,OH,44650,6.5,,,, +US-OH-44651,US,OH,44651,6.75,,,, +US-OH-44652,US,OH,44652,6.5,,,, +US-OH-44653,US,OH,44653,6.75,,,, +US-OH-44654,US,OH,44654,6.75,,,, +US-OH-44656,US,OH,44656,6.75,,,, +US-OH-44657,US,OH,44657,6.5,,,, +US-OH-44659,US,OH,44659,6.5,,,, +US-OH-44660,US,OH,44660,6.75,,,, +US-OH-44661,US,OH,44661,6.75,,,, +US-OH-44662,US,OH,44662,6.5,,,, +US-OH-44663,US,OH,44663,6.75,,,, +US-OH-44665,US,OH,44665,7.25,,,, +US-OH-44666,US,OH,44666,6.5,,,, +US-OH-44667,US,OH,44667,6.5,,,, +US-OH-44669,US,OH,44669,6.5,,,, +US-OH-44670,US,OH,44670,6.5,,,, +US-OH-44671,US,OH,44671,6.75,,,, +US-OH-44672,US,OH,44672,7,,,, +US-OH-44675,US,OH,44675,6.75,,,, +US-OH-44676,US,OH,44676,6.5,,,, +US-OH-44677,US,OH,44677,6.5,,,, +US-OH-44678,US,OH,44678,6.75,,,, +US-OH-44679,US,OH,44679,6.75,,,, +US-OH-44680,US,OH,44680,6.75,,,, +US-OH-44681,US,OH,44681,6.75,,,, +US-OH-44682,US,OH,44682,6.75,,,, +US-OH-44683,US,OH,44683,6.75,,,, +US-OH-44685,US,OH,44685,6.5,,,, +US-OH-44687,US,OH,44687,6.75,,,, +US-OH-44688,US,OH,44688,6.5,,,, +US-OH-44689,US,OH,44689,6.5,,,, +US-OH-44690,US,OH,44690,6.75,,,, +US-OH-44691,US,OH,44691,6.5,,,, +US-OH-44693,US,OH,44693,7.25,,,, +US-OH-44695,US,OH,44695,7.25,,,, +US-OH-44697,US,OH,44697,6.75,,,, +US-OH-44699,US,OH,44699,7.25,,,, +US-OH-44701,US,OH,44701,6.5,,,, +US-OH-44702,US,OH,44702,6.5,,,, +US-OH-44703,US,OH,44703,6.5,,,, +US-OH-44704,US,OH,44704,6.5,,,, +US-OH-44705,US,OH,44705,6.5,,,, +US-OH-44706,US,OH,44706,6.5,,,, +US-OH-44707,US,OH,44707,6.5,,,, +US-OH-44708,US,OH,44708,6.5,,,, +US-OH-44709,US,OH,44709,6.5,,,, +US-OH-44710,US,OH,44710,6.5,,,, +US-OH-44711,US,OH,44711,6.5,,,, +US-OH-44714,US,OH,44714,6.5,,,, +US-OH-44718,US,OH,44718,6.5,,,, +US-OH-44720,US,OH,44720,6.5,,,, +US-OH-44721,US,OH,44721,6.5,,,, +US-OH-44730,US,OH,44730,6.5,,,, +US-OH-44735,US,OH,44735,6.5,,,, +US-OH-44750,US,OH,44750,6.5,,,, +US-OH-44767,US,OH,44767,6.5,,,, +US-OH-44799,US,OH,44799,6.5,,,, +US-OH-44802,US,OH,44802,7.25,,,, +US-OH-44804,US,OH,44804,6.75,,,, +US-OH-44805,US,OH,44805,7,,,, +US-OH-44807,US,OH,44807,7.25,,,, +US-OH-44809,US,OH,44809,7.25,,,, +US-OH-44811,US,OH,44811,7.25,,,, +US-OH-44813,US,OH,44813,7,,,, +US-OH-44814,US,OH,44814,7.25,,,, +US-OH-44815,US,OH,44815,7.25,,,, +US-OH-44816,US,OH,44816,7.25,,,, +US-OH-44817,US,OH,44817,6.75,,,, +US-OH-44818,US,OH,44818,7.25,,,, +US-OH-44820,US,OH,44820,7.25,,,, +US-OH-44822,US,OH,44822,7,,,, +US-OH-44824,US,OH,44824,7.25,,,, +US-OH-44825,US,OH,44825,7.25,,,, +US-OH-44826,US,OH,44826,7.25,,,, +US-OH-44827,US,OH,44827,7.25,,,, +US-OH-44828,US,OH,44828,7.25,,,, +US-OH-44830,US,OH,44830,7.25,,,, +US-OH-44833,US,OH,44833,7.25,,,, +US-OH-44836,US,OH,44836,7.25,,,, +US-OH-44837,US,OH,44837,7.25,,,, +US-OH-44838,US,OH,44838,7,,,, +US-OH-44839,US,OH,44839,7.25,,,, +US-OH-44840,US,OH,44840,7,,,, +US-OH-44841,US,OH,44841,7.25,,,, +US-OH-44842,US,OH,44842,7,,,, +US-OH-44843,US,OH,44843,7,,,, +US-OH-44844,US,OH,44844,7.25,,,, +US-OH-44845,US,OH,44845,7.25,,,, +US-OH-44846,US,OH,44846,7.25,,,, +US-OH-44847,US,OH,44847,7.25,,,, +US-OH-44848,US,OH,44848,7,,,, +US-OH-44849,US,OH,44849,7.25,,,, +US-OH-44850,US,OH,44850,7.25,,,, +US-OH-44851,US,OH,44851,7.25,,,, +US-OH-44853,US,OH,44853,7.25,,,, +US-OH-44854,US,OH,44854,7.25,,,, +US-OH-44855,US,OH,44855,7.25,,,, +US-OH-44856,US,OH,44856,7.25,,,, +US-OH-44857,US,OH,44857,7.25,,,, +US-OH-44859,US,OH,44859,7,,,, +US-OH-44860,US,OH,44860,7.25,,,, +US-OH-44861,US,OH,44861,7.25,,,, +US-OH-44862,US,OH,44862,7,,,, +US-OH-44864,US,OH,44864,7,,,, +US-OH-44865,US,OH,44865,7,,,, +US-OH-44866,US,OH,44866,7,,,, +US-OH-44867,US,OH,44867,7.25,,,, +US-OH-44870,US,OH,44870,7.25,,,, +US-OH-44871,US,OH,44871,7.25,,,, +US-OH-44874,US,OH,44874,7,,,, +US-OH-44875,US,OH,44875,7,,,, +US-OH-44878,US,OH,44878,7,,,, +US-OH-44880,US,OH,44880,7,,,, +US-OH-44881,US,OH,44881,7.25,,,, +US-OH-44882,US,OH,44882,7.25,,,, +US-OH-44883,US,OH,44883,7.25,,,, +US-OH-44887,US,OH,44887,7.25,,,, +US-OH-44888,US,OH,44888,7.25,,,, +US-OH-44889,US,OH,44889,7.25,,,, +US-OH-44890,US,OH,44890,7.25,,,, +US-OH-44901,US,OH,44901,7,,,, +US-OH-44902,US,OH,44902,7,,,, +US-OH-44903,US,OH,44903,7,,,, +US-OH-44904,US,OH,44904,7,,,, +US-OH-44905,US,OH,44905,7,,,, +US-OH-44906,US,OH,44906,7,,,, +US-OH-44907,US,OH,44907,7,,,, +US-OH-45001,US,OH,45001,6.75,,,, +US-OH-45002,US,OH,45002,6.75,,,, +US-OH-45003,US,OH,45003,7.25,,,, +US-OH-45004,US,OH,45004,6.5,,,, +US-OH-45005,US,OH,45005,6.75,,,, +US-OH-45011,US,OH,45011,6.5,,,, +US-OH-45012,US,OH,45012,6.5,,,, +US-OH-45013,US,OH,45013,6.5,,,, +US-OH-45014,US,OH,45014,6.5,,,, +US-OH-45015,US,OH,45015,6.5,,,, +US-OH-45018,US,OH,45018,6.5,,,, +US-OH-45030,US,OH,45030,6.75,,,, +US-OH-45032,US,OH,45032,6.75,,,, +US-OH-45033,US,OH,45033,6.75,,,, +US-OH-45034,US,OH,45034,6.75,,,, +US-OH-45036,US,OH,45036,6.75,,,, +US-OH-45039,US,OH,45039,6.75,,,, +US-OH-45040,US,OH,45040,6.75,,,, +US-OH-45041,US,OH,45041,6.75,,,, +US-OH-45042,US,OH,45042,6.5,,,, +US-OH-45044,US,OH,45044,6.5,,,, +US-OH-45050,US,OH,45050,6.5,,,, +US-OH-45051,US,OH,45051,6.75,,,, +US-OH-45052,US,OH,45052,6.75,,,, +US-OH-45053,US,OH,45053,6.5,,,, +US-OH-45054,US,OH,45054,6.75,,,, +US-OH-45055,US,OH,45055,6.5,,,, +US-OH-45056,US,OH,45056,6.5,,,, +US-OH-45061,US,OH,45061,6.5,,,, +US-OH-45062,US,OH,45062,6.5,,,, +US-OH-45063,US,OH,45063,6.5,,,, +US-OH-45064,US,OH,45064,7.25,,,, +US-OH-45065,US,OH,45065,6.75,,,, +US-OH-45066,US,OH,45066,6.75,,,, +US-OH-45067,US,OH,45067,6.5,,,, +US-OH-45068,US,OH,45068,6.75,,,, +US-OH-45069,US,OH,45069,6.5,,,, +US-OH-45070,US,OH,45070,7.25,,,, +US-OH-45071,US,OH,45071,6.5,,,, +US-OH-45101,US,OH,45101,7.25,,,, +US-OH-45102,US,OH,45102,6.75,,,, +US-OH-45103,US,OH,45103,6.75,,,, +US-OH-45105,US,OH,45105,7.25,,,, +US-OH-45106,US,OH,45106,6.75,,,, +US-OH-45107,US,OH,45107,7.25,,,, +US-OH-45111,US,OH,45111,6.75,,,, +US-OH-45112,US,OH,45112,6.75,,,, +US-OH-45113,US,OH,45113,7.25,,,, +US-OH-45114,US,OH,45114,7.25,,,, +US-OH-45115,US,OH,45115,7.25,,,, +US-OH-45118,US,OH,45118,7.25,,,, +US-OH-45119,US,OH,45119,7.25,,,, +US-OH-45120,US,OH,45120,6.75,,,, +US-OH-45121,US,OH,45121,7.25,,,, +US-OH-45122,US,OH,45122,6.75,,,, +US-OH-45123,US,OH,45123,7.25,,,, +US-OH-45130,US,OH,45130,7.25,,,, +US-OH-45131,US,OH,45131,7.25,,,, +US-OH-45132,US,OH,45132,7.25,,,, +US-OH-45133,US,OH,45133,7.25,,,, +US-OH-45135,US,OH,45135,7.25,,,, +US-OH-45138,US,OH,45138,7.25,,,, +US-OH-45140,US,OH,45140,6.75,,,, +US-OH-45142,US,OH,45142,7.25,,,, +US-OH-45144,US,OH,45144,7.25,,,, +US-OH-45146,US,OH,45146,7.25,,,, +US-OH-45147,US,OH,45147,6.75,,,, +US-OH-45148,US,OH,45148,7.25,,,, +US-OH-45150,US,OH,45150,6.75,,,, +US-OH-45152,US,OH,45152,6.75,,,, +US-OH-45153,US,OH,45153,6.75,,,, +US-OH-45154,US,OH,45154,7.25,,,, +US-OH-45155,US,OH,45155,7.25,,,, +US-OH-45156,US,OH,45156,6.75,,,, +US-OH-45157,US,OH,45157,6.75,,,, +US-OH-45158,US,OH,45158,6.75,,,, +US-OH-45159,US,OH,45159,7.25,,,, +US-OH-45160,US,OH,45160,6.75,,,, +US-OH-45162,US,OH,45162,6.75,,,, +US-OH-45164,US,OH,45164,7.25,,,, +US-OH-45166,US,OH,45166,7.25,,,, +US-OH-45167,US,OH,45167,7.25,,,, +US-OH-45168,US,OH,45168,7.25,,,, +US-OH-45169,US,OH,45169,7.25,,,, +US-OH-45171,US,OH,45171,7.25,,,, +US-OH-45172,US,OH,45172,7.25,,,, +US-OH-45174,US,OH,45174,6.75,,,, +US-OH-45176,US,OH,45176,6.75,,,, +US-OH-45177,US,OH,45177,7.25,,,, +US-OH-45201,US,OH,45201,6.75,,,, +US-OH-45202,US,OH,45202,6.75,,,, +US-OH-45203,US,OH,45203,6.75,,,, +US-OH-45204,US,OH,45204,6.75,,,, +US-OH-45205,US,OH,45205,6.75,,,, +US-OH-45206,US,OH,45206,6.75,,,, +US-OH-45207,US,OH,45207,6.75,,,, +US-OH-45208,US,OH,45208,6.75,,,, +US-OH-45209,US,OH,45209,6.75,,,, +US-OH-45211,US,OH,45211,6.75,,,, +US-OH-45212,US,OH,45212,6.75,,,, +US-OH-45213,US,OH,45213,6.75,,,, +US-OH-45214,US,OH,45214,6.75,,,, +US-OH-45215,US,OH,45215,6.75,,,, +US-OH-45216,US,OH,45216,6.75,,,, +US-OH-45217,US,OH,45217,6.75,,,, +US-OH-45218,US,OH,45218,6.75,,,, +US-OH-45219,US,OH,45219,6.75,,,, +US-OH-45220,US,OH,45220,6.75,,,, +US-OH-45221,US,OH,45221,6.75,,,, +US-OH-45222,US,OH,45222,6.75,,,, +US-OH-45223,US,OH,45223,6.75,,,, +US-OH-45224,US,OH,45224,6.75,,,, +US-OH-45225,US,OH,45225,6.75,,,, +US-OH-45226,US,OH,45226,6.75,,,, +US-OH-45227,US,OH,45227,6.75,,,, +US-OH-45229,US,OH,45229,6.75,,,, +US-OH-45230,US,OH,45230,6.75,,,, +US-OH-45231,US,OH,45231,6.75,,,, +US-OH-45232,US,OH,45232,6.75,,,, +US-OH-45233,US,OH,45233,6.75,,,, +US-OH-45234,US,OH,45234,6.75,,,, +US-OH-45235,US,OH,45235,6.75,,,, +US-OH-45236,US,OH,45236,6.75,,,, +US-OH-45237,US,OH,45237,6.75,,,, +US-OH-45238,US,OH,45238,6.75,,,, +US-OH-45239,US,OH,45239,6.75,,,, +US-OH-45240,US,OH,45240,6.75,,,, +US-OH-45241,US,OH,45241,6.75,,,, +US-OH-45242,US,OH,45242,6.75,,,, +US-OH-45243,US,OH,45243,6.75,,,, +US-OH-45244,US,OH,45244,6.75,,,, +US-OH-45245,US,OH,45245,6.75,,,, +US-OH-45246,US,OH,45246,6.75,,,, +US-OH-45247,US,OH,45247,6.75,,,, +US-OH-45248,US,OH,45248,6.75,,,, +US-OH-45249,US,OH,45249,6.75,,,, +US-OH-45250,US,OH,45250,6.75,,,, +US-OH-45251,US,OH,45251,6.75,,,, +US-OH-45252,US,OH,45252,6.75,,,, +US-OH-45253,US,OH,45253,6.75,,,, +US-OH-45254,US,OH,45254,6.75,,,, +US-OH-45255,US,OH,45255,6.75,,,, +US-OH-45258,US,OH,45258,6.75,,,, +US-OH-45262,US,OH,45262,6.75,,,, +US-OH-45263,US,OH,45263,6.75,,,, +US-OH-45264,US,OH,45264,6.75,,,, +US-OH-45267,US,OH,45267,6.75,,,, +US-OH-45268,US,OH,45268,6.75,,,, +US-OH-45269,US,OH,45269,6.75,,,, +US-OH-45270,US,OH,45270,6.75,,,, +US-OH-45271,US,OH,45271,6.75,,,, +US-OH-45273,US,OH,45273,6.75,,,, +US-OH-45274,US,OH,45274,6.75,,,, +US-OH-45277,US,OH,45277,6.75,,,, +US-OH-45280,US,OH,45280,6.75,,,, +US-OH-45296,US,OH,45296,6.75,,,, +US-OH-45298,US,OH,45298,6.75,,,, +US-OH-45299,US,OH,45299,6.75,,,, +US-OH-45301,US,OH,45301,6.75,,,, +US-OH-45302,US,OH,45302,7.25,,,, +US-OH-45303,US,OH,45303,7.25,,,, +US-OH-45304,US,OH,45304,7.25,,,, +US-OH-45305,US,OH,45305,6.75,,,, +US-OH-45306,US,OH,45306,7.25,,,, +US-OH-45307,US,OH,45307,6.75,,,, +US-OH-45308,US,OH,45308,7.25,,,, +US-OH-45309,US,OH,45309,7.25,,,, +US-OH-45310,US,OH,45310,7.25,,,, +US-OH-45311,US,OH,45311,7.25,,,, +US-OH-45312,US,OH,45312,7,,,, +US-OH-45314,US,OH,45314,6.75,,,, +US-OH-45315,US,OH,45315,7.25,,,, +US-OH-45316,US,OH,45316,6.75,,,, +US-OH-45317,US,OH,45317,7.25,,,, +US-OH-45318,US,OH,45318,7,,,, +US-OH-45319,US,OH,45319,7.25,,,, +US-OH-45320,US,OH,45320,7.25,,,, +US-OH-45321,US,OH,45321,7.25,,,, +US-OH-45322,US,OH,45322,7.25,,,, +US-OH-45323,US,OH,45323,7.25,,,, +US-OH-45324,US,OH,45324,6.75,,,, +US-OH-45325,US,OH,45325,7.25,,,, +US-OH-45326,US,OH,45326,7,,,, +US-OH-45327,US,OH,45327,7.25,,,, +US-OH-45328,US,OH,45328,7.25,,,, +US-OH-45330,US,OH,45330,7.25,,,, +US-OH-45331,US,OH,45331,7.25,,,, +US-OH-45332,US,OH,45332,7.25,,,, +US-OH-45333,US,OH,45333,7.25,,,, +US-OH-45334,US,OH,45334,7.25,,,, +US-OH-45335,US,OH,45335,6.75,,,, +US-OH-45336,US,OH,45336,7.25,,,, +US-OH-45337,US,OH,45337,7,,,, +US-OH-45338,US,OH,45338,7.25,,,, +US-OH-45339,US,OH,45339,7,,,, +US-OH-45340,US,OH,45340,7.25,,,, +US-OH-45341,US,OH,45341,7.25,,,, +US-OH-45342,US,OH,45342,7.25,,,, +US-OH-45343,US,OH,45343,7.25,,,, +US-OH-45344,US,OH,45344,7.25,,,, +US-OH-45345,US,OH,45345,7.25,,,, +US-OH-45346,US,OH,45346,7.25,,,, +US-OH-45347,US,OH,45347,7.25,,,, +US-OH-45348,US,OH,45348,7.25,,,, +US-OH-45349,US,OH,45349,7.25,,,, +US-OH-45350,US,OH,45350,7.25,,,, +US-OH-45351,US,OH,45351,7.25,,,, +US-OH-45352,US,OH,45352,7.25,,,, +US-OH-45353,US,OH,45353,7.25,,,, +US-OH-45354,US,OH,45354,7.25,,,, +US-OH-45356,US,OH,45356,7,,,, +US-OH-45358,US,OH,45358,7.25,,,, +US-OH-45359,US,OH,45359,7,,,, +US-OH-45360,US,OH,45360,7.25,,,, +US-OH-45361,US,OH,45361,7,,,, +US-OH-45362,US,OH,45362,7.25,,,, +US-OH-45363,US,OH,45363,7.25,,,, +US-OH-45365,US,OH,45365,7.25,,,, +US-OH-45367,US,OH,45367,7.25,,,, +US-OH-45368,US,OH,45368,7.25,,,, +US-OH-45369,US,OH,45369,7.25,,,, +US-OH-45370,US,OH,45370,6.75,,,, +US-OH-45371,US,OH,45371,7,,,, +US-OH-45372,US,OH,45372,7.25,,,, +US-OH-45373,US,OH,45373,7,,,, +US-OH-45374,US,OH,45374,7,,,, +US-OH-45377,US,OH,45377,7.25,,,, +US-OH-45378,US,OH,45378,7.25,,,, +US-OH-45380,US,OH,45380,7.25,,,, +US-OH-45381,US,OH,45381,7.25,,,, +US-OH-45382,US,OH,45382,7.25,,,, +US-OH-45383,US,OH,45383,7,,,, +US-OH-45384,US,OH,45384,6.75,,,, +US-OH-45385,US,OH,45385,6.75,,,, +US-OH-45387,US,OH,45387,6.75,,,, +US-OH-45388,US,OH,45388,7.25,,,, +US-OH-45389,US,OH,45389,7.25,,,, +US-OH-45390,US,OH,45390,7.25,,,, +US-OH-45401,US,OH,45401,7.25,,,, +US-OH-45402,US,OH,45402,7.25,,,, +US-OH-45403,US,OH,45403,7.25,,,, +US-OH-45404,US,OH,45404,7.25,,,, +US-OH-45405,US,OH,45405,7.25,,,, +US-OH-45406,US,OH,45406,7.25,,,, +US-OH-45409,US,OH,45409,7.25,,,, +US-OH-45410,US,OH,45410,7.25,,,, +US-OH-45412,US,OH,45412,7.25,,,, +US-OH-45413,US,OH,45413,7.25,,,, +US-OH-45414,US,OH,45414,7.25,,,, +US-OH-45415,US,OH,45415,7.25,,,, +US-OH-45416,US,OH,45416,7.25,,,, +US-OH-45417,US,OH,45417,7.25,,,, +US-OH-45419,US,OH,45419,7.25,,,, +US-OH-45420,US,OH,45420,7.25,,,, +US-OH-45422,US,OH,45422,7.25,,,, +US-OH-45423,US,OH,45423,7.25,,,, +US-OH-45424,US,OH,45424,7.25,,,, +US-OH-45426,US,OH,45426,7.25,,,, +US-OH-45428,US,OH,45428,7.25,,,, +US-OH-45429,US,OH,45429,7.25,,,, +US-OH-45430,US,OH,45430,6.75,,,, +US-OH-45431,US,OH,45431,6.75,,,, +US-OH-45432,US,OH,45432,6.75,,,, +US-OH-45433,US,OH,45433,6.75,,,, +US-OH-45434,US,OH,45434,6.75,,,, +US-OH-45435,US,OH,45435,6.75,,,, +US-OH-45437,US,OH,45437,7.25,,,, +US-OH-45439,US,OH,45439,7.25,,,, +US-OH-45440,US,OH,45440,7.25,,,, +US-OH-45441,US,OH,45441,7.25,,,, +US-OH-45448,US,OH,45448,7.25,,,, +US-OH-45449,US,OH,45449,7.25,,,, +US-OH-45458,US,OH,45458,7.25,,,, +US-OH-45459,US,OH,45459,7.25,,,, +US-OH-45469,US,OH,45469,7.25,,,, +US-OH-45470,US,OH,45470,7.25,,,, +US-OH-45475,US,OH,45475,7.25,,,, +US-OH-45479,US,OH,45479,7.25,,,, +US-OH-45481,US,OH,45481,7.25,,,, +US-OH-45482,US,OH,45482,7.25,,,, +US-OH-45490,US,OH,45490,7.25,,,, +US-OH-45501,US,OH,45501,7.25,,,, +US-OH-45502,US,OH,45502,7.25,,,, +US-OH-45503,US,OH,45503,7.25,,,, +US-OH-45504,US,OH,45504,7.25,,,, +US-OH-45505,US,OH,45505,7.25,,,, +US-OH-45506,US,OH,45506,7.25,,,, +US-OH-45601,US,OH,45601,7.25,,,, +US-OH-45612,US,OH,45612,7.25,,,, +US-OH-45613,US,OH,45613,7.25,,,, +US-OH-45614,US,OH,45614,7,,,, +US-OH-45616,US,OH,45616,7.25,,,, +US-OH-45617,US,OH,45617,7.25,,,, +US-OH-45618,US,OH,45618,7.25,,,, +US-OH-45619,US,OH,45619,7.25,,,, +US-OH-45620,US,OH,45620,7,,,, +US-OH-45621,US,OH,45621,7.25,,,, +US-OH-45622,US,OH,45622,7.25,,,, +US-OH-45623,US,OH,45623,7,,,, +US-OH-45624,US,OH,45624,7.25,,,, +US-OH-45628,US,OH,45628,7.25,,,, +US-OH-45629,US,OH,45629,7.25,,,, +US-OH-45630,US,OH,45630,7.25,,,, +US-OH-45631,US,OH,45631,7,,,, +US-OH-45633,US,OH,45633,7.25,,,, +US-OH-45634,US,OH,45634,7.25,,,, +US-OH-45636,US,OH,45636,7.25,,,, +US-OH-45638,US,OH,45638,7.25,,,, +US-OH-45640,US,OH,45640,7.25,,,, +US-OH-45642,US,OH,45642,7.25,,,, +US-OH-45643,US,OH,45643,7,,,, +US-OH-45644,US,OH,45644,7.25,,,, +US-OH-45645,US,OH,45645,7.25,,,, +US-OH-45646,US,OH,45646,7.25,,,, +US-OH-45647,US,OH,45647,7.25,,,, +US-OH-45648,US,OH,45648,7.25,,,, +US-OH-45650,US,OH,45650,7.25,,,, +US-OH-45651,US,OH,45651,7.25,,,, +US-OH-45652,US,OH,45652,7.25,,,, +US-OH-45653,US,OH,45653,7.25,,,, +US-OH-45654,US,OH,45654,7.25,,,, +US-OH-45656,US,OH,45656,7.25,,,, +US-OH-45657,US,OH,45657,7.25,,,, +US-OH-45658,US,OH,45658,7,,,, +US-OH-45659,US,OH,45659,7.25,,,, +US-OH-45660,US,OH,45660,7.25,,,, +US-OH-45661,US,OH,45661,7.25,,,, +US-OH-45662,US,OH,45662,7.25,,,, +US-OH-45663,US,OH,45663,7.25,,,, +US-OH-45669,US,OH,45669,7.25,,,, +US-OH-45671,US,OH,45671,7.25,,,, +US-OH-45672,US,OH,45672,7.25,,,, +US-OH-45673,US,OH,45673,7.25,,,, +US-OH-45674,US,OH,45674,7,,,, +US-OH-45675,US,OH,45675,7.25,,,, +US-OH-45677,US,OH,45677,7.25,,,, +US-OH-45678,US,OH,45678,7.25,,,, +US-OH-45679,US,OH,45679,7.25,,,, +US-OH-45680,US,OH,45680,7.25,,,, +US-OH-45681,US,OH,45681,7.25,,,, +US-OH-45682,US,OH,45682,7.25,,,, +US-OH-45683,US,OH,45683,7.25,,,, +US-OH-45684,US,OH,45684,7.25,,,, +US-OH-45685,US,OH,45685,7,,,, +US-OH-45686,US,OH,45686,7,,,, +US-OH-45687,US,OH,45687,7.25,,,, +US-OH-45688,US,OH,45688,7.25,,,, +US-OH-45690,US,OH,45690,7.25,,,, +US-OH-45692,US,OH,45692,7.25,,,, +US-OH-45693,US,OH,45693,7.25,,,, +US-OH-45694,US,OH,45694,7.25,,,, +US-OH-45695,US,OH,45695,7.25,,,, +US-OH-45696,US,OH,45696,7.25,,,, +US-OH-45697,US,OH,45697,7.25,,,, +US-OH-45698,US,OH,45698,7.25,,,, +US-OH-45699,US,OH,45699,7.25,,,, +US-OH-45701,US,OH,45701,7,,,, +US-OH-45710,US,OH,45710,7,,,, +US-OH-45711,US,OH,45711,7,,,, +US-OH-45712,US,OH,45712,7.25,,,, +US-OH-45713,US,OH,45713,7.25,,,, +US-OH-45714,US,OH,45714,7.25,,,, +US-OH-45715,US,OH,45715,7.25,,,, +US-OH-45716,US,OH,45716,7,,,, +US-OH-45717,US,OH,45717,7,,,, +US-OH-45719,US,OH,45719,7,,,, +US-OH-45720,US,OH,45720,7.25,,,, +US-OH-45721,US,OH,45721,7.25,,,, +US-OH-45723,US,OH,45723,7,,,, +US-OH-45724,US,OH,45724,7.25,,,, +US-OH-45727,US,OH,45727,7.25,,,, +US-OH-45729,US,OH,45729,7.25,,,, +US-OH-45732,US,OH,45732,7,,,, +US-OH-45734,US,OH,45734,7.25,,,, +US-OH-45735,US,OH,45735,7,,,, +US-OH-45739,US,OH,45739,7,,,, +US-OH-45740,US,OH,45740,7,,,, +US-OH-45741,US,OH,45741,7.25,,,, +US-OH-45742,US,OH,45742,7.25,,,, +US-OH-45743,US,OH,45743,7.25,,,, +US-OH-45744,US,OH,45744,7.25,,,, +US-OH-45745,US,OH,45745,7.25,,,, +US-OH-45746,US,OH,45746,7.25,,,, +US-OH-45750,US,OH,45750,7.25,,,, +US-OH-45760,US,OH,45760,7.25,,,, +US-OH-45761,US,OH,45761,7,,,, +US-OH-45764,US,OH,45764,7,,,, +US-OH-45766,US,OH,45766,7,,,, +US-OH-45767,US,OH,45767,7.25,,,, +US-OH-45768,US,OH,45768,7.25,,,, +US-OH-45769,US,OH,45769,7.25,,,, +US-OH-45770,US,OH,45770,7.25,,,, +US-OH-45771,US,OH,45771,7.25,,,, +US-OH-45772,US,OH,45772,7.25,,,, +US-OH-45773,US,OH,45773,7.25,,,, +US-OH-45775,US,OH,45775,7.25,,,, +US-OH-45776,US,OH,45776,7.25,,,, +US-OH-45777,US,OH,45777,7,,,, +US-OH-45778,US,OH,45778,7,,,, +US-OH-45779,US,OH,45779,7.25,,,, +US-OH-45780,US,OH,45780,7,,,, +US-OH-45782,US,OH,45782,7,,,, +US-OH-45783,US,OH,45783,7.25,,,, +US-OH-45784,US,OH,45784,7.25,,,, +US-OH-45786,US,OH,45786,7.25,,,, +US-OH-45787,US,OH,45787,7.25,,,, +US-OH-45788,US,OH,45788,7.25,,,, +US-OH-45789,US,OH,45789,7.25,,,, +US-OH-45801,US,OH,45801,6.75,,,, +US-OH-45802,US,OH,45802,6.75,,,, +US-OH-45804,US,OH,45804,6.75,,,, +US-OH-45805,US,OH,45805,6.75,,,, +US-OH-45806,US,OH,45806,6.75,,,, +US-OH-45807,US,OH,45807,6.75,,,, +US-OH-45808,US,OH,45808,6.75,,,, +US-OH-45809,US,OH,45809,6.75,,,, +US-OH-45810,US,OH,45810,7.25,,,, +US-OH-45812,US,OH,45812,7.25,,,, +US-OH-45813,US,OH,45813,7.25,,,, +US-OH-45814,US,OH,45814,6.75,,,, +US-OH-45815,US,OH,45815,7.25,,,, +US-OH-45816,US,OH,45816,6.75,,,, +US-OH-45817,US,OH,45817,6.75,,,, +US-OH-45819,US,OH,45819,7.25,,,, +US-OH-45820,US,OH,45820,6.75,,,, +US-OH-45821,US,OH,45821,7.25,,,, +US-OH-45822,US,OH,45822,7.25,,,, +US-OH-45826,US,OH,45826,7.25,,,, +US-OH-45827,US,OH,45827,7.25,,,, +US-OH-45828,US,OH,45828,7.25,,,, +US-OH-45830,US,OH,45830,7.25,,,, +US-OH-45831,US,OH,45831,7.25,,,, +US-OH-45832,US,OH,45832,7.25,,,, +US-OH-45833,US,OH,45833,6.75,,,, +US-OH-45835,US,OH,45835,7.25,,,, +US-OH-45836,US,OH,45836,7.25,,,, +US-OH-45837,US,OH,45837,7.25,,,, +US-OH-45838,US,OH,45838,7.25,,,, +US-OH-45839,US,OH,45839,6.75,,,, +US-OH-45840,US,OH,45840,6.75,,,, +US-OH-45841,US,OH,45841,6.75,,,, +US-OH-45843,US,OH,45843,7.25,,,, +US-OH-45844,US,OH,45844,7.25,,,, +US-OH-45845,US,OH,45845,7.25,,,, +US-OH-45846,US,OH,45846,7.25,,,, +US-OH-45848,US,OH,45848,7.25,,,, +US-OH-45849,US,OH,45849,7.25,,,, +US-OH-45850,US,OH,45850,6.75,,,, +US-OH-45851,US,OH,45851,7.25,,,, +US-OH-45853,US,OH,45853,7.25,,,, +US-OH-45854,US,OH,45854,6.75,,,, +US-OH-45855,US,OH,45855,7.25,,,, +US-OH-45856,US,OH,45856,7.25,,,, +US-OH-45858,US,OH,45858,6.75,,,, +US-OH-45859,US,OH,45859,7.25,,,, +US-OH-45860,US,OH,45860,7.25,,,, +US-OH-45861,US,OH,45861,7.25,,,, +US-OH-45862,US,OH,45862,7.25,,,, +US-OH-45863,US,OH,45863,7.25,,,, +US-OH-45864,US,OH,45864,7.25,,,, +US-OH-45865,US,OH,45865,7.25,,,, +US-OH-45866,US,OH,45866,7.25,,,, +US-OH-45867,US,OH,45867,6.75,,,, +US-OH-45868,US,OH,45868,6.75,,,, +US-OH-45869,US,OH,45869,7.25,,,, +US-OH-45870,US,OH,45870,7.25,,,, +US-OH-45871,US,OH,45871,7.25,,,, +US-OH-45872,US,OH,45872,6.75,,,, +US-OH-45873,US,OH,45873,7.25,,,, +US-OH-45874,US,OH,45874,7.25,,,, +US-OH-45875,US,OH,45875,7.25,,,, +US-OH-45876,US,OH,45876,7.25,,,, +US-OH-45877,US,OH,45877,7.25,,,, +US-OH-45879,US,OH,45879,7.25,,,, +US-OH-45880,US,OH,45880,7.25,,,, +US-OH-45881,US,OH,45881,6.75,,,, +US-OH-45882,US,OH,45882,7.25,,,, +US-OH-45883,US,OH,45883,7.25,,,, +US-OH-45884,US,OH,45884,7.25,,,, +US-OH-45885,US,OH,45885,7.25,,,, +US-OH-45886,US,OH,45886,7.25,,,, +US-OH-45887,US,OH,45887,6.75,,,, +US-OH-45888,US,OH,45888,7.25,,,, +US-OH-45889,US,OH,45889,6.75,,,, +US-OH-45890,US,OH,45890,6.75,,,, +US-OH-45891,US,OH,45891,7.25,,,, +US-OH-45893,US,OH,45893,7.25,,,, +US-OH-45894,US,OH,45894,7.25,,,, +US-OH-45895,US,OH,45895,7.25,,,, +US-OH-45896,US,OH,45896,7.25,,,, +US-OH-45897,US,OH,45897,6.75,,,, +US-OH-45898,US,OH,45898,7.25,,,, +US-OH-45899,US,OH,45899,7.25,,,, +US-OK-73001,US,OK,73001,6,,,, +US-OK-73002,US,OK,73002,4.875,,,, +US-OK-73003,US,OK,73003,8.25,,,, +US-OK-73004,US,OK,73004,8.875,,,, +US-OK-73005,US,OK,73005,9.5,,,, +US-OK-73006,US,OK,73006,9.5,,,, +US-OK-73007,US,OK,73007,8.25,,,, +US-OK-73008,US,OK,73008,8.5,,,, +US-OK-73009,US,OK,73009,10,,,, +US-OK-73010,US,OK,73010,9,,,, +US-OK-73011,US,OK,73011,4.875,,,, +US-OK-73012,US,OK,73012,8.375,,,, +US-OK-73013,US,OK,73013,8.375,,,, +US-OK-73014,US,OK,73014,4.85,,,, +US-OK-73015,US,OK,73015,10,,,, +US-OK-73016,US,OK,73016,9.25,,,, +US-OK-73017,US,OK,73017,4.875,,,, +US-OK-73018,US,OK,73018,8.844,,,, +US-OK-73019,US,OK,73019,8.25,,,, +US-OK-73020,US,OK,73020,8.75,,,, +US-OK-73021,US,OK,73021,6.375,,,, +US-OK-73022,US,OK,73022,8.85,,,, +US-OK-73023,US,OK,73023,8.844,,,, +US-OK-73024,US,OK,73024,8.375,,,, +US-OK-73025,US,OK,73025,5.5,,,, +US-OK-73026,US,OK,73026,8.25,,,, +US-OK-73027,US,OK,73027,5.313,,,, +US-OK-73028,US,OK,73028,5.5,,,, +US-OK-73029,US,OK,73029,6,,,, +US-OK-73030,US,OK,73030,9.5,,,, +US-OK-73031,US,OK,73031,10,,,, +US-OK-73032,US,OK,73032,8.5,,,, +US-OK-73033,US,OK,73033,9,,,, +US-OK-73034,US,OK,73034,8.25,,,, +US-OK-73036,US,OK,73036,8.85,,,, +US-OK-73038,US,OK,73038,10,,,, +US-OK-73039,US,OK,73039,9.5,,,, +US-OK-73040,US,OK,73040,8.25,,,, +US-OK-73041,US,OK,73041,9,,,, +US-OK-73042,US,OK,73042,10,,,, +US-OK-73043,US,OK,73043,8.25,,,, +US-OK-73044,US,OK,73044,5.5,,,, +US-OK-73045,US,OK,73045,8.5,,,, +US-OK-73047,US,OK,73047,9,,,, +US-OK-73048,US,OK,73048,10,,,, +US-OK-73049,US,OK,73049,8.375,,,, +US-OK-73050,US,OK,73050,9.5,,,, +US-OK-73051,US,OK,73051,4.75,,,, +US-OK-73052,US,OK,73052,5,,,, +US-OK-73053,US,OK,73053,6,,,, +US-OK-73054,US,OK,73054,4.5,,,, +US-OK-73055,US,OK,73055,8.7,,,, +US-OK-73056,US,OK,73056,9.5,,,, +US-OK-73057,US,OK,73057,9.25,,,, +US-OK-73058,US,OK,73058,5.5,,,, +US-OK-73059,US,OK,73059,8.875,,,, +US-OK-73061,US,OK,73061,6,,,, +US-OK-73062,US,OK,73062,9,,,, +US-OK-73063,US,OK,73063,8.5,,,, +US-OK-73064,US,OK,73064,8.85,,,, +US-OK-73065,US,OK,73065,9,,,, +US-OK-73066,US,OK,73066,8.5,,,, +US-OK-73067,US,OK,73067,7.875,,,, +US-OK-73068,US,OK,73068,8.75,,,, +US-OK-73069,US,OK,73069,8.25,,,, +US-OK-73070,US,OK,73070,8.25,,,, +US-OK-73071,US,OK,73071,8.25,,,, +US-OK-73072,US,OK,73072,8.25,,,, +US-OK-73073,US,OK,73073,5.5,,,, +US-OK-73074,US,OK,73074,8.25,,,, +US-OK-73075,US,OK,73075,9.25,,,, +US-OK-73077,US,OK,73077,9.25,,,, +US-OK-73078,US,OK,73078,9.85,,,, +US-OK-73079,US,OK,73079,6.375,,,, +US-OK-73080,US,OK,73080,9,,,, +US-OK-73082,US,OK,73082,4.875,,,, +US-OK-73083,US,OK,73083,8.25,,,, +US-OK-73084,US,OK,73084,8.375,,,, +US-OK-73085,US,OK,73085,8.85,,,, +US-OK-73086,US,OK,73086,6.5,,,, +US-OK-73089,US,OK,73089,8.875,,,, +US-OK-73090,US,OK,73090,8.85,,,, +US-OK-73092,US,OK,73092,4.875,,,, +US-OK-73093,US,OK,73093,8.5,,,, +US-OK-73095,US,OK,73095,5,,,, +US-OK-73096,US,OK,73096,9.5,,,, +US-OK-73097,US,OK,73097,8.375,,,, +US-OK-73098,US,OK,73098,9.25,,,, +US-OK-73099,US,OK,73099,8.725,,,, +US-OK-73101,US,OK,73101,8.375,,,, +US-OK-73102,US,OK,73102,8.375,,,, +US-OK-73103,US,OK,73103,8.375,,,, +US-OK-73104,US,OK,73104,8.375,,,, +US-OK-73105,US,OK,73105,8.375,,,, +US-OK-73106,US,OK,73106,8.375,,,, +US-OK-73107,US,OK,73107,8.375,,,, +US-OK-73108,US,OK,73108,8.375,,,, +US-OK-73109,US,OK,73109,8.375,,,, +US-OK-73110,US,OK,73110,8.35,,,, +US-OK-73111,US,OK,73111,8.375,,,, +US-OK-73112,US,OK,73112,8.375,,,, +US-OK-73113,US,OK,73113,8.375,,,, +US-OK-73114,US,OK,73114,8.375,,,, +US-OK-73115,US,OK,73115,8,,,, +US-OK-73116,US,OK,73116,8.375,,,, +US-OK-73117,US,OK,73117,8.375,,,, +US-OK-73118,US,OK,73118,8.375,,,, +US-OK-73119,US,OK,73119,8.375,,,, +US-OK-73120,US,OK,73120,8.375,,,, +US-OK-73121,US,OK,73121,8.375,,,, +US-OK-73122,US,OK,73122,8.5,,,, +US-OK-73123,US,OK,73123,8.5,,,, +US-OK-73124,US,OK,73124,8.375,,,, +US-OK-73125,US,OK,73125,8.375,,,, +US-OK-73126,US,OK,73126,8.375,,,, +US-OK-73127,US,OK,73127,8.375,,,, +US-OK-73128,US,OK,73128,8.375,,,, +US-OK-73129,US,OK,73129,8.375,,,, +US-OK-73130,US,OK,73130,8.35,,,, +US-OK-73131,US,OK,73131,8.375,,,, +US-OK-73132,US,OK,73132,8.375,,,, +US-OK-73134,US,OK,73134,8.375,,,, +US-OK-73135,US,OK,73135,8.375,,,, +US-OK-73136,US,OK,73136,8.375,,,, +US-OK-73137,US,OK,73137,8.375,,,, +US-OK-73139,US,OK,73139,8.375,,,, +US-OK-73140,US,OK,73140,8.35,,,, +US-OK-73141,US,OK,73141,8.35,,,, +US-OK-73142,US,OK,73142,8.375,,,, +US-OK-73143,US,OK,73143,8.375,,,, +US-OK-73144,US,OK,73144,8.375,,,, +US-OK-73145,US,OK,73145,8.375,,,, +US-OK-73146,US,OK,73146,8.375,,,, +US-OK-73147,US,OK,73147,8.375,,,, +US-OK-73148,US,OK,73148,8.375,,,, +US-OK-73149,US,OK,73149,8.375,,,, +US-OK-73150,US,OK,73150,8.375,,,, +US-OK-73151,US,OK,73151,8.375,,,, +US-OK-73152,US,OK,73152,8.375,,,, +US-OK-73153,US,OK,73153,8.625,,,, +US-OK-73154,US,OK,73154,8.375,,,, +US-OK-73155,US,OK,73155,8.375,,,, +US-OK-73156,US,OK,73156,8.5,,,, +US-OK-73157,US,OK,73157,8.375,,,, +US-OK-73159,US,OK,73159,8.375,,,, +US-OK-73160,US,OK,73160,8.5,,,, +US-OK-73162,US,OK,73162,8.375,,,, +US-OK-73163,US,OK,73163,8.375,,,, +US-OK-73164,US,OK,73164,8.375,,,, +US-OK-73165,US,OK,73165,8.625,,,, +US-OK-73167,US,OK,73167,8.375,,,, +US-OK-73169,US,OK,73169,8.375,,,, +US-OK-73170,US,OK,73170,8.625,,,, +US-OK-73172,US,OK,73172,8.375,,,, +US-OK-73173,US,OK,73173,8.625,,,, +US-OK-73178,US,OK,73178,8.375,,,, +US-OK-73179,US,OK,73179,8.375,,,, +US-OK-73184,US,OK,73184,8.375,,,, +US-OK-73185,US,OK,73185,8.375,,,, +US-OK-73189,US,OK,73189,8.625,,,, +US-OK-73190,US,OK,73190,8.375,,,, +US-OK-73194,US,OK,73194,8.375,,,, +US-OK-73195,US,OK,73195,8.375,,,, +US-OK-73196,US,OK,73196,8.375,,,, +US-OK-73401,US,OK,73401,9,,,, +US-OK-73402,US,OK,73402,9,,,, +US-OK-73403,US,OK,73403,9,,,, +US-OK-73425,US,OK,73425,5.2,,,, +US-OK-73430,US,OK,73430,6.5,,,, +US-OK-73432,US,OK,73432,6,,,, +US-OK-73433,US,OK,73433,9.25,,,, +US-OK-73434,US,OK,73434,9.25,,,, +US-OK-73435,US,OK,73435,5.25,,,, +US-OK-73436,US,OK,73436,8.25,,,, +US-OK-73437,US,OK,73437,5.25,,,, +US-OK-73438,US,OK,73438,9.25,,,, +US-OK-73439,US,OK,73439,6,,,, +US-OK-73440,US,OK,73440,6,,,, +US-OK-73441,US,OK,73441,6.5,,,, +US-OK-73442,US,OK,73442,8.2,,,, +US-OK-73443,US,OK,73443,9.25,,,, +US-OK-73444,US,OK,73444,5.25,,,, +US-OK-73446,US,OK,73446,9,,,, +US-OK-73447,US,OK,73447,6,,,, +US-OK-73448,US,OK,73448,8.5,,,, +US-OK-73449,US,OK,73449,5,,,, +US-OK-73450,US,OK,73450,6,,,, +US-OK-73453,US,OK,73453,6.5,,,, +US-OK-73455,US,OK,73455,9,,,, +US-OK-73456,US,OK,73456,9,,,, +US-OK-73458,US,OK,73458,5.25,,,, +US-OK-73459,US,OK,73459,6.5,,,, +US-OK-73460,US,OK,73460,9,,,, +US-OK-73461,US,OK,73461,7.5,,,, +US-OK-73463,US,OK,73463,5.25,,,, +US-OK-73481,US,OK,73481,5.25,,,, +US-OK-73487,US,OK,73487,10.25,,,, +US-OK-73488,US,OK,73488,5.25,,,, +US-OK-73491,US,OK,73491,9.2,,,, +US-OK-73501,US,OK,73501,8.875,,,, +US-OK-73502,US,OK,73502,8.875,,,, +US-OK-73503,US,OK,73503,4.75,,,, +US-OK-73505,US,OK,73505,8.875,,,, +US-OK-73506,US,OK,73506,8.875,,,, +US-OK-73507,US,OK,73507,8.875,,,, +US-OK-73520,US,OK,73520,8.5,,,, +US-OK-73521,US,OK,73521,8.75,,,, +US-OK-73522,US,OK,73522,8.75,,,, +US-OK-73523,US,OK,73523,8.75,,,, +US-OK-73526,US,OK,73526,5,,,, +US-OK-73527,US,OK,73527,4.75,,,, +US-OK-73528,US,OK,73528,7.75,,,, +US-OK-73529,US,OK,73529,9.2,,,, +US-OK-73530,US,OK,73530,6,,,, +US-OK-73531,US,OK,73531,5.75,,,, +US-OK-73532,US,OK,73532,5,,,, +US-OK-73533,US,OK,73533,8.7,,,, +US-OK-73534,US,OK,73534,8.7,,,, +US-OK-73536,US,OK,73536,8.7,,,, +US-OK-73537,US,OK,73537,7,,,, +US-OK-73538,US,OK,73538,4.75,,,, +US-OK-73539,US,OK,73539,5,,,, +US-OK-73540,US,OK,73540,4.75,,,, +US-OK-73541,US,OK,73541,4.75,,,, +US-OK-73542,US,OK,73542,9.5,,,, +US-OK-73543,US,OK,73543,4.75,,,, +US-OK-73544,US,OK,73544,6.5,,,, +US-OK-73546,US,OK,73546,9,,,, +US-OK-73547,US,OK,73547,9,,,, +US-OK-73548,US,OK,73548,9.5,,,, +US-OK-73549,US,OK,73549,5,,,, +US-OK-73550,US,OK,73550,8.5,,,, +US-OK-73551,US,OK,73551,9,,,, +US-OK-73552,US,OK,73552,4.75,,,, +US-OK-73553,US,OK,73553,6,,,, +US-OK-73554,US,OK,73554,9,,,, +US-OK-73555,US,OK,73555,9,,,, +US-OK-73556,US,OK,73556,5,,,, +US-OK-73557,US,OK,73557,8.5,,,, +US-OK-73558,US,OK,73558,4.75,,,, +US-OK-73559,US,OK,73559,8,,,, +US-OK-73560,US,OK,73560,5,,,, +US-OK-73561,US,OK,73561,6.5,,,, +US-OK-73562,US,OK,73562,5.75,,,, +US-OK-73564,US,OK,73564,8,,,, +US-OK-73565,US,OK,73565,9.5,,,, +US-OK-73566,US,OK,73566,9,,,, +US-OK-73567,US,OK,73567,7.75,,,, +US-OK-73568,US,OK,73568,8.75,,,, +US-OK-73569,US,OK,73569,9.5,,,, +US-OK-73570,US,OK,73570,6,,,, +US-OK-73571,US,OK,73571,6.5,,,, +US-OK-73572,US,OK,73572,8.75,,,, +US-OK-73573,US,OK,73573,9.5,,,, +US-OK-73601,US,OK,73601,9.5,,,, +US-OK-73620,US,OK,73620,8.5,,,, +US-OK-73622,US,OK,73622,8.375,,,, +US-OK-73624,US,OK,73624,10.375,,,, +US-OK-73625,US,OK,73625,8.5,,,, +US-OK-73626,US,OK,73626,10.375,,,, +US-OK-73627,US,OK,73627,4.8,,,, +US-OK-73628,US,OK,73628,9,,,, +US-OK-73632,US,OK,73632,9.375,,,, +US-OK-73638,US,OK,73638,6,,,, +US-OK-73639,US,OK,73639,9.5,,,, +US-OK-73641,US,OK,73641,9.375,,,, +US-OK-73642,US,OK,73642,6,,,, +US-OK-73644,US,OK,73644,8.8,,,, +US-OK-73645,US,OK,73645,8.8,,,, +US-OK-73646,US,OK,73646,6.25,,,, +US-OK-73647,US,OK,73647,10.375,,,, +US-OK-73648,US,OK,73648,8.8,,,, +US-OK-73650,US,OK,73650,9,,,, +US-OK-73651,US,OK,73651,9,,,, +US-OK-73654,US,OK,73654,9.25,,,, +US-OK-73655,US,OK,73655,8,,,, +US-OK-73658,US,OK,73658,6.25,,,, +US-OK-73659,US,OK,73659,6.25,,,, +US-OK-73660,US,OK,73660,8,,,, +US-OK-73661,US,OK,73661,9.375,,,, +US-OK-73662,US,OK,73662,9.8,,,, +US-OK-73663,US,OK,73663,10.25,,,, +US-OK-73664,US,OK,73664,9.375,,,, +US-OK-73666,US,OK,73666,5.8,,,, +US-OK-73667,US,OK,73667,9.25,,,, +US-OK-73668,US,OK,73668,4.8,,,, +US-OK-73669,US,OK,73669,9.5,,,, +US-OK-73673,US,OK,73673,6,,,, +US-OK-73701,US,OK,73701,8.35,,,, +US-OK-73702,US,OK,73702,8.35,,,, +US-OK-73703,US,OK,73703,8.35,,,, +US-OK-73705,US,OK,73705,8.35,,,, +US-OK-73706,US,OK,73706,8.35,,,, +US-OK-73716,US,OK,73716,9.5,,,, +US-OK-73717,US,OK,73717,9.25,,,, +US-OK-73718,US,OK,73718,7.75,,,, +US-OK-73719,US,OK,73719,6.5,,,, +US-OK-73720,US,OK,73720,4.85,,,, +US-OK-73722,US,OK,73722,7.5,,,, +US-OK-73724,US,OK,73724,8.25,,,, +US-OK-73726,US,OK,73726,9.5,,,, +US-OK-73727,US,OK,73727,4.85,,,, +US-OK-73728,US,OK,73728,9.75,,,, +US-OK-73729,US,OK,73729,7.75,,,, +US-OK-73730,US,OK,73730,4.85,,,, +US-OK-73731,US,OK,73731,5,,,, +US-OK-73733,US,OK,73733,4.85,,,, +US-OK-73734,US,OK,73734,9.25,,,, +US-OK-73735,US,OK,73735,4.85,,,, +US-OK-73736,US,OK,73736,4.85,,,, +US-OK-73737,US,OK,73737,8.75,,,, +US-OK-73738,US,OK,73738,4.85,,,, +US-OK-73739,US,OK,73739,9.5,,,, +US-OK-73741,US,OK,73741,6.5,,,, +US-OK-73742,US,OK,73742,8.75,,,, +US-OK-73743,US,OK,73743,5.85,,,, +US-OK-73744,US,OK,73744,8.25,,,, +US-OK-73746,US,OK,73746,5,,,, +US-OK-73747,US,OK,73747,4.75,,,, +US-OK-73749,US,OK,73749,9.5,,,, +US-OK-73750,US,OK,73750,8.25,,,, +US-OK-73753,US,OK,73753,4.85,,,, +US-OK-73754,US,OK,73754,8.85,,,, +US-OK-73755,US,OK,73755,8.25,,,, +US-OK-73756,US,OK,73756,7.25,,,, +US-OK-73757,US,OK,73757,6,,,, +US-OK-73758,US,OK,73758,5.75,,,, +US-OK-73759,US,OK,73759,9.75,,,, +US-OK-73760,US,OK,73760,7.75,,,, +US-OK-73761,US,OK,73761,8.75,,,, +US-OK-73762,US,OK,73762,4.85,,,, +US-OK-73763,US,OK,73763,9.5,,,, +US-OK-73764,US,OK,73764,5.25,,,, +US-OK-73766,US,OK,73766,9.75,,,, +US-OK-73768,US,OK,73768,7.75,,,, +US-OK-73770,US,OK,73770,5.25,,,, +US-OK-73771,US,OK,73771,9.75,,,, +US-OK-73772,US,OK,73772,10.25,,,, +US-OK-73773,US,OK,73773,8.85,,,, +US-OK-73801,US,OK,73801,9.325,,,, +US-OK-73802,US,OK,73802,9.325,,,, +US-OK-73832,US,OK,73832,9.5,,,, +US-OK-73834,US,OK,73834,9.5,,,, +US-OK-73835,US,OK,73835,10.25,,,, +US-OK-73838,US,OK,73838,4.75,,,, +US-OK-73840,US,OK,73840,9.5,,,, +US-OK-73841,US,OK,73841,8.825,,,, +US-OK-73842,US,OK,73842,7,,,, +US-OK-73843,US,OK,73843,9.5,,,, +US-OK-73844,US,OK,73844,6.5,,,, +US-OK-73848,US,OK,73848,8.75,,,, +US-OK-73851,US,OK,73851,6.5,,,, +US-OK-73852,US,OK,73852,8.825,,,, +US-OK-73853,US,OK,73853,5.825,,,, +US-OK-73855,US,OK,73855,6.5,,,, +US-OK-73857,US,OK,73857,5.825,,,, +US-OK-73858,US,OK,73858,9.5,,,, +US-OK-73859,US,OK,73859,9.25,,,, +US-OK-73860,US,OK,73860,9,,,, +US-OK-73901,US,OK,73901,5.5,,,, +US-OK-73931,US,OK,73931,6.5,,,, +US-OK-73932,US,OK,73932,8.5,,,, +US-OK-73933,US,OK,73933,9.5,,,, +US-OK-73937,US,OK,73937,6.5,,,, +US-OK-73938,US,OK,73938,9.5,,,, +US-OK-73939,US,OK,73939,8.5,,,, +US-OK-73942,US,OK,73942,9.5,,,, +US-OK-73944,US,OK,73944,9.5,,,, +US-OK-73945,US,OK,73945,9.5,,,, +US-OK-73946,US,OK,73946,6.5,,,, +US-OK-73947,US,OK,73947,8.5,,,, +US-OK-73949,US,OK,73949,8.5,,,, +US-OK-73950,US,OK,73950,6.5,,,, +US-OK-73951,US,OK,73951,8.5,,,, +US-OK-74001,US,OK,74001,7.75,,,, +US-OK-74002,US,OK,74002,5.75,,,, +US-OK-74003,US,OK,74003,8.5,,,, +US-OK-74004,US,OK,74004,8.5,,,, +US-OK-74005,US,OK,74005,8.5,,,, +US-OK-74006,US,OK,74006,8.5,,,, +US-OK-74008,US,OK,74008,8.85,,,, +US-OK-74010,US,OK,74010,5.5,,,, +US-OK-74011,US,OK,74011,8.35,,,, +US-OK-74012,US,OK,74012,8.35,,,, +US-OK-74013,US,OK,74013,8.35,,,, +US-OK-74014,US,OK,74014,5.8,,,, +US-OK-74015,US,OK,74015,9.583,,,, +US-OK-74016,US,OK,74016,6.333,,,, +US-OK-74017,US,OK,74017,9.333,,,, +US-OK-74018,US,OK,74018,9.333,,,, +US-OK-74019,US,OK,74019,6.333,,,, +US-OK-74020,US,OK,74020,10,,,, +US-OK-74021,US,OK,74021,9.1,,,, +US-OK-74022,US,OK,74022,5.5,,,, +US-OK-74023,US,OK,74023,9.313,,,, +US-OK-74026,US,OK,74026,9.5,,,, +US-OK-74027,US,OK,74027,8.5,,,, +US-OK-74028,US,OK,74028,5.5,,,, +US-OK-74029,US,OK,74029,8.5,,,, +US-OK-74030,US,OK,74030,10,,,, +US-OK-74031,US,OK,74031,10.333,,,, +US-OK-74032,US,OK,74032,5.313,,,, +US-OK-74033,US,OK,74033,9.35,,,, +US-OK-74034,US,OK,74034,11,,,, +US-OK-74035,US,OK,74035,9.25,,,, +US-OK-74036,US,OK,74036,6.333,,,, +US-OK-74037,US,OK,74037,8.35,,,, +US-OK-74038,US,OK,74038,6.5,,,, +US-OK-74039,US,OK,74039,5.5,,,, +US-OK-74041,US,OK,74041,9.5,,,, +US-OK-74042,US,OK,74042,8.5,,,, +US-OK-74043,US,OK,74043,5.35,,,, +US-OK-74044,US,OK,74044,5.5,,,, +US-OK-74045,US,OK,74045,6.5,,,, +US-OK-74046,US,OK,74046,5.5,,,, +US-OK-74047,US,OK,74047,5.75,,,, +US-OK-74048,US,OK,74048,9.5,,,, +US-OK-74050,US,OK,74050,5.35,,,, +US-OK-74051,US,OK,74051,5.5,,,, +US-OK-74052,US,OK,74052,10.5,,,, +US-OK-74053,US,OK,74053,6.333,,,, +US-OK-74054,US,OK,74054,5.75,,,, +US-OK-74055,US,OK,74055,8.35,,,, +US-OK-74056,US,OK,74056,8.75,,,, +US-OK-74058,US,OK,74058,6.5,,,, +US-OK-74059,US,OK,74059,5.313,,,, +US-OK-74060,US,OK,74060,8.75,,,, +US-OK-74061,US,OK,74061,5.5,,,, +US-OK-74062,US,OK,74062,5.313,,,, +US-OK-74063,US,OK,74063,8.85,,,, +US-OK-74066,US,OK,74066,9.5,,,, +US-OK-74067,US,OK,74067,9.5,,,, +US-OK-74068,US,OK,74068,8.5,,,, +US-OK-74070,US,OK,74070,5.75,,,, +US-OK-74071,US,OK,74071,8.5,,,, +US-OK-74072,US,OK,74072,8.5,,,, +US-OK-74073,US,OK,74073,5.75,,,, +US-OK-74074,US,OK,74074,8.813,,,, +US-OK-74075,US,OK,74075,8.813,,,, +US-OK-74076,US,OK,74076,8.813,,,, +US-OK-74077,US,OK,74077,8.813,,,, +US-OK-74078,US,OK,74078,8.813,,,, +US-OK-74079,US,OK,74079,9.5,,,, +US-OK-74080,US,OK,74080,6.333,,,, +US-OK-74081,US,OK,74081,6.5,,,, +US-OK-74082,US,OK,74082,7.5,,,, +US-OK-74083,US,OK,74083,8.5,,,, +US-OK-74084,US,OK,74084,9.75,,,, +US-OK-74085,US,OK,74085,5.313,,,, +US-OK-74101,US,OK,74101,8.517,,,, +US-OK-74102,US,OK,74102,8.517,,,, +US-OK-74103,US,OK,74103,8.517,,,, +US-OK-74104,US,OK,74104,8.517,,,, +US-OK-74105,US,OK,74105,8.517,,,, +US-OK-74106,US,OK,74106,8.517,,,, +US-OK-74107,US,OK,74107,8.517,,,, +US-OK-74108,US,OK,74108,8.517,,,, +US-OK-74110,US,OK,74110,8.517,,,, +US-OK-74112,US,OK,74112,8.517,,,, +US-OK-74114,US,OK,74114,8.517,,,, +US-OK-74115,US,OK,74115,8.517,,,, +US-OK-74116,US,OK,74116,8.517,,,, +US-OK-74117,US,OK,74117,5.35,,,, +US-OK-74119,US,OK,74119,8.517,,,, +US-OK-74120,US,OK,74120,8.517,,,, +US-OK-74121,US,OK,74121,8.517,,,, +US-OK-74126,US,OK,74126,8.517,,,, +US-OK-74127,US,OK,74127,8.517,,,, +US-OK-74128,US,OK,74128,8.517,,,, +US-OK-74129,US,OK,74129,8.517,,,, +US-OK-74130,US,OK,74130,5.35,,,, +US-OK-74131,US,OK,74131,5.5,,,, +US-OK-74132,US,OK,74132,8.517,,,, +US-OK-74133,US,OK,74133,8.517,,,, +US-OK-74134,US,OK,74134,8.517,,,, +US-OK-74135,US,OK,74135,8.517,,,, +US-OK-74136,US,OK,74136,8.517,,,, +US-OK-74137,US,OK,74137,8.517,,,, +US-OK-74141,US,OK,74141,8.517,,,, +US-OK-74145,US,OK,74145,8.517,,,, +US-OK-74146,US,OK,74146,8.517,,,, +US-OK-74147,US,OK,74147,8.517,,,, +US-OK-74148,US,OK,74148,8.517,,,, +US-OK-74149,US,OK,74149,8.517,,,, +US-OK-74150,US,OK,74150,8.517,,,, +US-OK-74152,US,OK,74152,8.517,,,, +US-OK-74153,US,OK,74153,8.517,,,, +US-OK-74155,US,OK,74155,8.517,,,, +US-OK-74156,US,OK,74156,8.517,,,, +US-OK-74157,US,OK,74157,8.517,,,, +US-OK-74158,US,OK,74158,8.517,,,, +US-OK-74159,US,OK,74159,8.517,,,, +US-OK-74169,US,OK,74169,8.517,,,, +US-OK-74170,US,OK,74170,8.517,,,, +US-OK-74171,US,OK,74171,8.517,,,, +US-OK-74172,US,OK,74172,8.517,,,, +US-OK-74182,US,OK,74182,8.517,,,, +US-OK-74186,US,OK,74186,8.517,,,, +US-OK-74187,US,OK,74187,8.517,,,, +US-OK-74192,US,OK,74192,8.517,,,, +US-OK-74193,US,OK,74193,8.517,,,, +US-OK-74301,US,OK,74301,6.5,,,, +US-OK-74330,US,OK,74330,5.875,,,, +US-OK-74331,US,OK,74331,5.9,,,, +US-OK-74332,US,OK,74332,6.5,,,, +US-OK-74333,US,OK,74333,6.5,,,, +US-OK-74335,US,OK,74335,5.85,,,, +US-OK-74337,US,OK,74337,5.875,,,, +US-OK-74338,US,OK,74338,5.9,,,, +US-OK-74339,US,OK,74339,8.85,,,, +US-OK-74340,US,OK,74340,9.75,,,, +US-OK-74342,US,OK,74342,5.9,,,, +US-OK-74343,US,OK,74343,5.85,,,, +US-OK-74344,US,OK,74344,5.9,,,, +US-OK-74345,US,OK,74345,9.3,,,, +US-OK-74346,US,OK,74346,5.9,,,, +US-OK-74347,US,OK,74347,5.9,,,, +US-OK-74349,US,OK,74349,9.5,,,, +US-OK-74350,US,OK,74350,8.875,,,, +US-OK-74352,US,OK,74352,5.875,,,, +US-OK-74354,US,OK,74354,9.5,,,, +US-OK-74355,US,OK,74355,9.5,,,, +US-OK-74358,US,OK,74358,8.85,,,, +US-OK-74359,US,OK,74359,8.9,,,, +US-OK-74360,US,OK,74360,10.85,,,, +US-OK-74361,US,OK,74361,5.875,,,, +US-OK-74362,US,OK,74362,9.625,,,, +US-OK-74363,US,OK,74363,5.85,,,, +US-OK-74364,US,OK,74364,5.9,,,, +US-OK-74365,US,OK,74365,5.875,,,, +US-OK-74366,US,OK,74366,5.875,,,, +US-OK-74367,US,OK,74367,5.875,,,, +US-OK-74368,US,OK,74368,5.9,,,, +US-OK-74369,US,OK,74369,6.5,,,, +US-OK-74370,US,OK,74370,5.85,,,, +US-OK-74401,US,OK,74401,9.15,,,, +US-OK-74402,US,OK,74402,9.15,,,, +US-OK-74403,US,OK,74403,9.15,,,, +US-OK-74421,US,OK,74421,5.75,,,, +US-OK-74422,US,OK,74422,5.75,,,, +US-OK-74423,US,OK,74423,8.15,,,, +US-OK-74425,US,OK,74425,5.5,,,, +US-OK-74426,US,OK,74426,10.5,,,, +US-OK-74427,US,OK,74427,6.25,,,, +US-OK-74428,US,OK,74428,7.15,,,, +US-OK-74429,US,OK,74429,5.8,,,, +US-OK-74430,US,OK,74430,9.5,,,, +US-OK-74431,US,OK,74431,9.75,,,, +US-OK-74432,US,OK,74432,10,,,, +US-OK-74434,US,OK,74434,6.25,,,, +US-OK-74435,US,OK,74435,8.917,,,, +US-OK-74436,US,OK,74436,9.5,,,, +US-OK-74437,US,OK,74437,9.75,,,, +US-OK-74438,US,OK,74438,6.5,,,, +US-OK-74439,US,OK,74439,8.15,,,, +US-OK-74440,US,OK,74440,9.25,,,, +US-OK-74441,US,OK,74441,6.25,,,, +US-OK-74442,US,OK,74442,5.5,,,, +US-OK-74444,US,OK,74444,6.25,,,, +US-OK-74445,US,OK,74445,5.75,,,, +US-OK-74446,US,OK,74446,9.8,,,, +US-OK-74447,US,OK,74447,9.75,,,, +US-OK-74450,US,OK,74450,5.15,,,, +US-OK-74451,US,OK,74451,6.25,,,, +US-OK-74452,US,OK,74452,6.25,,,, +US-OK-74454,US,OK,74454,5.8,,,, +US-OK-74455,US,OK,74455,9.15,,,, +US-OK-74456,US,OK,74456,5.75,,,, +US-OK-74457,US,OK,74457,6.25,,,, +US-OK-74458,US,OK,74458,5.8,,,, +US-OK-74459,US,OK,74459,10.5,,,, +US-OK-74460,US,OK,74460,6.25,,,, +US-OK-74461,US,OK,74461,6.5,,,, +US-OK-74462,US,OK,74462,9.25,,,, +US-OK-74463,US,OK,74463,9.15,,,, +US-OK-74464,US,OK,74464,9.5,,,, +US-OK-74465,US,OK,74465,9.5,,,, +US-OK-74467,US,OK,74467,8.8,,,, +US-OK-74468,US,OK,74468,9.15,,,, +US-OK-74469,US,OK,74469,9.15,,,, +US-OK-74470,US,OK,74470,8.65,,,, +US-OK-74471,US,OK,74471,6.25,,,, +US-OK-74472,US,OK,74472,9.25,,,, +US-OK-74477,US,OK,74477,8.8,,,, +US-OK-74501,US,OK,74501,9,,,, +US-OK-74502,US,OK,74502,9.5,,,, +US-OK-74521,US,OK,74521,6.5,,,, +US-OK-74522,US,OK,74522,7.5,,,, +US-OK-74523,US,OK,74523,9.5,,,, +US-OK-74525,US,OK,74525,9.5,,,, +US-OK-74528,US,OK,74528,5.5,,,, +US-OK-74529,US,OK,74529,5.5,,,, +US-OK-74530,US,OK,74530,6,,,, +US-OK-74531,US,OK,74531,4.75,,,, +US-OK-74533,US,OK,74533,6.5,,,, +US-OK-74534,US,OK,74534,6.5,,,, +US-OK-74535,US,OK,74535,6.5,,,, +US-OK-74536,US,OK,74536,10.5,,,, +US-OK-74538,US,OK,74538,9.5,,,, +US-OK-74540,US,OK,74540,6.5,,,, +US-OK-74543,US,OK,74543,6.5,,,, +US-OK-74545,US,OK,74545,6,,,, +US-OK-74546,US,OK,74546,8.5,,,, +US-OK-74547,US,OK,74547,8.75,,,, +US-OK-74549,US,OK,74549,6,,,, +US-OK-74552,US,OK,74552,6.25,,,, +US-OK-74553,US,OK,74553,8.5,,,, +US-OK-74554,US,OK,74554,9.5,,,, +US-OK-74555,US,OK,74555,6.5,,,, +US-OK-74556,US,OK,74556,8.5,,,, +US-OK-74557,US,OK,74557,6.5,,,, +US-OK-74558,US,OK,74558,6.5,,,, +US-OK-74559,US,OK,74559,6,,,, +US-OK-74560,US,OK,74560,5.5,,,, +US-OK-74561,US,OK,74561,5.5,,,, +US-OK-74562,US,OK,74562,8.5,,,, +US-OK-74563,US,OK,74563,6,,,, +US-OK-74565,US,OK,74565,10.5,,,, +US-OK-74567,US,OK,74567,6.5,,,, +US-OK-74569,US,OK,74569,6.5,,,, +US-OK-74570,US,OK,74570,5.5,,,, +US-OK-74571,US,OK,74571,9,,,, +US-OK-74572,US,OK,74572,9.5,,,, +US-OK-74574,US,OK,74574,6,,,, +US-OK-74576,US,OK,74576,5.5,,,, +US-OK-74577,US,OK,74577,6,,,, +US-OK-74578,US,OK,74578,6,,,, +US-OK-74601,US,OK,74601,8.667,,,, +US-OK-74602,US,OK,74602,8.667,,,, +US-OK-74604,US,OK,74604,5.75,,,, +US-OK-74630,US,OK,74630,6,,,, +US-OK-74631,US,OK,74631,9.167,,,, +US-OK-74632,US,OK,74632,5.167,,,, +US-OK-74633,US,OK,74633,5.75,,,, +US-OK-74636,US,OK,74636,8.75,,,, +US-OK-74637,US,OK,74637,8.75,,,, +US-OK-74640,US,OK,74640,4.85,,,, +US-OK-74641,US,OK,74641,5.167,,,, +US-OK-74643,US,OK,74643,9.75,,,, +US-OK-74644,US,OK,74644,6,,,, +US-OK-74646,US,OK,74646,5.167,,,, +US-OK-74647,US,OK,74647,5.167,,,, +US-OK-74650,US,OK,74650,9.5,,,, +US-OK-74651,US,OK,74651,6,,,, +US-OK-74652,US,OK,74652,5.75,,,, +US-OK-74653,US,OK,74653,9.667,,,, +US-OK-74701,US,OK,74701,9.375,,,, +US-OK-74702,US,OK,74702,9.375,,,, +US-OK-74720,US,OK,74720,8,,,, +US-OK-74721,US,OK,74721,5,,,, +US-OK-74722,US,OK,74722,6,,,, +US-OK-74723,US,OK,74723,5,,,, +US-OK-74724,US,OK,74724,9.5,,,, +US-OK-74726,US,OK,74726,5,,,, +US-OK-74727,US,OK,74727,9.5,,,, +US-OK-74728,US,OK,74728,8.25,,,, +US-OK-74729,US,OK,74729,5,,,, +US-OK-74730,US,OK,74730,5,,,, +US-OK-74731,US,OK,74731,5,,,, +US-OK-74733,US,OK,74733,5,,,, +US-OK-74734,US,OK,74734,6,,,, +US-OK-74735,US,OK,74735,10,,,, +US-OK-74736,US,OK,74736,6,,,, +US-OK-74737,US,OK,74737,6,,,, +US-OK-74738,US,OK,74738,6.5,,,, +US-OK-74740,US,OK,74740,9.5,,,, +US-OK-74741,US,OK,74741,5,,,, +US-OK-74743,US,OK,74743,10,,,, +US-OK-74745,US,OK,74745,9,,,, +US-OK-74747,US,OK,74747,5,,,, +US-OK-74748,US,OK,74748,6,,,, +US-OK-74750,US,OK,74750,9,,,, +US-OK-74752,US,OK,74752,6,,,, +US-OK-74753,US,OK,74753,5,,,, +US-OK-74754,US,OK,74754,6,,,, +US-OK-74755,US,OK,74755,6,,,, +US-OK-74756,US,OK,74756,7.5,,,, +US-OK-74759,US,OK,74759,8.5,,,, +US-OK-74760,US,OK,74760,6.5,,,, +US-OK-74761,US,OK,74761,6.5,,,, +US-OK-74764,US,OK,74764,9,,,, +US-OK-74766,US,OK,74766,9,,,, +US-OK-74801,US,OK,74801,8.5,,,, +US-OK-74802,US,OK,74802,8.5,,,, +US-OK-74804,US,OK,74804,8.5,,,, +US-OK-74818,US,OK,74818,9.75,,,, +US-OK-74820,US,OK,74820,9.375,,,, +US-OK-74821,US,OK,74821,9.375,,,, +US-OK-74824,US,OK,74824,5.5,,,, +US-OK-74825,US,OK,74825,8.375,,,, +US-OK-74826,US,OK,74826,5.5,,,, +US-OK-74827,US,OK,74827,4.75,,,, +US-OK-74829,US,OK,74829,8.75,,,, +US-OK-74830,US,OK,74830,8.75,,,, +US-OK-74831,US,OK,74831,5,,,, +US-OK-74832,US,OK,74832,9.5,,,, +US-OK-74833,US,OK,74833,7.75,,,, +US-OK-74834,US,OK,74834,5.5,,,, +US-OK-74836,US,OK,74836,6,,,, +US-OK-74837,US,OK,74837,8.75,,,, +US-OK-74839,US,OK,74839,4.75,,,, +US-OK-74840,US,OK,74840,5.5,,,, +US-OK-74842,US,OK,74842,5.375,,,, +US-OK-74843,US,OK,74843,5.375,,,, +US-OK-74844,US,OK,74844,8.375,,,, +US-OK-74845,US,OK,74845,10.5,,,, +US-OK-74848,US,OK,74848,9.75,,,, +US-OK-74849,US,OK,74849,9.75,,,, +US-OK-74850,US,OK,74850,7.75,,,, +US-OK-74851,US,OK,74851,9.5,,,, +US-OK-74852,US,OK,74852,5.5,,,, +US-OK-74854,US,OK,74854,9.5,,,, +US-OK-74855,US,OK,74855,5.5,,,, +US-OK-74856,US,OK,74856,6,,,, +US-OK-74857,US,OK,74857,8.625,,,, +US-OK-74859,US,OK,74859,9.25,,,, +US-OK-74860,US,OK,74860,5.75,,,, +US-OK-74864,US,OK,74864,9.5,,,, +US-OK-74865,US,OK,74865,5.375,,,, +US-OK-74866,US,OK,74866,5.5,,,, +US-OK-74867,US,OK,74867,5.75,,,, +US-OK-74868,US,OK,74868,9.75,,,, +US-OK-74869,US,OK,74869,5.5,,,, +US-OK-74871,US,OK,74871,5.375,,,, +US-OK-74872,US,OK,74872,9.25,,,, +US-OK-74873,US,OK,74873,8.5,,,, +US-OK-74875,US,OK,74875,5.5,,,, +US-OK-74878,US,OK,74878,5.5,,,, +US-OK-74880,US,OK,74880,5.75,,,, +US-OK-74881,US,OK,74881,5.5,,,, +US-OK-74883,US,OK,74883,9.75,,,, +US-OK-74884,US,OK,74884,9.75,,,, +US-OK-74901,US,OK,74901,9,,,, +US-OK-74902,US,OK,74902,9,,,, +US-OK-74930,US,OK,74930,6,,,, +US-OK-74931,US,OK,74931,6.25,,,, +US-OK-74932,US,OK,74932,6,,,, +US-OK-74935,US,OK,74935,9,,,, +US-OK-74936,US,OK,74936,7.917,,,, +US-OK-74937,US,OK,74937,6,,,, +US-OK-74939,US,OK,74939,6,,,, +US-OK-74940,US,OK,74940,6,,,, +US-OK-74941,US,OK,74941,6.25,,,, +US-OK-74942,US,OK,74942,7,,,, +US-OK-74943,US,OK,74943,6.25,,,, +US-OK-74944,US,OK,74944,6.25,,,, +US-OK-74945,US,OK,74945,8.917,,,, +US-OK-74946,US,OK,74946,7.917,,,, +US-OK-74947,US,OK,74947,6,,,, +US-OK-74948,US,OK,74948,5.917,,,, +US-OK-74949,US,OK,74949,6,,,, +US-OK-74951,US,OK,74951,9,,,, +US-OK-74953,US,OK,74953,9,,,, +US-OK-74954,US,OK,74954,9.917,,,, +US-OK-74955,US,OK,74955,9.917,,,, +US-OK-74956,US,OK,74956,9.5,,,, +US-OK-74957,US,OK,74957,6,,,, +US-OK-74959,US,OK,74959,6,,,, +US-OK-74960,US,OK,74960,8.75,,,, +US-OK-74962,US,OK,74962,9.917,,,, +US-OK-74963,US,OK,74963,6,,,, +US-OK-74964,US,OK,74964,9.25,,,, +US-OK-74965,US,OK,74965,9,,,, +US-OK-74966,US,OK,74966,6,,,, +US-PA-15001,US,PA,15001,6,,,, +US-PA-15003,US,PA,15003,6,,,, +US-PA-15004,US,PA,15004,6,,,, +US-PA-15005,US,PA,15005,6,,,, +US-PA-15006,US,PA,15006,7,,,, +US-PA-15007,US,PA,15007,7,,,, +US-PA-15009,US,PA,15009,6,,,, +US-PA-15010,US,PA,15010,6,,,, +US-PA-15012,US,PA,15012,6,,,, +US-PA-15014,US,PA,15014,7,,,, +US-PA-15015,US,PA,15015,7,,,, +US-PA-15017,US,PA,15017,7,,,, +US-PA-15018,US,PA,15018,7,,,, +US-PA-15019,US,PA,15019,6,,,, +US-PA-15020,US,PA,15020,7,,,, +US-PA-15021,US,PA,15021,6,,,, +US-PA-15022,US,PA,15022,6,,,, +US-PA-15024,US,PA,15024,7,,,, +US-PA-15025,US,PA,15025,7,,,, +US-PA-15026,US,PA,15026,6,,,, +US-PA-15027,US,PA,15027,6,,,, +US-PA-15028,US,PA,15028,7,,,, +US-PA-15030,US,PA,15030,7,,,, +US-PA-15031,US,PA,15031,7,,,, +US-PA-15032,US,PA,15032,7,,,, +US-PA-15033,US,PA,15033,6,,,, +US-PA-15034,US,PA,15034,7,,,, +US-PA-15035,US,PA,15035,7,,,, +US-PA-15037,US,PA,15037,7,,,, +US-PA-15038,US,PA,15038,6,,,, +US-PA-15042,US,PA,15042,6,,,, +US-PA-15043,US,PA,15043,6,,,, +US-PA-15044,US,PA,15044,7,,,, +US-PA-15045,US,PA,15045,7,,,, +US-PA-15046,US,PA,15046,7,,,, +US-PA-15047,US,PA,15047,7,,,, +US-PA-15049,US,PA,15049,7,,,, +US-PA-15050,US,PA,15050,6,,,, +US-PA-15051,US,PA,15051,7,,,, +US-PA-15052,US,PA,15052,6,,,, +US-PA-15053,US,PA,15053,6,,,, +US-PA-15054,US,PA,15054,6,,,, +US-PA-15055,US,PA,15055,6,,,, +US-PA-15056,US,PA,15056,7,,,, +US-PA-15057,US,PA,15057,6,,,, +US-PA-15059,US,PA,15059,6,,,, +US-PA-15060,US,PA,15060,6,,,, +US-PA-15061,US,PA,15061,6,,,, +US-PA-15062,US,PA,15062,6,,,, +US-PA-15063,US,PA,15063,6,,,, +US-PA-15064,US,PA,15064,7,,,, +US-PA-15065,US,PA,15065,7,,,, +US-PA-15066,US,PA,15066,6,,,, +US-PA-15067,US,PA,15067,6,,,, +US-PA-15068,US,PA,15068,6,,,, +US-PA-15069,US,PA,15069,6,,,, +US-PA-15071,US,PA,15071,7,,,, +US-PA-15074,US,PA,15074,6,,,, +US-PA-15075,US,PA,15075,7,,,, +US-PA-15076,US,PA,15076,7,,,, +US-PA-15077,US,PA,15077,6,,,, +US-PA-15078,US,PA,15078,6,,,, +US-PA-15081,US,PA,15081,6,,,, +US-PA-15082,US,PA,15082,7,,,, +US-PA-15083,US,PA,15083,6,,,, +US-PA-15084,US,PA,15084,7,,,, +US-PA-15085,US,PA,15085,6,,,, +US-PA-15086,US,PA,15086,7,,,, +US-PA-15087,US,PA,15087,6,,,, +US-PA-15088,US,PA,15088,7,,,, +US-PA-15089,US,PA,15089,6,,,, +US-PA-15090,US,PA,15090,7,,,, +US-PA-15091,US,PA,15091,7,,,, +US-PA-15095,US,PA,15095,7,,,, +US-PA-15096,US,PA,15096,7,,,, +US-PA-15101,US,PA,15101,7,,,, +US-PA-15102,US,PA,15102,7,,,, +US-PA-15104,US,PA,15104,7,,,, +US-PA-15106,US,PA,15106,7,,,, +US-PA-15108,US,PA,15108,7,,,, +US-PA-15110,US,PA,15110,7,,,, +US-PA-15112,US,PA,15112,7,,,, +US-PA-15116,US,PA,15116,7,,,, +US-PA-15120,US,PA,15120,7,,,, +US-PA-15122,US,PA,15122,7,,,, +US-PA-15123,US,PA,15123,7,,,, +US-PA-15126,US,PA,15126,7,,,, +US-PA-15127,US,PA,15127,7,,,, +US-PA-15129,US,PA,15129,7,,,, +US-PA-15131,US,PA,15131,7,,,, +US-PA-15132,US,PA,15132,7,,,, +US-PA-15133,US,PA,15133,7,,,, +US-PA-15134,US,PA,15134,7,,,, +US-PA-15135,US,PA,15135,7,,,, +US-PA-15136,US,PA,15136,7,,,, +US-PA-15137,US,PA,15137,7,,,, +US-PA-15139,US,PA,15139,7,,,, +US-PA-15140,US,PA,15140,7,,,, +US-PA-15142,US,PA,15142,7,,,, +US-PA-15143,US,PA,15143,7,,,, +US-PA-15144,US,PA,15144,7,,,, +US-PA-15145,US,PA,15145,7,,,, +US-PA-15146,US,PA,15146,7,,,, +US-PA-15147,US,PA,15147,7,,,, +US-PA-15148,US,PA,15148,7,,,, +US-PA-15201,US,PA,15201,7,,,, +US-PA-15202,US,PA,15202,7,,,, +US-PA-15203,US,PA,15203,7,,,, +US-PA-15204,US,PA,15204,7,,,, +US-PA-15205,US,PA,15205,7,,,, +US-PA-15206,US,PA,15206,7,,,, +US-PA-15207,US,PA,15207,7,,,, +US-PA-15208,US,PA,15208,7,,,, +US-PA-15209,US,PA,15209,7,,,, +US-PA-15210,US,PA,15210,7,,,, +US-PA-15211,US,PA,15211,7,,,, +US-PA-15212,US,PA,15212,7,,,, +US-PA-15213,US,PA,15213,7,,,, +US-PA-15214,US,PA,15214,7,,,, +US-PA-15215,US,PA,15215,7,,,, +US-PA-15216,US,PA,15216,7,,,, +US-PA-15217,US,PA,15217,7,,,, +US-PA-15218,US,PA,15218,7,,,, +US-PA-15219,US,PA,15219,7,,,, +US-PA-15220,US,PA,15220,7,,,, +US-PA-15221,US,PA,15221,7,,,, +US-PA-15222,US,PA,15222,7,,,, +US-PA-15223,US,PA,15223,7,,,, +US-PA-15224,US,PA,15224,7,,,, +US-PA-15225,US,PA,15225,7,,,, +US-PA-15226,US,PA,15226,7,,,, +US-PA-15227,US,PA,15227,7,,,, +US-PA-15228,US,PA,15228,7,,,, +US-PA-15229,US,PA,15229,7,,,, +US-PA-15230,US,PA,15230,7,,,, +US-PA-15231,US,PA,15231,7,,,, +US-PA-15232,US,PA,15232,7,,,, +US-PA-15233,US,PA,15233,7,,,, +US-PA-15234,US,PA,15234,7,,,, +US-PA-15235,US,PA,15235,7,,,, +US-PA-15236,US,PA,15236,7,,,, +US-PA-15237,US,PA,15237,7,,,, +US-PA-15238,US,PA,15238,7,,,, +US-PA-15239,US,PA,15239,7,,,, +US-PA-15240,US,PA,15240,7,,,, +US-PA-15241,US,PA,15241,7,,,, +US-PA-15242,US,PA,15242,7,,,, +US-PA-15243,US,PA,15243,7,,,, +US-PA-15244,US,PA,15244,7,,,, +US-PA-15250,US,PA,15250,7,,,, +US-PA-15251,US,PA,15251,7,,,, +US-PA-15252,US,PA,15252,7,,,, +US-PA-15253,US,PA,15253,7,,,, +US-PA-15254,US,PA,15254,7,,,, +US-PA-15255,US,PA,15255,7,,,, +US-PA-15257,US,PA,15257,7,,,, +US-PA-15258,US,PA,15258,7,,,, +US-PA-15259,US,PA,15259,7,,,, +US-PA-15260,US,PA,15260,7,,,, +US-PA-15261,US,PA,15261,7,,,, +US-PA-15262,US,PA,15262,7,,,, +US-PA-15264,US,PA,15264,7,,,, +US-PA-15265,US,PA,15265,7,,,, +US-PA-15267,US,PA,15267,7,,,, +US-PA-15268,US,PA,15268,7,,,, +US-PA-15270,US,PA,15270,7,,,, +US-PA-15272,US,PA,15272,7,,,, +US-PA-15274,US,PA,15274,7,,,, +US-PA-15275,US,PA,15275,7,,,, +US-PA-15276,US,PA,15276,7,,,, +US-PA-15277,US,PA,15277,7,,,, +US-PA-15278,US,PA,15278,7,,,, +US-PA-15279,US,PA,15279,7,,,, +US-PA-15281,US,PA,15281,7,,,, +US-PA-15282,US,PA,15282,7,,,, +US-PA-15283,US,PA,15283,7,,,, +US-PA-15286,US,PA,15286,7,,,, +US-PA-15289,US,PA,15289,7,,,, +US-PA-15290,US,PA,15290,7,,,, +US-PA-15295,US,PA,15295,7,,,, +US-PA-15301,US,PA,15301,6,,,, +US-PA-15310,US,PA,15310,6,,,, +US-PA-15311,US,PA,15311,6,,,, +US-PA-15312,US,PA,15312,6,,,, +US-PA-15313,US,PA,15313,6,,,, +US-PA-15314,US,PA,15314,6,,,, +US-PA-15315,US,PA,15315,6,,,, +US-PA-15316,US,PA,15316,6,,,, +US-PA-15317,US,PA,15317,6,,,, +US-PA-15320,US,PA,15320,6,,,, +US-PA-15321,US,PA,15321,6,,,, +US-PA-15322,US,PA,15322,6,,,, +US-PA-15323,US,PA,15323,6,,,, +US-PA-15324,US,PA,15324,6,,,, +US-PA-15325,US,PA,15325,6,,,, +US-PA-15327,US,PA,15327,6,,,, +US-PA-15329,US,PA,15329,6,,,, +US-PA-15330,US,PA,15330,6,,,, +US-PA-15331,US,PA,15331,6,,,, +US-PA-15332,US,PA,15332,6,,,, +US-PA-15333,US,PA,15333,6,,,, +US-PA-15334,US,PA,15334,6,,,, +US-PA-15336,US,PA,15336,6,,,, +US-PA-15337,US,PA,15337,6,,,, +US-PA-15338,US,PA,15338,6,,,, +US-PA-15339,US,PA,15339,6,,,, +US-PA-15340,US,PA,15340,6,,,, +US-PA-15341,US,PA,15341,6,,,, +US-PA-15342,US,PA,15342,6,,,, +US-PA-15344,US,PA,15344,6,,,, +US-PA-15345,US,PA,15345,6,,,, +US-PA-15346,US,PA,15346,6,,,, +US-PA-15347,US,PA,15347,6,,,, +US-PA-15348,US,PA,15348,6,,,, +US-PA-15349,US,PA,15349,6,,,, +US-PA-15350,US,PA,15350,6,,,, +US-PA-15351,US,PA,15351,6,,,, +US-PA-15352,US,PA,15352,6,,,, +US-PA-15353,US,PA,15353,6,,,, +US-PA-15357,US,PA,15357,6,,,, +US-PA-15358,US,PA,15358,6,,,, +US-PA-15359,US,PA,15359,6,,,, +US-PA-15360,US,PA,15360,6,,,, +US-PA-15361,US,PA,15361,6,,,, +US-PA-15362,US,PA,15362,6,,,, +US-PA-15363,US,PA,15363,6,,,, +US-PA-15364,US,PA,15364,6,,,, +US-PA-15365,US,PA,15365,6,,,, +US-PA-15366,US,PA,15366,6,,,, +US-PA-15367,US,PA,15367,6,,,, +US-PA-15368,US,PA,15368,6,,,, +US-PA-15370,US,PA,15370,6,,,, +US-PA-15376,US,PA,15376,6,,,, +US-PA-15377,US,PA,15377,6,,,, +US-PA-15378,US,PA,15378,6,,,, +US-PA-15379,US,PA,15379,6,,,, +US-PA-15380,US,PA,15380,6,,,, +US-PA-15401,US,PA,15401,6,,,, +US-PA-15410,US,PA,15410,6,,,, +US-PA-15411,US,PA,15411,6,,,, +US-PA-15412,US,PA,15412,6,,,, +US-PA-15413,US,PA,15413,6,,,, +US-PA-15415,US,PA,15415,6,,,, +US-PA-15416,US,PA,15416,6,,,, +US-PA-15417,US,PA,15417,6,,,, +US-PA-15419,US,PA,15419,6,,,, +US-PA-15420,US,PA,15420,6,,,, +US-PA-15421,US,PA,15421,6,,,, +US-PA-15422,US,PA,15422,6,,,, +US-PA-15423,US,PA,15423,6,,,, +US-PA-15424,US,PA,15424,6,,,, +US-PA-15425,US,PA,15425,6,,,, +US-PA-15427,US,PA,15427,6,,,, +US-PA-15428,US,PA,15428,6,,,, +US-PA-15429,US,PA,15429,6,,,, +US-PA-15430,US,PA,15430,6,,,, +US-PA-15431,US,PA,15431,6,,,, +US-PA-15432,US,PA,15432,6,,,, +US-PA-15433,US,PA,15433,6,,,, +US-PA-15434,US,PA,15434,6,,,, +US-PA-15435,US,PA,15435,6,,,, +US-PA-15436,US,PA,15436,6,,,, +US-PA-15437,US,PA,15437,6,,,, +US-PA-15438,US,PA,15438,6,,,, +US-PA-15439,US,PA,15439,6,,,, +US-PA-15440,US,PA,15440,6,,,, +US-PA-15442,US,PA,15442,6,,,, +US-PA-15443,US,PA,15443,6,,,, +US-PA-15444,US,PA,15444,6,,,, +US-PA-15445,US,PA,15445,6,,,, +US-PA-15446,US,PA,15446,6,,,, +US-PA-15447,US,PA,15447,6,,,, +US-PA-15448,US,PA,15448,6,,,, +US-PA-15449,US,PA,15449,6,,,, +US-PA-15450,US,PA,15450,6,,,, +US-PA-15451,US,PA,15451,6,,,, +US-PA-15454,US,PA,15454,6,,,, +US-PA-15455,US,PA,15455,6,,,, +US-PA-15456,US,PA,15456,6,,,, +US-PA-15458,US,PA,15458,6,,,, +US-PA-15459,US,PA,15459,6,,,, +US-PA-15460,US,PA,15460,6,,,, +US-PA-15461,US,PA,15461,6,,,, +US-PA-15462,US,PA,15462,6,,,, +US-PA-15463,US,PA,15463,6,,,, +US-PA-15464,US,PA,15464,6,,,, +US-PA-15465,US,PA,15465,6,,,, +US-PA-15466,US,PA,15466,6,,,, +US-PA-15467,US,PA,15467,6,,,, +US-PA-15468,US,PA,15468,6,,,, +US-PA-15469,US,PA,15469,6,,,, +US-PA-15470,US,PA,15470,6,,,, +US-PA-15472,US,PA,15472,6,,,, +US-PA-15473,US,PA,15473,6,,,, +US-PA-15474,US,PA,15474,6,,,, +US-PA-15475,US,PA,15475,6,,,, +US-PA-15476,US,PA,15476,6,,,, +US-PA-15477,US,PA,15477,6,,,, +US-PA-15478,US,PA,15478,6,,,, +US-PA-15479,US,PA,15479,6,,,, +US-PA-15480,US,PA,15480,6,,,, +US-PA-15482,US,PA,15482,6,,,, +US-PA-15483,US,PA,15483,6,,,, +US-PA-15484,US,PA,15484,6,,,, +US-PA-15485,US,PA,15485,6,,,, +US-PA-15486,US,PA,15486,6,,,, +US-PA-15488,US,PA,15488,6,,,, +US-PA-15489,US,PA,15489,6,,,, +US-PA-15490,US,PA,15490,6,,,, +US-PA-15492,US,PA,15492,6,,,, +US-PA-15501,US,PA,15501,6,,,, +US-PA-15502,US,PA,15502,6,,,, +US-PA-15510,US,PA,15510,6,,,, +US-PA-15520,US,PA,15520,6,,,, +US-PA-15521,US,PA,15521,6,,,, +US-PA-15522,US,PA,15522,6,,,, +US-PA-15530,US,PA,15530,6,,,, +US-PA-15531,US,PA,15531,6,,,, +US-PA-15532,US,PA,15532,6,,,, +US-PA-15533,US,PA,15533,6,,,, +US-PA-15534,US,PA,15534,6,,,, +US-PA-15535,US,PA,15535,6,,,, +US-PA-15536,US,PA,15536,6,,,, +US-PA-15537,US,PA,15537,6,,,, +US-PA-15538,US,PA,15538,6,,,, +US-PA-15539,US,PA,15539,6,,,, +US-PA-15540,US,PA,15540,6,,,, +US-PA-15541,US,PA,15541,6,,,, +US-PA-15542,US,PA,15542,6,,,, +US-PA-15544,US,PA,15544,6,,,, +US-PA-15545,US,PA,15545,6,,,, +US-PA-15546,US,PA,15546,6,,,, +US-PA-15547,US,PA,15547,6,,,, +US-PA-15548,US,PA,15548,6,,,, +US-PA-15549,US,PA,15549,6,,,, +US-PA-15550,US,PA,15550,6,,,, +US-PA-15551,US,PA,15551,6,,,, +US-PA-15552,US,PA,15552,6,,,, +US-PA-15553,US,PA,15553,6,,,, +US-PA-15554,US,PA,15554,6,,,, +US-PA-15555,US,PA,15555,6,,,, +US-PA-15557,US,PA,15557,6,,,, +US-PA-15558,US,PA,15558,6,,,, +US-PA-15559,US,PA,15559,6,,,, +US-PA-15560,US,PA,15560,6,,,, +US-PA-15561,US,PA,15561,6,,,, +US-PA-15562,US,PA,15562,6,,,, +US-PA-15563,US,PA,15563,6,,,, +US-PA-15564,US,PA,15564,6,,,, +US-PA-15565,US,PA,15565,6,,,, +US-PA-15601,US,PA,15601,6,,,, +US-PA-15605,US,PA,15605,6,,,, +US-PA-15606,US,PA,15606,6,,,, +US-PA-15610,US,PA,15610,6,,,, +US-PA-15611,US,PA,15611,6,,,, +US-PA-15612,US,PA,15612,6,,,, +US-PA-15613,US,PA,15613,6,,,, +US-PA-15615,US,PA,15615,6,,,, +US-PA-15616,US,PA,15616,6,,,, +US-PA-15617,US,PA,15617,6,,,, +US-PA-15618,US,PA,15618,6,,,, +US-PA-15619,US,PA,15619,6,,,, +US-PA-15620,US,PA,15620,6,,,, +US-PA-15621,US,PA,15621,6,,,, +US-PA-15622,US,PA,15622,6,,,, +US-PA-15623,US,PA,15623,6,,,, +US-PA-15624,US,PA,15624,6,,,, +US-PA-15625,US,PA,15625,6,,,, +US-PA-15626,US,PA,15626,6,,,, +US-PA-15627,US,PA,15627,6,,,, +US-PA-15628,US,PA,15628,6,,,, +US-PA-15629,US,PA,15629,6,,,, +US-PA-15631,US,PA,15631,6,,,, +US-PA-15632,US,PA,15632,6,,,, +US-PA-15633,US,PA,15633,6,,,, +US-PA-15634,US,PA,15634,6,,,, +US-PA-15635,US,PA,15635,6,,,, +US-PA-15636,US,PA,15636,6,,,, +US-PA-15637,US,PA,15637,6,,,, +US-PA-15638,US,PA,15638,6,,,, +US-PA-15639,US,PA,15639,6,,,, +US-PA-15640,US,PA,15640,6,,,, +US-PA-15641,US,PA,15641,6,,,, +US-PA-15642,US,PA,15642,6,,,, +US-PA-15644,US,PA,15644,6,,,, +US-PA-15646,US,PA,15646,6,,,, +US-PA-15647,US,PA,15647,6,,,, +US-PA-15650,US,PA,15650,6,,,, +US-PA-15655,US,PA,15655,6,,,, +US-PA-15656,US,PA,15656,6,,,, +US-PA-15658,US,PA,15658,6,,,, +US-PA-15660,US,PA,15660,6,,,, +US-PA-15661,US,PA,15661,6,,,, +US-PA-15662,US,PA,15662,6,,,, +US-PA-15663,US,PA,15663,6,,,, +US-PA-15664,US,PA,15664,6,,,, +US-PA-15665,US,PA,15665,6,,,, +US-PA-15666,US,PA,15666,6,,,, +US-PA-15668,US,PA,15668,6,,,, +US-PA-15670,US,PA,15670,6,,,, +US-PA-15671,US,PA,15671,6,,,, +US-PA-15672,US,PA,15672,6,,,, +US-PA-15673,US,PA,15673,6,,,, +US-PA-15674,US,PA,15674,6,,,, +US-PA-15675,US,PA,15675,6,,,, +US-PA-15676,US,PA,15676,6,,,, +US-PA-15677,US,PA,15677,6,,,, +US-PA-15678,US,PA,15678,6,,,, +US-PA-15679,US,PA,15679,6,,,, +US-PA-15680,US,PA,15680,6,,,, +US-PA-15681,US,PA,15681,6,,,, +US-PA-15682,US,PA,15682,6,,,, +US-PA-15683,US,PA,15683,6,,,, +US-PA-15684,US,PA,15684,6,,,, +US-PA-15685,US,PA,15685,6,,,, +US-PA-15686,US,PA,15686,6,,,, +US-PA-15687,US,PA,15687,6,,,, +US-PA-15688,US,PA,15688,6,,,, +US-PA-15689,US,PA,15689,6,,,, +US-PA-15690,US,PA,15690,6,,,, +US-PA-15691,US,PA,15691,6,,,, +US-PA-15692,US,PA,15692,6,,,, +US-PA-15693,US,PA,15693,6,,,, +US-PA-15695,US,PA,15695,6,,,, +US-PA-15696,US,PA,15696,6,,,, +US-PA-15697,US,PA,15697,6,,,, +US-PA-15698,US,PA,15698,6,,,, +US-PA-15701,US,PA,15701,6,,,, +US-PA-15705,US,PA,15705,6,,,, +US-PA-15710,US,PA,15710,6,,,, +US-PA-15711,US,PA,15711,6,,,, +US-PA-15712,US,PA,15712,6,,,, +US-PA-15713,US,PA,15713,6,,,, +US-PA-15714,US,PA,15714,6,,,, +US-PA-15715,US,PA,15715,6,,,, +US-PA-15716,US,PA,15716,6,,,, +US-PA-15717,US,PA,15717,6,,,, +US-PA-15720,US,PA,15720,6,,,, +US-PA-15721,US,PA,15721,6,,,, +US-PA-15722,US,PA,15722,6,,,, +US-PA-15723,US,PA,15723,6,,,, +US-PA-15724,US,PA,15724,6,,,, +US-PA-15725,US,PA,15725,6,,,, +US-PA-15727,US,PA,15727,6,,,, +US-PA-15728,US,PA,15728,6,,,, +US-PA-15729,US,PA,15729,6,,,, +US-PA-15730,US,PA,15730,6,,,, +US-PA-15731,US,PA,15731,6,,,, +US-PA-15732,US,PA,15732,6,,,, +US-PA-15733,US,PA,15733,6,,,, +US-PA-15734,US,PA,15734,6,,,, +US-PA-15736,US,PA,15736,6,,,, +US-PA-15737,US,PA,15737,6,,,, +US-PA-15738,US,PA,15738,6,,,, +US-PA-15739,US,PA,15739,6,,,, +US-PA-15741,US,PA,15741,6,,,, +US-PA-15742,US,PA,15742,6,,,, +US-PA-15744,US,PA,15744,6,,,, +US-PA-15745,US,PA,15745,6,,,, +US-PA-15746,US,PA,15746,6,,,, +US-PA-15747,US,PA,15747,6,,,, +US-PA-15748,US,PA,15748,6,,,, +US-PA-15750,US,PA,15750,6,,,, +US-PA-15752,US,PA,15752,6,,,, +US-PA-15753,US,PA,15753,6,,,, +US-PA-15754,US,PA,15754,6,,,, +US-PA-15756,US,PA,15756,6,,,, +US-PA-15757,US,PA,15757,6,,,, +US-PA-15758,US,PA,15758,6,,,, +US-PA-15759,US,PA,15759,6,,,, +US-PA-15760,US,PA,15760,6,,,, +US-PA-15761,US,PA,15761,6,,,, +US-PA-15762,US,PA,15762,6,,,, +US-PA-15763,US,PA,15763,6,,,, +US-PA-15764,US,PA,15764,6,,,, +US-PA-15765,US,PA,15765,6,,,, +US-PA-15767,US,PA,15767,6,,,, +US-PA-15770,US,PA,15770,6,,,, +US-PA-15771,US,PA,15771,6,,,, +US-PA-15772,US,PA,15772,6,,,, +US-PA-15773,US,PA,15773,6,,,, +US-PA-15774,US,PA,15774,6,,,, +US-PA-15775,US,PA,15775,6,,,, +US-PA-15776,US,PA,15776,6,,,, +US-PA-15777,US,PA,15777,6,,,, +US-PA-15778,US,PA,15778,6,,,, +US-PA-15779,US,PA,15779,6,,,, +US-PA-15780,US,PA,15780,6,,,, +US-PA-15781,US,PA,15781,6,,,, +US-PA-15783,US,PA,15783,6,,,, +US-PA-15784,US,PA,15784,6,,,, +US-PA-15801,US,PA,15801,6,,,, +US-PA-15821,US,PA,15821,6,,,, +US-PA-15822,US,PA,15822,6,,,, +US-PA-15823,US,PA,15823,6,,,, +US-PA-15824,US,PA,15824,6,,,, +US-PA-15825,US,PA,15825,6,,,, +US-PA-15827,US,PA,15827,6,,,, +US-PA-15828,US,PA,15828,6,,,, +US-PA-15829,US,PA,15829,6,,,, +US-PA-15831,US,PA,15831,6,,,, +US-PA-15832,US,PA,15832,6,,,, +US-PA-15834,US,PA,15834,6,,,, +US-PA-15840,US,PA,15840,6,,,, +US-PA-15841,US,PA,15841,6,,,, +US-PA-15845,US,PA,15845,6,,,, +US-PA-15846,US,PA,15846,6,,,, +US-PA-15847,US,PA,15847,6,,,, +US-PA-15848,US,PA,15848,6,,,, +US-PA-15849,US,PA,15849,6,,,, +US-PA-15851,US,PA,15851,6,,,, +US-PA-15853,US,PA,15853,6,,,, +US-PA-15856,US,PA,15856,6,,,, +US-PA-15857,US,PA,15857,6,,,, +US-PA-15860,US,PA,15860,6,,,, +US-PA-15861,US,PA,15861,6,,,, +US-PA-15863,US,PA,15863,6,,,, +US-PA-15864,US,PA,15864,6,,,, +US-PA-15865,US,PA,15865,6,,,, +US-PA-15866,US,PA,15866,6,,,, +US-PA-15868,US,PA,15868,6,,,, +US-PA-15870,US,PA,15870,6,,,, +US-PA-15901,US,PA,15901,6,,,, +US-PA-15902,US,PA,15902,6,,,, +US-PA-15904,US,PA,15904,6,,,, +US-PA-15905,US,PA,15905,6,,,, +US-PA-15906,US,PA,15906,6,,,, +US-PA-15907,US,PA,15907,6,,,, +US-PA-15909,US,PA,15909,6,,,, +US-PA-15915,US,PA,15915,6,,,, +US-PA-15920,US,PA,15920,6,,,, +US-PA-15921,US,PA,15921,6,,,, +US-PA-15922,US,PA,15922,6,,,, +US-PA-15923,US,PA,15923,6,,,, +US-PA-15924,US,PA,15924,6,,,, +US-PA-15925,US,PA,15925,6,,,, +US-PA-15926,US,PA,15926,6,,,, +US-PA-15927,US,PA,15927,6,,,, +US-PA-15928,US,PA,15928,6,,,, +US-PA-15929,US,PA,15929,6,,,, +US-PA-15930,US,PA,15930,6,,,, +US-PA-15931,US,PA,15931,6,,,, +US-PA-15934,US,PA,15934,6,,,, +US-PA-15935,US,PA,15935,6,,,, +US-PA-15936,US,PA,15936,6,,,, +US-PA-15937,US,PA,15937,6,,,, +US-PA-15938,US,PA,15938,6,,,, +US-PA-15940,US,PA,15940,6,,,, +US-PA-15942,US,PA,15942,6,,,, +US-PA-15943,US,PA,15943,6,,,, +US-PA-15944,US,PA,15944,6,,,, +US-PA-15945,US,PA,15945,6,,,, +US-PA-15946,US,PA,15946,6,,,, +US-PA-15948,US,PA,15948,6,,,, +US-PA-15949,US,PA,15949,6,,,, +US-PA-15951,US,PA,15951,6,,,, +US-PA-15952,US,PA,15952,6,,,, +US-PA-15953,US,PA,15953,6,,,, +US-PA-15954,US,PA,15954,6,,,, +US-PA-15955,US,PA,15955,6,,,, +US-PA-15956,US,PA,15956,6,,,, +US-PA-15957,US,PA,15957,6,,,, +US-PA-15958,US,PA,15958,6,,,, +US-PA-15959,US,PA,15959,6,,,, +US-PA-15960,US,PA,15960,6,,,, +US-PA-15961,US,PA,15961,6,,,, +US-PA-15962,US,PA,15962,6,,,, +US-PA-15963,US,PA,15963,6,,,, +US-PA-16001,US,PA,16001,6,,,, +US-PA-16002,US,PA,16002,6,,,, +US-PA-16003,US,PA,16003,6,,,, +US-PA-16016,US,PA,16016,6,,,, +US-PA-16017,US,PA,16017,6,,,, +US-PA-16018,US,PA,16018,6,,,, +US-PA-16020,US,PA,16020,6,,,, +US-PA-16021,US,PA,16021,6,,,, +US-PA-16022,US,PA,16022,6,,,, +US-PA-16023,US,PA,16023,6,,,, +US-PA-16024,US,PA,16024,6,,,, +US-PA-16025,US,PA,16025,6,,,, +US-PA-16027,US,PA,16027,6,,,, +US-PA-16028,US,PA,16028,6,,,, +US-PA-16029,US,PA,16029,6,,,, +US-PA-16030,US,PA,16030,6,,,, +US-PA-16033,US,PA,16033,6,,,, +US-PA-16034,US,PA,16034,6,,,, +US-PA-16035,US,PA,16035,6,,,, +US-PA-16036,US,PA,16036,6,,,, +US-PA-16037,US,PA,16037,6,,,, +US-PA-16038,US,PA,16038,6,,,, +US-PA-16039,US,PA,16039,6,,,, +US-PA-16040,US,PA,16040,6,,,, +US-PA-16041,US,PA,16041,6,,,, +US-PA-16045,US,PA,16045,6,,,, +US-PA-16046,US,PA,16046,6,,,, +US-PA-16048,US,PA,16048,6,,,, +US-PA-16049,US,PA,16049,6,,,, +US-PA-16050,US,PA,16050,6,,,, +US-PA-16051,US,PA,16051,6,,,, +US-PA-16052,US,PA,16052,6,,,, +US-PA-16053,US,PA,16053,6,,,, +US-PA-16054,US,PA,16054,6,,,, +US-PA-16055,US,PA,16055,6,,,, +US-PA-16056,US,PA,16056,6,,,, +US-PA-16057,US,PA,16057,6,,,, +US-PA-16058,US,PA,16058,6,,,, +US-PA-16059,US,PA,16059,6,,,, +US-PA-16061,US,PA,16061,6,,,, +US-PA-16063,US,PA,16063,6,,,, +US-PA-16066,US,PA,16066,6,,,, +US-PA-16101,US,PA,16101,6,,,, +US-PA-16102,US,PA,16102,6,,,, +US-PA-16103,US,PA,16103,6,,,, +US-PA-16105,US,PA,16105,6,,,, +US-PA-16107,US,PA,16107,6,,,, +US-PA-16108,US,PA,16108,6,,,, +US-PA-16110,US,PA,16110,6,,,, +US-PA-16111,US,PA,16111,6,,,, +US-PA-16112,US,PA,16112,6,,,, +US-PA-16113,US,PA,16113,6,,,, +US-PA-16114,US,PA,16114,6,,,, +US-PA-16115,US,PA,16115,6,,,, +US-PA-16116,US,PA,16116,6,,,, +US-PA-16117,US,PA,16117,6,,,, +US-PA-16120,US,PA,16120,6,,,, +US-PA-16121,US,PA,16121,6,,,, +US-PA-16123,US,PA,16123,6,,,, +US-PA-16124,US,PA,16124,6,,,, +US-PA-16125,US,PA,16125,6,,,, +US-PA-16127,US,PA,16127,6,,,, +US-PA-16130,US,PA,16130,6,,,, +US-PA-16131,US,PA,16131,6,,,, +US-PA-16132,US,PA,16132,6,,,, +US-PA-16133,US,PA,16133,6,,,, +US-PA-16134,US,PA,16134,6,,,, +US-PA-16136,US,PA,16136,6,,,, +US-PA-16137,US,PA,16137,6,,,, +US-PA-16140,US,PA,16140,6,,,, +US-PA-16141,US,PA,16141,6,,,, +US-PA-16142,US,PA,16142,6,,,, +US-PA-16143,US,PA,16143,6,,,, +US-PA-16145,US,PA,16145,6,,,, +US-PA-16146,US,PA,16146,6,,,, +US-PA-16148,US,PA,16148,6,,,, +US-PA-16150,US,PA,16150,6,,,, +US-PA-16151,US,PA,16151,6,,,, +US-PA-16153,US,PA,16153,6,,,, +US-PA-16154,US,PA,16154,6,,,, +US-PA-16155,US,PA,16155,6,,,, +US-PA-16156,US,PA,16156,6,,,, +US-PA-16157,US,PA,16157,6,,,, +US-PA-16159,US,PA,16159,6,,,, +US-PA-16160,US,PA,16160,6,,,, +US-PA-16161,US,PA,16161,6,,,, +US-PA-16172,US,PA,16172,6,,,, +US-PA-16201,US,PA,16201,6,,,, +US-PA-16210,US,PA,16210,6,,,, +US-PA-16211,US,PA,16211,6,,,, +US-PA-16212,US,PA,16212,6,,,, +US-PA-16213,US,PA,16213,6,,,, +US-PA-16214,US,PA,16214,6,,,, +US-PA-16217,US,PA,16217,6,,,, +US-PA-16218,US,PA,16218,6,,,, +US-PA-16220,US,PA,16220,6,,,, +US-PA-16221,US,PA,16221,6,,,, +US-PA-16222,US,PA,16222,6,,,, +US-PA-16223,US,PA,16223,6,,,, +US-PA-16224,US,PA,16224,6,,,, +US-PA-16225,US,PA,16225,6,,,, +US-PA-16226,US,PA,16226,6,,,, +US-PA-16228,US,PA,16228,6,,,, +US-PA-16229,US,PA,16229,6,,,, +US-PA-16230,US,PA,16230,6,,,, +US-PA-16232,US,PA,16232,6,,,, +US-PA-16233,US,PA,16233,6,,,, +US-PA-16234,US,PA,16234,6,,,, +US-PA-16235,US,PA,16235,6,,,, +US-PA-16236,US,PA,16236,6,,,, +US-PA-16238,US,PA,16238,6,,,, +US-PA-16239,US,PA,16239,6,,,, +US-PA-16240,US,PA,16240,6,,,, +US-PA-16242,US,PA,16242,6,,,, +US-PA-16244,US,PA,16244,6,,,, +US-PA-16245,US,PA,16245,6,,,, +US-PA-16246,US,PA,16246,6,,,, +US-PA-16248,US,PA,16248,6,,,, +US-PA-16249,US,PA,16249,6,,,, +US-PA-16250,US,PA,16250,6,,,, +US-PA-16253,US,PA,16253,6,,,, +US-PA-16254,US,PA,16254,6,,,, +US-PA-16255,US,PA,16255,6,,,, +US-PA-16256,US,PA,16256,6,,,, +US-PA-16257,US,PA,16257,6,,,, +US-PA-16258,US,PA,16258,6,,,, +US-PA-16259,US,PA,16259,6,,,, +US-PA-16260,US,PA,16260,6,,,, +US-PA-16261,US,PA,16261,6,,,, +US-PA-16262,US,PA,16262,6,,,, +US-PA-16263,US,PA,16263,6,,,, +US-PA-16301,US,PA,16301,6,,,, +US-PA-16311,US,PA,16311,6,,,, +US-PA-16312,US,PA,16312,6,,,, +US-PA-16313,US,PA,16313,6,,,, +US-PA-16314,US,PA,16314,6,,,, +US-PA-16316,US,PA,16316,6,,,, +US-PA-16317,US,PA,16317,6,,,, +US-PA-16319,US,PA,16319,6,,,, +US-PA-16321,US,PA,16321,6,,,, +US-PA-16322,US,PA,16322,6,,,, +US-PA-16323,US,PA,16323,6,,,, +US-PA-16326,US,PA,16326,6,,,, +US-PA-16327,US,PA,16327,6,,,, +US-PA-16328,US,PA,16328,6,,,, +US-PA-16329,US,PA,16329,6,,,, +US-PA-16331,US,PA,16331,6,,,, +US-PA-16332,US,PA,16332,6,,,, +US-PA-16333,US,PA,16333,6,,,, +US-PA-16334,US,PA,16334,6,,,, +US-PA-16335,US,PA,16335,6,,,, +US-PA-16340,US,PA,16340,6,,,, +US-PA-16341,US,PA,16341,6,,,, +US-PA-16342,US,PA,16342,6,,,, +US-PA-16343,US,PA,16343,6,,,, +US-PA-16344,US,PA,16344,6,,,, +US-PA-16345,US,PA,16345,6,,,, +US-PA-16346,US,PA,16346,6,,,, +US-PA-16347,US,PA,16347,6,,,, +US-PA-16350,US,PA,16350,6,,,, +US-PA-16351,US,PA,16351,6,,,, +US-PA-16352,US,PA,16352,6,,,, +US-PA-16353,US,PA,16353,6,,,, +US-PA-16354,US,PA,16354,6,,,, +US-PA-16360,US,PA,16360,6,,,, +US-PA-16361,US,PA,16361,6,,,, +US-PA-16362,US,PA,16362,6,,,, +US-PA-16364,US,PA,16364,6,,,, +US-PA-16365,US,PA,16365,6,,,, +US-PA-16366,US,PA,16366,6,,,, +US-PA-16367,US,PA,16367,6,,,, +US-PA-16368,US,PA,16368,6,,,, +US-PA-16369,US,PA,16369,6,,,, +US-PA-16370,US,PA,16370,6,,,, +US-PA-16371,US,PA,16371,6,,,, +US-PA-16372,US,PA,16372,6,,,, +US-PA-16373,US,PA,16373,6,,,, +US-PA-16374,US,PA,16374,6,,,, +US-PA-16375,US,PA,16375,6,,,, +US-PA-16388,US,PA,16388,6,,,, +US-PA-16401,US,PA,16401,6,,,, +US-PA-16402,US,PA,16402,6,,,, +US-PA-16403,US,PA,16403,6,,,, +US-PA-16404,US,PA,16404,6,,,, +US-PA-16405,US,PA,16405,6,,,, +US-PA-16406,US,PA,16406,6,,,, +US-PA-16407,US,PA,16407,6,,,, +US-PA-16410,US,PA,16410,6,,,, +US-PA-16411,US,PA,16411,6,,,, +US-PA-16412,US,PA,16412,6,,,, +US-PA-16413,US,PA,16413,6,,,, +US-PA-16415,US,PA,16415,6,,,, +US-PA-16416,US,PA,16416,6,,,, +US-PA-16417,US,PA,16417,6,,,, +US-PA-16420,US,PA,16420,6,,,, +US-PA-16421,US,PA,16421,6,,,, +US-PA-16422,US,PA,16422,6,,,, +US-PA-16423,US,PA,16423,6,,,, +US-PA-16424,US,PA,16424,6,,,, +US-PA-16426,US,PA,16426,6,,,, +US-PA-16427,US,PA,16427,6,,,, +US-PA-16428,US,PA,16428,6,,,, +US-PA-16430,US,PA,16430,6,,,, +US-PA-16432,US,PA,16432,6,,,, +US-PA-16433,US,PA,16433,6,,,, +US-PA-16434,US,PA,16434,6,,,, +US-PA-16435,US,PA,16435,6,,,, +US-PA-16436,US,PA,16436,6,,,, +US-PA-16438,US,PA,16438,6,,,, +US-PA-16440,US,PA,16440,6,,,, +US-PA-16441,US,PA,16441,6,,,, +US-PA-16442,US,PA,16442,6,,,, +US-PA-16443,US,PA,16443,6,,,, +US-PA-16444,US,PA,16444,6,,,, +US-PA-16475,US,PA,16475,6,,,, +US-PA-16501,US,PA,16501,6,,,, +US-PA-16502,US,PA,16502,6,,,, +US-PA-16503,US,PA,16503,6,,,, +US-PA-16504,US,PA,16504,6,,,, +US-PA-16505,US,PA,16505,6,,,, +US-PA-16506,US,PA,16506,6,,,, +US-PA-16507,US,PA,16507,6,,,, +US-PA-16508,US,PA,16508,6,,,, +US-PA-16509,US,PA,16509,6,,,, +US-PA-16510,US,PA,16510,6,,,, +US-PA-16511,US,PA,16511,6,,,, +US-PA-16512,US,PA,16512,6,,,, +US-PA-16514,US,PA,16514,6,,,, +US-PA-16515,US,PA,16515,6,,,, +US-PA-16522,US,PA,16522,6,,,, +US-PA-16530,US,PA,16530,6,,,, +US-PA-16531,US,PA,16531,6,,,, +US-PA-16534,US,PA,16534,6,,,, +US-PA-16538,US,PA,16538,6,,,, +US-PA-16541,US,PA,16541,6,,,, +US-PA-16544,US,PA,16544,6,,,, +US-PA-16546,US,PA,16546,6,,,, +US-PA-16550,US,PA,16550,6,,,, +US-PA-16553,US,PA,16553,6,,,, +US-PA-16563,US,PA,16563,6,,,, +US-PA-16565,US,PA,16565,6,,,, +US-PA-16601,US,PA,16601,6,,,, +US-PA-16602,US,PA,16602,6,,,, +US-PA-16603,US,PA,16603,6,,,, +US-PA-16611,US,PA,16611,6,,,, +US-PA-16613,US,PA,16613,6,,,, +US-PA-16616,US,PA,16616,6,,,, +US-PA-16617,US,PA,16617,6,,,, +US-PA-16619,US,PA,16619,6,,,, +US-PA-16620,US,PA,16620,6,,,, +US-PA-16621,US,PA,16621,6,,,, +US-PA-16622,US,PA,16622,6,,,, +US-PA-16623,US,PA,16623,6,,,, +US-PA-16624,US,PA,16624,6,,,, +US-PA-16625,US,PA,16625,6,,,, +US-PA-16627,US,PA,16627,6,,,, +US-PA-16629,US,PA,16629,6,,,, +US-PA-16630,US,PA,16630,6,,,, +US-PA-16631,US,PA,16631,6,,,, +US-PA-16633,US,PA,16633,6,,,, +US-PA-16634,US,PA,16634,6,,,, +US-PA-16635,US,PA,16635,6,,,, +US-PA-16636,US,PA,16636,6,,,, +US-PA-16637,US,PA,16637,6,,,, +US-PA-16638,US,PA,16638,6,,,, +US-PA-16639,US,PA,16639,6,,,, +US-PA-16640,US,PA,16640,6,,,, +US-PA-16641,US,PA,16641,6,,,, +US-PA-16644,US,PA,16644,6,,,, +US-PA-16645,US,PA,16645,6,,,, +US-PA-16646,US,PA,16646,6,,,, +US-PA-16647,US,PA,16647,6,,,, +US-PA-16648,US,PA,16648,6,,,, +US-PA-16650,US,PA,16650,6,,,, +US-PA-16651,US,PA,16651,6,,,, +US-PA-16652,US,PA,16652,6,,,, +US-PA-16654,US,PA,16654,6,,,, +US-PA-16655,US,PA,16655,6,,,, +US-PA-16656,US,PA,16656,6,,,, +US-PA-16657,US,PA,16657,6,,,, +US-PA-16659,US,PA,16659,6,,,, +US-PA-16660,US,PA,16660,6,,,, +US-PA-16661,US,PA,16661,6,,,, +US-PA-16662,US,PA,16662,6,,,, +US-PA-16663,US,PA,16663,6,,,, +US-PA-16664,US,PA,16664,6,,,, +US-PA-16665,US,PA,16665,6,,,, +US-PA-16666,US,PA,16666,6,,,, +US-PA-16667,US,PA,16667,6,,,, +US-PA-16668,US,PA,16668,6,,,, +US-PA-16669,US,PA,16669,6,,,, +US-PA-16670,US,PA,16670,6,,,, +US-PA-16671,US,PA,16671,6,,,, +US-PA-16672,US,PA,16672,6,,,, +US-PA-16673,US,PA,16673,6,,,, +US-PA-16674,US,PA,16674,6,,,, +US-PA-16675,US,PA,16675,6,,,, +US-PA-16677,US,PA,16677,6,,,, +US-PA-16678,US,PA,16678,6,,,, +US-PA-16679,US,PA,16679,6,,,, +US-PA-16680,US,PA,16680,6,,,, +US-PA-16681,US,PA,16681,6,,,, +US-PA-16682,US,PA,16682,6,,,, +US-PA-16683,US,PA,16683,6,,,, +US-PA-16684,US,PA,16684,6,,,, +US-PA-16685,US,PA,16685,6,,,, +US-PA-16686,US,PA,16686,6,,,, +US-PA-16689,US,PA,16689,6,,,, +US-PA-16691,US,PA,16691,6,,,, +US-PA-16692,US,PA,16692,6,,,, +US-PA-16693,US,PA,16693,6,,,, +US-PA-16694,US,PA,16694,6,,,, +US-PA-16695,US,PA,16695,6,,,, +US-PA-16698,US,PA,16698,6,,,, +US-PA-16699,US,PA,16699,6,,,, +US-PA-16701,US,PA,16701,6,,,, +US-PA-16720,US,PA,16720,6,,,, +US-PA-16724,US,PA,16724,6,,,, +US-PA-16725,US,PA,16725,6,,,, +US-PA-16726,US,PA,16726,6,,,, +US-PA-16727,US,PA,16727,6,,,, +US-PA-16728,US,PA,16728,6,,,, +US-PA-16729,US,PA,16729,6,,,, +US-PA-16730,US,PA,16730,6,,,, +US-PA-16731,US,PA,16731,6,,,, +US-PA-16732,US,PA,16732,6,,,, +US-PA-16733,US,PA,16733,6,,,, +US-PA-16734,US,PA,16734,6,,,, +US-PA-16735,US,PA,16735,6,,,, +US-PA-16738,US,PA,16738,6,,,, +US-PA-16740,US,PA,16740,6,,,, +US-PA-16743,US,PA,16743,6,,,, +US-PA-16744,US,PA,16744,6,,,, +US-PA-16745,US,PA,16745,6,,,, +US-PA-16746,US,PA,16746,6,,,, +US-PA-16748,US,PA,16748,6,,,, +US-PA-16749,US,PA,16749,6,,,, +US-PA-16750,US,PA,16750,6,,,, +US-PA-16801,US,PA,16801,6,,,, +US-PA-16802,US,PA,16802,6,,,, +US-PA-16803,US,PA,16803,6,,,, +US-PA-16804,US,PA,16804,6,,,, +US-PA-16805,US,PA,16805,6,,,, +US-PA-16820,US,PA,16820,6,,,, +US-PA-16821,US,PA,16821,6,,,, +US-PA-16822,US,PA,16822,6,,,, +US-PA-16823,US,PA,16823,6,,,, +US-PA-16825,US,PA,16825,6,,,, +US-PA-16826,US,PA,16826,6,,,, +US-PA-16827,US,PA,16827,6,,,, +US-PA-16828,US,PA,16828,6,,,, +US-PA-16829,US,PA,16829,6,,,, +US-PA-16830,US,PA,16830,6,,,, +US-PA-16832,US,PA,16832,6,,,, +US-PA-16833,US,PA,16833,6,,,, +US-PA-16834,US,PA,16834,6,,,, +US-PA-16835,US,PA,16835,6,,,, +US-PA-16836,US,PA,16836,6,,,, +US-PA-16837,US,PA,16837,6,,,, +US-PA-16838,US,PA,16838,6,,,, +US-PA-16839,US,PA,16839,6,,,, +US-PA-16840,US,PA,16840,6,,,, +US-PA-16841,US,PA,16841,6,,,, +US-PA-16843,US,PA,16843,6,,,, +US-PA-16844,US,PA,16844,6,,,, +US-PA-16845,US,PA,16845,6,,,, +US-PA-16847,US,PA,16847,6,,,, +US-PA-16848,US,PA,16848,6,,,, +US-PA-16849,US,PA,16849,6,,,, +US-PA-16850,US,PA,16850,6,,,, +US-PA-16851,US,PA,16851,6,,,, +US-PA-16852,US,PA,16852,6,,,, +US-PA-16853,US,PA,16853,6,,,, +US-PA-16854,US,PA,16854,6,,,, +US-PA-16855,US,PA,16855,6,,,, +US-PA-16856,US,PA,16856,6,,,, +US-PA-16858,US,PA,16858,6,,,, +US-PA-16859,US,PA,16859,6,,,, +US-PA-16860,US,PA,16860,6,,,, +US-PA-16861,US,PA,16861,6,,,, +US-PA-16863,US,PA,16863,6,,,, +US-PA-16864,US,PA,16864,6,,,, +US-PA-16865,US,PA,16865,6,,,, +US-PA-16866,US,PA,16866,6,,,, +US-PA-16868,US,PA,16868,6,,,, +US-PA-16870,US,PA,16870,6,,,, +US-PA-16871,US,PA,16871,6,,,, +US-PA-16872,US,PA,16872,6,,,, +US-PA-16873,US,PA,16873,6,,,, +US-PA-16874,US,PA,16874,6,,,, +US-PA-16875,US,PA,16875,6,,,, +US-PA-16876,US,PA,16876,6,,,, +US-PA-16877,US,PA,16877,6,,,, +US-PA-16878,US,PA,16878,6,,,, +US-PA-16879,US,PA,16879,6,,,, +US-PA-16881,US,PA,16881,6,,,, +US-PA-16882,US,PA,16882,6,,,, +US-PA-16901,US,PA,16901,6,,,, +US-PA-16910,US,PA,16910,6,,,, +US-PA-16911,US,PA,16911,6,,,, +US-PA-16912,US,PA,16912,6,,,, +US-PA-16914,US,PA,16914,6,,,, +US-PA-16915,US,PA,16915,6,,,, +US-PA-16917,US,PA,16917,6,,,, +US-PA-16920,US,PA,16920,6,,,, +US-PA-16921,US,PA,16921,6,,,, +US-PA-16922,US,PA,16922,6,,,, +US-PA-16923,US,PA,16923,6,,,, +US-PA-16925,US,PA,16925,6,,,, +US-PA-16926,US,PA,16926,6,,,, +US-PA-16927,US,PA,16927,6,,,, +US-PA-16928,US,PA,16928,6,,,, +US-PA-16929,US,PA,16929,6,,,, +US-PA-16930,US,PA,16930,6,,,, +US-PA-16932,US,PA,16932,6,,,, +US-PA-16933,US,PA,16933,6,,,, +US-PA-16935,US,PA,16935,6,,,, +US-PA-16936,US,PA,16936,6,,,, +US-PA-16937,US,PA,16937,6,,,, +US-PA-16938,US,PA,16938,6,,,, +US-PA-16939,US,PA,16939,6,,,, +US-PA-16940,US,PA,16940,6,,,, +US-PA-16941,US,PA,16941,6,,,, +US-PA-16942,US,PA,16942,6,,,, +US-PA-16943,US,PA,16943,6,,,, +US-PA-16945,US,PA,16945,6,,,, +US-PA-16946,US,PA,16946,6,,,, +US-PA-16947,US,PA,16947,6,,,, +US-PA-16948,US,PA,16948,6,,,, +US-PA-16950,US,PA,16950,6,,,, +US-PA-17001,US,PA,17001,6,,,, +US-PA-17002,US,PA,17002,6,,,, +US-PA-17003,US,PA,17003,6,,,, +US-PA-17004,US,PA,17004,6,,,, +US-PA-17005,US,PA,17005,6,,,, +US-PA-17006,US,PA,17006,6,,,, +US-PA-17007,US,PA,17007,6,,,, +US-PA-17009,US,PA,17009,6,,,, +US-PA-17010,US,PA,17010,6,,,, +US-PA-17011,US,PA,17011,6,,,, +US-PA-17012,US,PA,17012,6,,,, +US-PA-17013,US,PA,17013,6,,,, +US-PA-17014,US,PA,17014,6,,,, +US-PA-17015,US,PA,17015,6,,,, +US-PA-17016,US,PA,17016,6,,,, +US-PA-17017,US,PA,17017,6,,,, +US-PA-17018,US,PA,17018,6,,,, +US-PA-17019,US,PA,17019,6,,,, +US-PA-17020,US,PA,17020,6,,,, +US-PA-17021,US,PA,17021,6,,,, +US-PA-17022,US,PA,17022,6,,,, +US-PA-17023,US,PA,17023,6,,,, +US-PA-17024,US,PA,17024,6,,,, +US-PA-17025,US,PA,17025,6,,,, +US-PA-17026,US,PA,17026,6,,,, +US-PA-17027,US,PA,17027,6,,,, +US-PA-17028,US,PA,17028,6,,,, +US-PA-17029,US,PA,17029,6,,,, +US-PA-17030,US,PA,17030,6,,,, +US-PA-17032,US,PA,17032,6,,,, +US-PA-17033,US,PA,17033,6,,,, +US-PA-17034,US,PA,17034,6,,,, +US-PA-17035,US,PA,17035,6,,,, +US-PA-17036,US,PA,17036,6,,,, +US-PA-17037,US,PA,17037,6,,,, +US-PA-17038,US,PA,17038,6,,,, +US-PA-17039,US,PA,17039,6,,,, +US-PA-17040,US,PA,17040,6,,,, +US-PA-17041,US,PA,17041,6,,,, +US-PA-17042,US,PA,17042,6,,,, +US-PA-17043,US,PA,17043,6,,,, +US-PA-17044,US,PA,17044,6,,,, +US-PA-17045,US,PA,17045,6,,,, +US-PA-17046,US,PA,17046,6,,,, +US-PA-17047,US,PA,17047,6,,,, +US-PA-17048,US,PA,17048,6,,,, +US-PA-17049,US,PA,17049,6,,,, +US-PA-17050,US,PA,17050,6,,,, +US-PA-17051,US,PA,17051,6,,,, +US-PA-17052,US,PA,17052,6,,,, +US-PA-17053,US,PA,17053,6,,,, +US-PA-17054,US,PA,17054,6,,,, +US-PA-17055,US,PA,17055,6,,,, +US-PA-17056,US,PA,17056,6,,,, +US-PA-17057,US,PA,17057,6,,,, +US-PA-17058,US,PA,17058,6,,,, +US-PA-17059,US,PA,17059,6,,,, +US-PA-17060,US,PA,17060,6,,,, +US-PA-17061,US,PA,17061,6,,,, +US-PA-17062,US,PA,17062,6,,,, +US-PA-17063,US,PA,17063,6,,,, +US-PA-17064,US,PA,17064,6,,,, +US-PA-17065,US,PA,17065,6,,,, +US-PA-17066,US,PA,17066,6,,,, +US-PA-17067,US,PA,17067,6,,,, +US-PA-17068,US,PA,17068,6,,,, +US-PA-17069,US,PA,17069,6,,,, +US-PA-17070,US,PA,17070,6,,,, +US-PA-17071,US,PA,17071,6,,,, +US-PA-17072,US,PA,17072,6,,,, +US-PA-17073,US,PA,17073,6,,,, +US-PA-17074,US,PA,17074,6,,,, +US-PA-17075,US,PA,17075,6,,,, +US-PA-17076,US,PA,17076,6,,,, +US-PA-17077,US,PA,17077,6,,,, +US-PA-17078,US,PA,17078,6,,,, +US-PA-17080,US,PA,17080,6,,,, +US-PA-17081,US,PA,17081,6,,,, +US-PA-17082,US,PA,17082,6,,,, +US-PA-17083,US,PA,17083,6,,,, +US-PA-17084,US,PA,17084,6,,,, +US-PA-17085,US,PA,17085,6,,,, +US-PA-17086,US,PA,17086,6,,,, +US-PA-17087,US,PA,17087,6,,,, +US-PA-17088,US,PA,17088,6,,,, +US-PA-17089,US,PA,17089,6,,,, +US-PA-17090,US,PA,17090,6,,,, +US-PA-17093,US,PA,17093,6,,,, +US-PA-17094,US,PA,17094,6,,,, +US-PA-17097,US,PA,17097,6,,,, +US-PA-17098,US,PA,17098,6,,,, +US-PA-17099,US,PA,17099,6,,,, +US-PA-17101,US,PA,17101,6,,,, +US-PA-17102,US,PA,17102,6,,,, +US-PA-17103,US,PA,17103,6,,,, +US-PA-17104,US,PA,17104,6,,,, +US-PA-17105,US,PA,17105,6,,,, +US-PA-17106,US,PA,17106,6,,,, +US-PA-17107,US,PA,17107,6,,,, +US-PA-17108,US,PA,17108,6,,,, +US-PA-17109,US,PA,17109,6,,,, +US-PA-17110,US,PA,17110,6,,,, +US-PA-17111,US,PA,17111,6,,,, +US-PA-17112,US,PA,17112,6,,,, +US-PA-17113,US,PA,17113,6,,,, +US-PA-17120,US,PA,17120,6,,,, +US-PA-17121,US,PA,17121,6,,,, +US-PA-17122,US,PA,17122,6,,,, +US-PA-17123,US,PA,17123,6,,,, +US-PA-17124,US,PA,17124,6,,,, +US-PA-17125,US,PA,17125,6,,,, +US-PA-17126,US,PA,17126,6,,,, +US-PA-17127,US,PA,17127,6,,,, +US-PA-17128,US,PA,17128,6,,,, +US-PA-17129,US,PA,17129,6,,,, +US-PA-17130,US,PA,17130,6,,,, +US-PA-17140,US,PA,17140,6,,,, +US-PA-17177,US,PA,17177,6,,,, +US-PA-17201,US,PA,17201,6,,,, +US-PA-17202,US,PA,17202,6,,,, +US-PA-17210,US,PA,17210,6,,,, +US-PA-17211,US,PA,17211,6,,,, +US-PA-17212,US,PA,17212,6,,,, +US-PA-17213,US,PA,17213,6,,,, +US-PA-17214,US,PA,17214,6,,,, +US-PA-17215,US,PA,17215,6,,,, +US-PA-17217,US,PA,17217,6,,,, +US-PA-17219,US,PA,17219,6,,,, +US-PA-17220,US,PA,17220,6,,,, +US-PA-17221,US,PA,17221,6,,,, +US-PA-17222,US,PA,17222,6,,,, +US-PA-17223,US,PA,17223,6,,,, +US-PA-17224,US,PA,17224,6,,,, +US-PA-17225,US,PA,17225,6,,,, +US-PA-17228,US,PA,17228,6,,,, +US-PA-17229,US,PA,17229,6,,,, +US-PA-17231,US,PA,17231,6,,,, +US-PA-17232,US,PA,17232,6,,,, +US-PA-17233,US,PA,17233,6,,,, +US-PA-17235,US,PA,17235,6,,,, +US-PA-17236,US,PA,17236,6,,,, +US-PA-17237,US,PA,17237,6,,,, +US-PA-17238,US,PA,17238,6,,,, +US-PA-17239,US,PA,17239,6,,,, +US-PA-17240,US,PA,17240,6,,,, +US-PA-17241,US,PA,17241,6,,,, +US-PA-17243,US,PA,17243,6,,,, +US-PA-17244,US,PA,17244,6,,,, +US-PA-17246,US,PA,17246,6,,,, +US-PA-17247,US,PA,17247,6,,,, +US-PA-17249,US,PA,17249,6,,,, +US-PA-17250,US,PA,17250,6,,,, +US-PA-17251,US,PA,17251,6,,,, +US-PA-17252,US,PA,17252,6,,,, +US-PA-17253,US,PA,17253,6,,,, +US-PA-17254,US,PA,17254,6,,,, +US-PA-17255,US,PA,17255,6,,,, +US-PA-17256,US,PA,17256,6,,,, +US-PA-17257,US,PA,17257,6,,,, +US-PA-17260,US,PA,17260,6,,,, +US-PA-17261,US,PA,17261,6,,,, +US-PA-17262,US,PA,17262,6,,,, +US-PA-17263,US,PA,17263,6,,,, +US-PA-17264,US,PA,17264,6,,,, +US-PA-17265,US,PA,17265,6,,,, +US-PA-17266,US,PA,17266,6,,,, +US-PA-17267,US,PA,17267,6,,,, +US-PA-17268,US,PA,17268,6,,,, +US-PA-17271,US,PA,17271,6,,,, +US-PA-17272,US,PA,17272,6,,,, +US-PA-17301,US,PA,17301,6,,,, +US-PA-17302,US,PA,17302,6,,,, +US-PA-17303,US,PA,17303,6,,,, +US-PA-17304,US,PA,17304,6,,,, +US-PA-17306,US,PA,17306,6,,,, +US-PA-17307,US,PA,17307,6,,,, +US-PA-17309,US,PA,17309,6,,,, +US-PA-17310,US,PA,17310,6,,,, +US-PA-17311,US,PA,17311,6,,,, +US-PA-17312,US,PA,17312,6,,,, +US-PA-17313,US,PA,17313,6,,,, +US-PA-17314,US,PA,17314,6,,,, +US-PA-17315,US,PA,17315,6,,,, +US-PA-17316,US,PA,17316,6,,,, +US-PA-17317,US,PA,17317,6,,,, +US-PA-17318,US,PA,17318,6,,,, +US-PA-17319,US,PA,17319,6,,,, +US-PA-17320,US,PA,17320,6,,,, +US-PA-17321,US,PA,17321,6,,,, +US-PA-17322,US,PA,17322,6,,,, +US-PA-17323,US,PA,17323,6,,,, +US-PA-17324,US,PA,17324,6,,,, +US-PA-17325,US,PA,17325,6,,,, +US-PA-17327,US,PA,17327,6,,,, +US-PA-17329,US,PA,17329,6,,,, +US-PA-17331,US,PA,17331,6,,,, +US-PA-17332,US,PA,17332,6,,,, +US-PA-17333,US,PA,17333,6,,,, +US-PA-17334,US,PA,17334,6,,,, +US-PA-17335,US,PA,17335,6,,,, +US-PA-17337,US,PA,17337,6,,,, +US-PA-17339,US,PA,17339,6,,,, +US-PA-17340,US,PA,17340,6,,,, +US-PA-17342,US,PA,17342,6,,,, +US-PA-17343,US,PA,17343,6,,,, +US-PA-17344,US,PA,17344,6,,,, +US-PA-17345,US,PA,17345,6,,,, +US-PA-17347,US,PA,17347,6,,,, +US-PA-17349,US,PA,17349,6,,,, +US-PA-17350,US,PA,17350,6,,,, +US-PA-17352,US,PA,17352,6,,,, +US-PA-17353,US,PA,17353,6,,,, +US-PA-17354,US,PA,17354,6,,,, +US-PA-17355,US,PA,17355,6,,,, +US-PA-17356,US,PA,17356,6,,,, +US-PA-17358,US,PA,17358,6,,,, +US-PA-17360,US,PA,17360,6,,,, +US-PA-17361,US,PA,17361,6,,,, +US-PA-17362,US,PA,17362,6,,,, +US-PA-17363,US,PA,17363,6,,,, +US-PA-17364,US,PA,17364,6,,,, +US-PA-17365,US,PA,17365,6,,,, +US-PA-17366,US,PA,17366,6,,,, +US-PA-17368,US,PA,17368,6,,,, +US-PA-17370,US,PA,17370,6,,,, +US-PA-17371,US,PA,17371,6,,,, +US-PA-17372,US,PA,17372,6,,,, +US-PA-17375,US,PA,17375,6,,,, +US-PA-17401,US,PA,17401,6,,,, +US-PA-17402,US,PA,17402,6,,,, +US-PA-17403,US,PA,17403,6,,,, +US-PA-17404,US,PA,17404,6,,,, +US-PA-17405,US,PA,17405,6,,,, +US-PA-17406,US,PA,17406,6,,,, +US-PA-17407,US,PA,17407,6,,,, +US-PA-17408,US,PA,17408,6,,,, +US-PA-17501,US,PA,17501,6,,,, +US-PA-17502,US,PA,17502,6,,,, +US-PA-17503,US,PA,17503,6,,,, +US-PA-17504,US,PA,17504,6,,,, +US-PA-17505,US,PA,17505,6,,,, +US-PA-17506,US,PA,17506,6,,,, +US-PA-17507,US,PA,17507,6,,,, +US-PA-17508,US,PA,17508,6,,,, +US-PA-17509,US,PA,17509,6,,,, +US-PA-17512,US,PA,17512,6,,,, +US-PA-17516,US,PA,17516,6,,,, +US-PA-17517,US,PA,17517,6,,,, +US-PA-17518,US,PA,17518,6,,,, +US-PA-17519,US,PA,17519,6,,,, +US-PA-17520,US,PA,17520,6,,,, +US-PA-17521,US,PA,17521,6,,,, +US-PA-17522,US,PA,17522,6,,,, +US-PA-17527,US,PA,17527,6,,,, +US-PA-17528,US,PA,17528,6,,,, +US-PA-17529,US,PA,17529,6,,,, +US-PA-17532,US,PA,17532,6,,,, +US-PA-17533,US,PA,17533,6,,,, +US-PA-17534,US,PA,17534,6,,,, +US-PA-17535,US,PA,17535,6,,,, +US-PA-17536,US,PA,17536,6,,,, +US-PA-17537,US,PA,17537,6,,,, +US-PA-17538,US,PA,17538,6,,,, +US-PA-17540,US,PA,17540,6,,,, +US-PA-17543,US,PA,17543,6,,,, +US-PA-17545,US,PA,17545,6,,,, +US-PA-17547,US,PA,17547,6,,,, +US-PA-17549,US,PA,17549,6,,,, +US-PA-17550,US,PA,17550,6,,,, +US-PA-17551,US,PA,17551,6,,,, +US-PA-17552,US,PA,17552,6,,,, +US-PA-17554,US,PA,17554,6,,,, +US-PA-17555,US,PA,17555,6,,,, +US-PA-17557,US,PA,17557,6,,,, +US-PA-17560,US,PA,17560,6,,,, +US-PA-17562,US,PA,17562,6,,,, +US-PA-17563,US,PA,17563,6,,,, +US-PA-17564,US,PA,17564,6,,,, +US-PA-17565,US,PA,17565,6,,,, +US-PA-17566,US,PA,17566,6,,,, +US-PA-17567,US,PA,17567,6,,,, +US-PA-17568,US,PA,17568,6,,,, +US-PA-17569,US,PA,17569,6,,,, +US-PA-17570,US,PA,17570,6,,,, +US-PA-17572,US,PA,17572,6,,,, +US-PA-17573,US,PA,17573,6,,,, +US-PA-17575,US,PA,17575,6,,,, +US-PA-17576,US,PA,17576,6,,,, +US-PA-17578,US,PA,17578,6,,,, +US-PA-17579,US,PA,17579,6,,,, +US-PA-17580,US,PA,17580,6,,,, +US-PA-17581,US,PA,17581,6,,,, +US-PA-17582,US,PA,17582,6,,,, +US-PA-17583,US,PA,17583,6,,,, +US-PA-17584,US,PA,17584,6,,,, +US-PA-17585,US,PA,17585,6,,,, +US-PA-17601,US,PA,17601,6,,,, +US-PA-17602,US,PA,17602,6,,,, +US-PA-17603,US,PA,17603,6,,,, +US-PA-17604,US,PA,17604,6,,,, +US-PA-17605,US,PA,17605,6,,,, +US-PA-17606,US,PA,17606,6,,,, +US-PA-17607,US,PA,17607,6,,,, +US-PA-17608,US,PA,17608,6,,,, +US-PA-17611,US,PA,17611,6,,,, +US-PA-17622,US,PA,17622,6,,,, +US-PA-17699,US,PA,17699,6,,,, +US-PA-17701,US,PA,17701,6,,,, +US-PA-17702,US,PA,17702,6,,,, +US-PA-17703,US,PA,17703,6,,,, +US-PA-17705,US,PA,17705,6,,,, +US-PA-17720,US,PA,17720,6,,,, +US-PA-17721,US,PA,17721,6,,,, +US-PA-17723,US,PA,17723,6,,,, +US-PA-17724,US,PA,17724,6,,,, +US-PA-17726,US,PA,17726,6,,,, +US-PA-17727,US,PA,17727,6,,,, +US-PA-17728,US,PA,17728,6,,,, +US-PA-17729,US,PA,17729,6,,,, +US-PA-17730,US,PA,17730,6,,,, +US-PA-17731,US,PA,17731,6,,,, +US-PA-17735,US,PA,17735,6,,,, +US-PA-17737,US,PA,17737,6,,,, +US-PA-17739,US,PA,17739,6,,,, +US-PA-17740,US,PA,17740,6,,,, +US-PA-17742,US,PA,17742,6,,,, +US-PA-17744,US,PA,17744,6,,,, +US-PA-17745,US,PA,17745,6,,,, +US-PA-17747,US,PA,17747,6,,,, +US-PA-17748,US,PA,17748,6,,,, +US-PA-17749,US,PA,17749,6,,,, +US-PA-17750,US,PA,17750,6,,,, +US-PA-17751,US,PA,17751,6,,,, +US-PA-17752,US,PA,17752,6,,,, +US-PA-17754,US,PA,17754,6,,,, +US-PA-17756,US,PA,17756,6,,,, +US-PA-17758,US,PA,17758,6,,,, +US-PA-17760,US,PA,17760,6,,,, +US-PA-17762,US,PA,17762,6,,,, +US-PA-17763,US,PA,17763,6,,,, +US-PA-17764,US,PA,17764,6,,,, +US-PA-17765,US,PA,17765,6,,,, +US-PA-17767,US,PA,17767,6,,,, +US-PA-17768,US,PA,17768,6,,,, +US-PA-17769,US,PA,17769,6,,,, +US-PA-17771,US,PA,17771,6,,,, +US-PA-17772,US,PA,17772,6,,,, +US-PA-17774,US,PA,17774,6,,,, +US-PA-17776,US,PA,17776,6,,,, +US-PA-17777,US,PA,17777,6,,,, +US-PA-17778,US,PA,17778,6,,,, +US-PA-17779,US,PA,17779,6,,,, +US-PA-17801,US,PA,17801,6,,,, +US-PA-17810,US,PA,17810,6,,,, +US-PA-17812,US,PA,17812,6,,,, +US-PA-17813,US,PA,17813,6,,,, +US-PA-17814,US,PA,17814,6,,,, +US-PA-17815,US,PA,17815,6,,,, +US-PA-17820,US,PA,17820,6,,,, +US-PA-17821,US,PA,17821,6,,,, +US-PA-17822,US,PA,17822,6,,,, +US-PA-17823,US,PA,17823,6,,,, +US-PA-17824,US,PA,17824,6,,,, +US-PA-17827,US,PA,17827,6,,,, +US-PA-17829,US,PA,17829,6,,,, +US-PA-17830,US,PA,17830,6,,,, +US-PA-17831,US,PA,17831,6,,,, +US-PA-17832,US,PA,17832,6,,,, +US-PA-17833,US,PA,17833,6,,,, +US-PA-17834,US,PA,17834,6,,,, +US-PA-17835,US,PA,17835,6,,,, +US-PA-17836,US,PA,17836,6,,,, +US-PA-17837,US,PA,17837,6,,,, +US-PA-17839,US,PA,17839,6,,,, +US-PA-17840,US,PA,17840,6,,,, +US-PA-17841,US,PA,17841,6,,,, +US-PA-17842,US,PA,17842,6,,,, +US-PA-17843,US,PA,17843,6,,,, +US-PA-17844,US,PA,17844,6,,,, +US-PA-17845,US,PA,17845,6,,,, +US-PA-17846,US,PA,17846,6,,,, +US-PA-17847,US,PA,17847,6,,,, +US-PA-17850,US,PA,17850,6,,,, +US-PA-17851,US,PA,17851,6,,,, +US-PA-17853,US,PA,17853,6,,,, +US-PA-17855,US,PA,17855,6,,,, +US-PA-17856,US,PA,17856,6,,,, +US-PA-17857,US,PA,17857,6,,,, +US-PA-17858,US,PA,17858,6,,,, +US-PA-17859,US,PA,17859,6,,,, +US-PA-17860,US,PA,17860,6,,,, +US-PA-17861,US,PA,17861,6,,,, +US-PA-17862,US,PA,17862,6,,,, +US-PA-17864,US,PA,17864,6,,,, +US-PA-17865,US,PA,17865,6,,,, +US-PA-17866,US,PA,17866,6,,,, +US-PA-17867,US,PA,17867,6,,,, +US-PA-17868,US,PA,17868,6,,,, +US-PA-17870,US,PA,17870,6,,,, +US-PA-17872,US,PA,17872,6,,,, +US-PA-17876,US,PA,17876,6,,,, +US-PA-17877,US,PA,17877,6,,,, +US-PA-17878,US,PA,17878,6,,,, +US-PA-17880,US,PA,17880,6,,,, +US-PA-17881,US,PA,17881,6,,,, +US-PA-17882,US,PA,17882,6,,,, +US-PA-17883,US,PA,17883,6,,,, +US-PA-17884,US,PA,17884,6,,,, +US-PA-17885,US,PA,17885,6,,,, +US-PA-17886,US,PA,17886,6,,,, +US-PA-17887,US,PA,17887,6,,,, +US-PA-17888,US,PA,17888,6,,,, +US-PA-17889,US,PA,17889,6,,,, +US-PA-17901,US,PA,17901,6,,,, +US-PA-17920,US,PA,17920,6,,,, +US-PA-17921,US,PA,17921,6,,,, +US-PA-17922,US,PA,17922,6,,,, +US-PA-17923,US,PA,17923,6,,,, +US-PA-17925,US,PA,17925,6,,,, +US-PA-17929,US,PA,17929,6,,,, +US-PA-17930,US,PA,17930,6,,,, +US-PA-17931,US,PA,17931,6,,,, +US-PA-17932,US,PA,17932,6,,,, +US-PA-17933,US,PA,17933,6,,,, +US-PA-17934,US,PA,17934,6,,,, +US-PA-17935,US,PA,17935,6,,,, +US-PA-17936,US,PA,17936,6,,,, +US-PA-17938,US,PA,17938,6,,,, +US-PA-17941,US,PA,17941,6,,,, +US-PA-17943,US,PA,17943,6,,,, +US-PA-17944,US,PA,17944,6,,,, +US-PA-17945,US,PA,17945,6,,,, +US-PA-17946,US,PA,17946,6,,,, +US-PA-17948,US,PA,17948,6,,,, +US-PA-17949,US,PA,17949,6,,,, +US-PA-17951,US,PA,17951,6,,,, +US-PA-17952,US,PA,17952,6,,,, +US-PA-17953,US,PA,17953,6,,,, +US-PA-17954,US,PA,17954,6,,,, +US-PA-17957,US,PA,17957,6,,,, +US-PA-17959,US,PA,17959,6,,,, +US-PA-17960,US,PA,17960,6,,,, +US-PA-17961,US,PA,17961,6,,,, +US-PA-17963,US,PA,17963,6,,,, +US-PA-17964,US,PA,17964,6,,,, +US-PA-17965,US,PA,17965,6,,,, +US-PA-17966,US,PA,17966,6,,,, +US-PA-17967,US,PA,17967,6,,,, +US-PA-17968,US,PA,17968,6,,,, +US-PA-17970,US,PA,17970,6,,,, +US-PA-17972,US,PA,17972,6,,,, +US-PA-17974,US,PA,17974,6,,,, +US-PA-17976,US,PA,17976,6,,,, +US-PA-17978,US,PA,17978,6,,,, +US-PA-17979,US,PA,17979,6,,,, +US-PA-17980,US,PA,17980,6,,,, +US-PA-17981,US,PA,17981,6,,,, +US-PA-17982,US,PA,17982,6,,,, +US-PA-17983,US,PA,17983,6,,,, +US-PA-17985,US,PA,17985,6,,,, +US-PA-18001,US,PA,18001,6,,,, +US-PA-18002,US,PA,18002,6,,,, +US-PA-18003,US,PA,18003,6,,,, +US-PA-18010,US,PA,18010,6,,,, +US-PA-18011,US,PA,18011,6,,,, +US-PA-18012,US,PA,18012,6,,,, +US-PA-18013,US,PA,18013,6,,,, +US-PA-18014,US,PA,18014,6,,,, +US-PA-18015,US,PA,18015,6,,,, +US-PA-18016,US,PA,18016,6,,,, +US-PA-18017,US,PA,18017,6,,,, +US-PA-18018,US,PA,18018,6,,,, +US-PA-18020,US,PA,18020,6,,,, +US-PA-18025,US,PA,18025,6,,,, +US-PA-18030,US,PA,18030,6,,,, +US-PA-18031,US,PA,18031,6,,,, +US-PA-18032,US,PA,18032,6,,,, +US-PA-18034,US,PA,18034,6,,,, +US-PA-18035,US,PA,18035,6,,,, +US-PA-18036,US,PA,18036,6,,,, +US-PA-18037,US,PA,18037,6,,,, +US-PA-18038,US,PA,18038,6,,,, +US-PA-18039,US,PA,18039,6,,,, +US-PA-18040,US,PA,18040,6,,,, +US-PA-18041,US,PA,18041,6,,,, +US-PA-18042,US,PA,18042,6,,,, +US-PA-18043,US,PA,18043,6,,,, +US-PA-18044,US,PA,18044,6,,,, +US-PA-18045,US,PA,18045,6,,,, +US-PA-18046,US,PA,18046,6,,,, +US-PA-18049,US,PA,18049,6,,,, +US-PA-18050,US,PA,18050,6,,,, +US-PA-18051,US,PA,18051,6,,,, +US-PA-18052,US,PA,18052,6,,,, +US-PA-18053,US,PA,18053,6,,,, +US-PA-18054,US,PA,18054,6,,,, +US-PA-18055,US,PA,18055,6,,,, +US-PA-18056,US,PA,18056,6,,,, +US-PA-18058,US,PA,18058,6,,,, +US-PA-18059,US,PA,18059,6,,,, +US-PA-18060,US,PA,18060,6,,,, +US-PA-18062,US,PA,18062,6,,,, +US-PA-18063,US,PA,18063,6,,,, +US-PA-18064,US,PA,18064,6,,,, +US-PA-18065,US,PA,18065,6,,,, +US-PA-18066,US,PA,18066,6,,,, +US-PA-18067,US,PA,18067,6,,,, +US-PA-18068,US,PA,18068,6,,,, +US-PA-18069,US,PA,18069,6,,,, +US-PA-18070,US,PA,18070,6,,,, +US-PA-18071,US,PA,18071,6,,,, +US-PA-18072,US,PA,18072,6,,,, +US-PA-18073,US,PA,18073,6,,,, +US-PA-18074,US,PA,18074,6,,,, +US-PA-18076,US,PA,18076,6,,,, +US-PA-18077,US,PA,18077,6,,,, +US-PA-18078,US,PA,18078,6,,,, +US-PA-18079,US,PA,18079,6,,,, +US-PA-18080,US,PA,18080,6,,,, +US-PA-18081,US,PA,18081,6,,,, +US-PA-18083,US,PA,18083,6,,,, +US-PA-18084,US,PA,18084,6,,,, +US-PA-18085,US,PA,18085,6,,,, +US-PA-18086,US,PA,18086,6,,,, +US-PA-18087,US,PA,18087,6,,,, +US-PA-18088,US,PA,18088,6,,,, +US-PA-18091,US,PA,18091,6,,,, +US-PA-18092,US,PA,18092,6,,,, +US-PA-18098,US,PA,18098,6,,,, +US-PA-18099,US,PA,18099,6,,,, +US-PA-18101,US,PA,18101,6,,,, +US-PA-18102,US,PA,18102,6,,,, +US-PA-18103,US,PA,18103,6,,,, +US-PA-18104,US,PA,18104,6,,,, +US-PA-18105,US,PA,18105,6,,,, +US-PA-18106,US,PA,18106,6,,,, +US-PA-18109,US,PA,18109,6,,,, +US-PA-18195,US,PA,18195,6,,,, +US-PA-18201,US,PA,18201,6,,,, +US-PA-18202,US,PA,18202,6,,,, +US-PA-18210,US,PA,18210,6,,,, +US-PA-18211,US,PA,18211,6,,,, +US-PA-18212,US,PA,18212,6,,,, +US-PA-18214,US,PA,18214,6,,,, +US-PA-18216,US,PA,18216,6,,,, +US-PA-18218,US,PA,18218,6,,,, +US-PA-18219,US,PA,18219,6,,,, +US-PA-18220,US,PA,18220,6,,,, +US-PA-18221,US,PA,18221,6,,,, +US-PA-18222,US,PA,18222,6,,,, +US-PA-18223,US,PA,18223,6,,,, +US-PA-18224,US,PA,18224,6,,,, +US-PA-18225,US,PA,18225,6,,,, +US-PA-18229,US,PA,18229,6,,,, +US-PA-18230,US,PA,18230,6,,,, +US-PA-18231,US,PA,18231,6,,,, +US-PA-18232,US,PA,18232,6,,,, +US-PA-18234,US,PA,18234,6,,,, +US-PA-18235,US,PA,18235,6,,,, +US-PA-18237,US,PA,18237,6,,,, +US-PA-18239,US,PA,18239,6,,,, +US-PA-18240,US,PA,18240,6,,,, +US-PA-18241,US,PA,18241,6,,,, +US-PA-18242,US,PA,18242,6,,,, +US-PA-18244,US,PA,18244,6,,,, +US-PA-18245,US,PA,18245,6,,,, +US-PA-18246,US,PA,18246,6,,,, +US-PA-18247,US,PA,18247,6,,,, +US-PA-18248,US,PA,18248,6,,,, +US-PA-18249,US,PA,18249,6,,,, +US-PA-18250,US,PA,18250,6,,,, +US-PA-18251,US,PA,18251,6,,,, +US-PA-18252,US,PA,18252,6,,,, +US-PA-18254,US,PA,18254,6,,,, +US-PA-18255,US,PA,18255,6,,,, +US-PA-18256,US,PA,18256,6,,,, +US-PA-18301,US,PA,18301,6,,,, +US-PA-18302,US,PA,18302,6,,,, +US-PA-18320,US,PA,18320,6,,,, +US-PA-18321,US,PA,18321,6,,,, +US-PA-18322,US,PA,18322,6,,,, +US-PA-18323,US,PA,18323,6,,,, +US-PA-18324,US,PA,18324,6,,,, +US-PA-18325,US,PA,18325,6,,,, +US-PA-18326,US,PA,18326,6,,,, +US-PA-18327,US,PA,18327,6,,,, +US-PA-18328,US,PA,18328,6,,,, +US-PA-18330,US,PA,18330,6,,,, +US-PA-18331,US,PA,18331,6,,,, +US-PA-18332,US,PA,18332,6,,,, +US-PA-18333,US,PA,18333,6,,,, +US-PA-18334,US,PA,18334,6,,,, +US-PA-18335,US,PA,18335,6,,,, +US-PA-18336,US,PA,18336,6,,,, +US-PA-18337,US,PA,18337,6,,,, +US-PA-18340,US,PA,18340,6,,,, +US-PA-18341,US,PA,18341,6,,,, +US-PA-18342,US,PA,18342,6,,,, +US-PA-18343,US,PA,18343,6,,,, +US-PA-18344,US,PA,18344,6,,,, +US-PA-18346,US,PA,18346,6,,,, +US-PA-18347,US,PA,18347,6,,,, +US-PA-18348,US,PA,18348,6,,,, +US-PA-18349,US,PA,18349,6,,,, +US-PA-18350,US,PA,18350,6,,,, +US-PA-18351,US,PA,18351,6,,,, +US-PA-18352,US,PA,18352,6,,,, +US-PA-18353,US,PA,18353,6,,,, +US-PA-18354,US,PA,18354,6,,,, +US-PA-18355,US,PA,18355,6,,,, +US-PA-18356,US,PA,18356,6,,,, +US-PA-18357,US,PA,18357,6,,,, +US-PA-18360,US,PA,18360,6,,,, +US-PA-18370,US,PA,18370,6,,,, +US-PA-18371,US,PA,18371,6,,,, +US-PA-18372,US,PA,18372,6,,,, +US-PA-18373,US,PA,18373,6,,,, +US-PA-18403,US,PA,18403,6,,,, +US-PA-18405,US,PA,18405,6,,,, +US-PA-18407,US,PA,18407,6,,,, +US-PA-18410,US,PA,18410,6,,,, +US-PA-18411,US,PA,18411,6,,,, +US-PA-18413,US,PA,18413,6,,,, +US-PA-18414,US,PA,18414,6,,,, +US-PA-18415,US,PA,18415,6,,,, +US-PA-18416,US,PA,18416,6,,,, +US-PA-18417,US,PA,18417,6,,,, +US-PA-18419,US,PA,18419,6,,,, +US-PA-18420,US,PA,18420,6,,,, +US-PA-18421,US,PA,18421,6,,,, +US-PA-18424,US,PA,18424,6,,,, +US-PA-18425,US,PA,18425,6,,,, +US-PA-18426,US,PA,18426,6,,,, +US-PA-18427,US,PA,18427,6,,,, +US-PA-18428,US,PA,18428,6,,,, +US-PA-18430,US,PA,18430,6,,,, +US-PA-18431,US,PA,18431,6,,,, +US-PA-18433,US,PA,18433,6,,,, +US-PA-18434,US,PA,18434,6,,,, +US-PA-18435,US,PA,18435,6,,,, +US-PA-18436,US,PA,18436,6,,,, +US-PA-18437,US,PA,18437,6,,,, +US-PA-18438,US,PA,18438,6,,,, +US-PA-18439,US,PA,18439,6,,,, +US-PA-18440,US,PA,18440,6,,,, +US-PA-18441,US,PA,18441,6,,,, +US-PA-18443,US,PA,18443,6,,,, +US-PA-18444,US,PA,18444,6,,,, +US-PA-18445,US,PA,18445,6,,,, +US-PA-18446,US,PA,18446,6,,,, +US-PA-18447,US,PA,18447,6,,,, +US-PA-18448,US,PA,18448,6,,,, +US-PA-18449,US,PA,18449,6,,,, +US-PA-18451,US,PA,18451,6,,,, +US-PA-18452,US,PA,18452,6,,,, +US-PA-18453,US,PA,18453,6,,,, +US-PA-18454,US,PA,18454,6,,,, +US-PA-18455,US,PA,18455,6,,,, +US-PA-18456,US,PA,18456,6,,,, +US-PA-18457,US,PA,18457,6,,,, +US-PA-18458,US,PA,18458,6,,,, +US-PA-18459,US,PA,18459,6,,,, +US-PA-18460,US,PA,18460,6,,,, +US-PA-18461,US,PA,18461,6,,,, +US-PA-18462,US,PA,18462,6,,,, +US-PA-18463,US,PA,18463,6,,,, +US-PA-18464,US,PA,18464,6,,,, +US-PA-18465,US,PA,18465,6,,,, +US-PA-18466,US,PA,18466,6,,,, +US-PA-18469,US,PA,18469,6,,,, +US-PA-18470,US,PA,18470,6,,,, +US-PA-18471,US,PA,18471,6,,,, +US-PA-18472,US,PA,18472,6,,,, +US-PA-18473,US,PA,18473,6,,,, +US-PA-18501,US,PA,18501,6,,,, +US-PA-18502,US,PA,18502,6,,,, +US-PA-18503,US,PA,18503,6,,,, +US-PA-18504,US,PA,18504,6,,,, +US-PA-18505,US,PA,18505,6,,,, +US-PA-18507,US,PA,18507,6,,,, +US-PA-18508,US,PA,18508,6,,,, +US-PA-18509,US,PA,18509,6,,,, +US-PA-18510,US,PA,18510,6,,,, +US-PA-18512,US,PA,18512,6,,,, +US-PA-18515,US,PA,18515,6,,,, +US-PA-18517,US,PA,18517,6,,,, +US-PA-18518,US,PA,18518,6,,,, +US-PA-18519,US,PA,18519,6,,,, +US-PA-18540,US,PA,18540,6,,,, +US-PA-18577,US,PA,18577,6,,,, +US-PA-18601,US,PA,18601,6,,,, +US-PA-18602,US,PA,18602,6,,,, +US-PA-18603,US,PA,18603,6,,,, +US-PA-18610,US,PA,18610,6,,,, +US-PA-18611,US,PA,18611,6,,,, +US-PA-18612,US,PA,18612,6,,,, +US-PA-18614,US,PA,18614,6,,,, +US-PA-18615,US,PA,18615,6,,,, +US-PA-18616,US,PA,18616,6,,,, +US-PA-18617,US,PA,18617,6,,,, +US-PA-18618,US,PA,18618,6,,,, +US-PA-18619,US,PA,18619,6,,,, +US-PA-18621,US,PA,18621,6,,,, +US-PA-18622,US,PA,18622,6,,,, +US-PA-18623,US,PA,18623,6,,,, +US-PA-18624,US,PA,18624,6,,,, +US-PA-18625,US,PA,18625,6,,,, +US-PA-18626,US,PA,18626,6,,,, +US-PA-18627,US,PA,18627,6,,,, +US-PA-18628,US,PA,18628,6,,,, +US-PA-18629,US,PA,18629,6,,,, +US-PA-18630,US,PA,18630,6,,,, +US-PA-18631,US,PA,18631,6,,,, +US-PA-18632,US,PA,18632,6,,,, +US-PA-18634,US,PA,18634,6,,,, +US-PA-18635,US,PA,18635,6,,,, +US-PA-18636,US,PA,18636,6,,,, +US-PA-18640,US,PA,18640,6,,,, +US-PA-18641,US,PA,18641,6,,,, +US-PA-18642,US,PA,18642,6,,,, +US-PA-18643,US,PA,18643,6,,,, +US-PA-18644,US,PA,18644,6,,,, +US-PA-18651,US,PA,18651,6,,,, +US-PA-18653,US,PA,18653,6,,,, +US-PA-18654,US,PA,18654,6,,,, +US-PA-18655,US,PA,18655,6,,,, +US-PA-18656,US,PA,18656,6,,,, +US-PA-18657,US,PA,18657,6,,,, +US-PA-18660,US,PA,18660,6,,,, +US-PA-18661,US,PA,18661,6,,,, +US-PA-18690,US,PA,18690,6,,,, +US-PA-18701,US,PA,18701,6,,,, +US-PA-18702,US,PA,18702,6,,,, +US-PA-18703,US,PA,18703,6,,,, +US-PA-18704,US,PA,18704,6,,,, +US-PA-18705,US,PA,18705,6,,,, +US-PA-18706,US,PA,18706,6,,,, +US-PA-18707,US,PA,18707,6,,,, +US-PA-18708,US,PA,18708,6,,,, +US-PA-18709,US,PA,18709,6,,,, +US-PA-18710,US,PA,18710,6,,,, +US-PA-18711,US,PA,18711,6,,,, +US-PA-18762,US,PA,18762,6,,,, +US-PA-18764,US,PA,18764,6,,,, +US-PA-18765,US,PA,18765,6,,,, +US-PA-18766,US,PA,18766,6,,,, +US-PA-18767,US,PA,18767,6,,,, +US-PA-18769,US,PA,18769,6,,,, +US-PA-18773,US,PA,18773,6,,,, +US-PA-18801,US,PA,18801,6,,,, +US-PA-18810,US,PA,18810,6,,,, +US-PA-18812,US,PA,18812,6,,,, +US-PA-18813,US,PA,18813,6,,,, +US-PA-18814,US,PA,18814,6,,,, +US-PA-18815,US,PA,18815,6,,,, +US-PA-18816,US,PA,18816,6,,,, +US-PA-18817,US,PA,18817,6,,,, +US-PA-18818,US,PA,18818,6,,,, +US-PA-18820,US,PA,18820,6,,,, +US-PA-18821,US,PA,18821,6,,,, +US-PA-18822,US,PA,18822,6,,,, +US-PA-18823,US,PA,18823,6,,,, +US-PA-18824,US,PA,18824,6,,,, +US-PA-18825,US,PA,18825,6,,,, +US-PA-18826,US,PA,18826,6,,,, +US-PA-18827,US,PA,18827,6,,,, +US-PA-18828,US,PA,18828,6,,,, +US-PA-18829,US,PA,18829,6,,,, +US-PA-18830,US,PA,18830,6,,,, +US-PA-18831,US,PA,18831,6,,,, +US-PA-18832,US,PA,18832,6,,,, +US-PA-18833,US,PA,18833,6,,,, +US-PA-18834,US,PA,18834,6,,,, +US-PA-18837,US,PA,18837,6,,,, +US-PA-18840,US,PA,18840,6,,,, +US-PA-18842,US,PA,18842,6,,,, +US-PA-18843,US,PA,18843,6,,,, +US-PA-18844,US,PA,18844,6,,,, +US-PA-18845,US,PA,18845,6,,,, +US-PA-18846,US,PA,18846,6,,,, +US-PA-18847,US,PA,18847,6,,,, +US-PA-18848,US,PA,18848,6,,,, +US-PA-18850,US,PA,18850,6,,,, +US-PA-18851,US,PA,18851,6,,,, +US-PA-18853,US,PA,18853,6,,,, +US-PA-18854,US,PA,18854,6,,,, +US-PA-18901,US,PA,18901,6,,,, +US-PA-18902,US,PA,18902,6,,,, +US-PA-18910,US,PA,18910,6,,,, +US-PA-18911,US,PA,18911,6,,,, +US-PA-18912,US,PA,18912,6,,,, +US-PA-18913,US,PA,18913,6,,,, +US-PA-18914,US,PA,18914,6,,,, +US-PA-18915,US,PA,18915,6,,,, +US-PA-18916,US,PA,18916,6,,,, +US-PA-18917,US,PA,18917,6,,,, +US-PA-18918,US,PA,18918,6,,,, +US-PA-18920,US,PA,18920,6,,,, +US-PA-18921,US,PA,18921,6,,,, +US-PA-18922,US,PA,18922,6,,,, +US-PA-18923,US,PA,18923,6,,,, +US-PA-18924,US,PA,18924,6,,,, +US-PA-18925,US,PA,18925,6,,,, +US-PA-18926,US,PA,18926,6,,,, +US-PA-18927,US,PA,18927,6,,,, +US-PA-18928,US,PA,18928,6,,,, +US-PA-18929,US,PA,18929,6,,,, +US-PA-18930,US,PA,18930,6,,,, +US-PA-18931,US,PA,18931,6,,,, +US-PA-18932,US,PA,18932,6,,,, +US-PA-18933,US,PA,18933,6,,,, +US-PA-18934,US,PA,18934,6,,,, +US-PA-18935,US,PA,18935,6,,,, +US-PA-18936,US,PA,18936,6,,,, +US-PA-18938,US,PA,18938,6,,,, +US-PA-18940,US,PA,18940,6,,,, +US-PA-18942,US,PA,18942,6,,,, +US-PA-18943,US,PA,18943,6,,,, +US-PA-18944,US,PA,18944,6,,,, +US-PA-18946,US,PA,18946,6,,,, +US-PA-18947,US,PA,18947,6,,,, +US-PA-18949,US,PA,18949,6,,,, +US-PA-18950,US,PA,18950,6,,,, +US-PA-18951,US,PA,18951,6,,,, +US-PA-18953,US,PA,18953,6,,,, +US-PA-18954,US,PA,18954,6,,,, +US-PA-18955,US,PA,18955,6,,,, +US-PA-18956,US,PA,18956,6,,,, +US-PA-18957,US,PA,18957,6,,,, +US-PA-18958,US,PA,18958,6,,,, +US-PA-18960,US,PA,18960,6,,,, +US-PA-18962,US,PA,18962,6,,,, +US-PA-18963,US,PA,18963,6,,,, +US-PA-18964,US,PA,18964,6,,,, +US-PA-18966,US,PA,18966,6,,,, +US-PA-18968,US,PA,18968,6,,,, +US-PA-18969,US,PA,18969,6,,,, +US-PA-18970,US,PA,18970,6,,,, +US-PA-18971,US,PA,18971,6,,,, +US-PA-18972,US,PA,18972,6,,,, +US-PA-18974,US,PA,18974,6,,,, +US-PA-18976,US,PA,18976,6,,,, +US-PA-18977,US,PA,18977,6,,,, +US-PA-18979,US,PA,18979,6,,,, +US-PA-18980,US,PA,18980,6,,,, +US-PA-18981,US,PA,18981,6,,,, +US-PA-18991,US,PA,18991,6,,,, +US-PA-19001,US,PA,19001,6,,,, +US-PA-19002,US,PA,19002,6,,,, +US-PA-19003,US,PA,19003,6,,,, +US-PA-19004,US,PA,19004,6,,,, +US-PA-19006,US,PA,19006,6,,,, +US-PA-19007,US,PA,19007,6,,,, +US-PA-19008,US,PA,19008,6,,,, +US-PA-19009,US,PA,19009,6,,,, +US-PA-19010,US,PA,19010,6,,,, +US-PA-19012,US,PA,19012,6,,,, +US-PA-19013,US,PA,19013,6,,,, +US-PA-19014,US,PA,19014,6,,,, +US-PA-19015,US,PA,19015,6,,,, +US-PA-19016,US,PA,19016,6,,,, +US-PA-19017,US,PA,19017,6,,,, +US-PA-19018,US,PA,19018,6,,,, +US-PA-19019,US,PA,19019,8,,,, +US-PA-19020,US,PA,19020,6,,,, +US-PA-19021,US,PA,19021,6,,,, +US-PA-19022,US,PA,19022,6,,,, +US-PA-19023,US,PA,19023,6,,,, +US-PA-19025,US,PA,19025,6,,,, +US-PA-19026,US,PA,19026,6,,,, +US-PA-19027,US,PA,19027,6,,,, +US-PA-19028,US,PA,19028,6,,,, +US-PA-19029,US,PA,19029,6,,,, +US-PA-19030,US,PA,19030,6,,,, +US-PA-19031,US,PA,19031,6,,,, +US-PA-19032,US,PA,19032,6,,,, +US-PA-19033,US,PA,19033,6,,,, +US-PA-19034,US,PA,19034,6,,,, +US-PA-19035,US,PA,19035,6,,,, +US-PA-19036,US,PA,19036,6,,,, +US-PA-19037,US,PA,19037,6,,,, +US-PA-19038,US,PA,19038,6,,,, +US-PA-19039,US,PA,19039,6,,,, +US-PA-19040,US,PA,19040,6,,,, +US-PA-19041,US,PA,19041,6,,,, +US-PA-19043,US,PA,19043,6,,,, +US-PA-19044,US,PA,19044,6,,,, +US-PA-19046,US,PA,19046,6,,,, +US-PA-19047,US,PA,19047,6,,,, +US-PA-19048,US,PA,19048,6,,,, +US-PA-19049,US,PA,19049,6,,,, +US-PA-19050,US,PA,19050,6,,,, +US-PA-19052,US,PA,19052,6,,,, +US-PA-19053,US,PA,19053,6,,,, +US-PA-19054,US,PA,19054,6,,,, +US-PA-19055,US,PA,19055,6,,,, +US-PA-19056,US,PA,19056,6,,,, +US-PA-19057,US,PA,19057,6,,,, +US-PA-19058,US,PA,19058,6,,,, +US-PA-19060,US,PA,19060,6,,,, +US-PA-19061,US,PA,19061,6,,,, +US-PA-19063,US,PA,19063,6,,,, +US-PA-19064,US,PA,19064,6,,,, +US-PA-19065,US,PA,19065,6,,,, +US-PA-19066,US,PA,19066,6,,,, +US-PA-19067,US,PA,19067,6,,,, +US-PA-19070,US,PA,19070,6,,,, +US-PA-19072,US,PA,19072,6,,,, +US-PA-19073,US,PA,19073,6,,,, +US-PA-19074,US,PA,19074,6,,,, +US-PA-19075,US,PA,19075,6,,,, +US-PA-19076,US,PA,19076,6,,,, +US-PA-19078,US,PA,19078,6,,,, +US-PA-19079,US,PA,19079,6,,,, +US-PA-19080,US,PA,19080,6,,,, +US-PA-19081,US,PA,19081,6,,,, +US-PA-19082,US,PA,19082,6,,,, +US-PA-19083,US,PA,19083,6,,,, +US-PA-19085,US,PA,19085,6,,,, +US-PA-19086,US,PA,19086,6,,,, +US-PA-19087,US,PA,19087,6,,,, +US-PA-19088,US,PA,19088,6,,,, +US-PA-19089,US,PA,19089,6,,,, +US-PA-19090,US,PA,19090,6,,,, +US-PA-19091,US,PA,19091,6,,,, +US-PA-19092,US,PA,19092,8,,,, +US-PA-19093,US,PA,19093,8,,,, +US-PA-19094,US,PA,19094,6,,,, +US-PA-19095,US,PA,19095,6,,,, +US-PA-19096,US,PA,19096,6,,,, +US-PA-19098,US,PA,19098,6,,,, +US-PA-19099,US,PA,19099,8,,,, +US-PA-19101,US,PA,19101,8,,,, +US-PA-19102,US,PA,19102,8,,,, +US-PA-19103,US,PA,19103,8,,,, +US-PA-19104,US,PA,19104,8,,,, +US-PA-19105,US,PA,19105,8,,,, +US-PA-19106,US,PA,19106,8,,,, +US-PA-19107,US,PA,19107,8,,,, +US-PA-19108,US,PA,19108,8,,,, +US-PA-19109,US,PA,19109,8,,,, +US-PA-19110,US,PA,19110,8,,,, +US-PA-19111,US,PA,19111,8,,,, +US-PA-19112,US,PA,19112,8,,,, +US-PA-19113,US,PA,19113,6,,,, +US-PA-19114,US,PA,19114,8,,,, +US-PA-19115,US,PA,19115,8,,,, +US-PA-19116,US,PA,19116,8,,,, +US-PA-19118,US,PA,19118,8,,,, +US-PA-19119,US,PA,19119,8,,,, +US-PA-19120,US,PA,19120,8,,,, +US-PA-19121,US,PA,19121,8,,,, +US-PA-19122,US,PA,19122,8,,,, +US-PA-19123,US,PA,19123,8,,,, +US-PA-19124,US,PA,19124,8,,,, +US-PA-19125,US,PA,19125,8,,,, +US-PA-19126,US,PA,19126,8,,,, +US-PA-19127,US,PA,19127,8,,,, +US-PA-19128,US,PA,19128,8,,,, +US-PA-19129,US,PA,19129,8,,,, +US-PA-19130,US,PA,19130,8,,,, +US-PA-19131,US,PA,19131,8,,,, +US-PA-19132,US,PA,19132,8,,,, +US-PA-19133,US,PA,19133,8,,,, +US-PA-19134,US,PA,19134,8,,,, +US-PA-19135,US,PA,19135,8,,,, +US-PA-19136,US,PA,19136,8,,,, +US-PA-19137,US,PA,19137,8,,,, +US-PA-19138,US,PA,19138,8,,,, +US-PA-19139,US,PA,19139,8,,,, +US-PA-19140,US,PA,19140,8,,,, +US-PA-19141,US,PA,19141,8,,,, +US-PA-19142,US,PA,19142,8,,,, +US-PA-19143,US,PA,19143,8,,,, +US-PA-19144,US,PA,19144,8,,,, +US-PA-19145,US,PA,19145,8,,,, +US-PA-19146,US,PA,19146,8,,,, +US-PA-19147,US,PA,19147,8,,,, +US-PA-19148,US,PA,19148,8,,,, +US-PA-19149,US,PA,19149,8,,,, +US-PA-19150,US,PA,19150,8,,,, +US-PA-19151,US,PA,19151,8,,,, +US-PA-19152,US,PA,19152,8,,,, +US-PA-19153,US,PA,19153,8,,,, +US-PA-19154,US,PA,19154,8,,,, +US-PA-19155,US,PA,19155,8,,,, +US-PA-19160,US,PA,19160,8,,,, +US-PA-19161,US,PA,19161,8,,,, +US-PA-19162,US,PA,19162,8,,,, +US-PA-19170,US,PA,19170,8,,,, +US-PA-19171,US,PA,19171,8,,,, +US-PA-19172,US,PA,19172,8,,,, +US-PA-19173,US,PA,19173,8,,,, +US-PA-19175,US,PA,19175,8,,,, +US-PA-19176,US,PA,19176,8,,,, +US-PA-19177,US,PA,19177,8,,,, +US-PA-19178,US,PA,19178,8,,,, +US-PA-19179,US,PA,19179,8,,,, +US-PA-19181,US,PA,19181,8,,,, +US-PA-19182,US,PA,19182,8,,,, +US-PA-19183,US,PA,19183,8,,,, +US-PA-19184,US,PA,19184,8,,,, +US-PA-19185,US,PA,19185,8,,,, +US-PA-19187,US,PA,19187,8,,,, +US-PA-19188,US,PA,19188,8,,,, +US-PA-19190,US,PA,19190,8,,,, +US-PA-19191,US,PA,19191,8,,,, +US-PA-19192,US,PA,19192,8,,,, +US-PA-19193,US,PA,19193,8,,,, +US-PA-19194,US,PA,19194,8,,,, +US-PA-19195,US,PA,19195,8,,,, +US-PA-19196,US,PA,19196,8,,,, +US-PA-19197,US,PA,19197,8,,,, +US-PA-19244,US,PA,19244,8,,,, +US-PA-19255,US,PA,19255,8,,,, +US-PA-19301,US,PA,19301,6,,,, +US-PA-19310,US,PA,19310,6,,,, +US-PA-19311,US,PA,19311,6,,,, +US-PA-19312,US,PA,19312,6,,,, +US-PA-19316,US,PA,19316,6,,,, +US-PA-19317,US,PA,19317,6,,,, +US-PA-19318,US,PA,19318,6,,,, +US-PA-19319,US,PA,19319,6,,,, +US-PA-19320,US,PA,19320,6,,,, +US-PA-19330,US,PA,19330,6,,,, +US-PA-19331,US,PA,19331,6,,,, +US-PA-19333,US,PA,19333,6,,,, +US-PA-19335,US,PA,19335,6,,,, +US-PA-19339,US,PA,19339,6,,,, +US-PA-19340,US,PA,19340,6,,,, +US-PA-19341,US,PA,19341,6,,,, +US-PA-19342,US,PA,19342,6,,,, +US-PA-19343,US,PA,19343,6,,,, +US-PA-19344,US,PA,19344,6,,,, +US-PA-19345,US,PA,19345,6,,,, +US-PA-19346,US,PA,19346,6,,,, +US-PA-19347,US,PA,19347,6,,,, +US-PA-19348,US,PA,19348,6,,,, +US-PA-19350,US,PA,19350,6,,,, +US-PA-19351,US,PA,19351,6,,,, +US-PA-19352,US,PA,19352,6,,,, +US-PA-19353,US,PA,19353,6,,,, +US-PA-19354,US,PA,19354,6,,,, +US-PA-19355,US,PA,19355,6,,,, +US-PA-19357,US,PA,19357,6,,,, +US-PA-19358,US,PA,19358,6,,,, +US-PA-19360,US,PA,19360,6,,,, +US-PA-19362,US,PA,19362,6,,,, +US-PA-19363,US,PA,19363,6,,,, +US-PA-19365,US,PA,19365,6,,,, +US-PA-19366,US,PA,19366,6,,,, +US-PA-19367,US,PA,19367,6,,,, +US-PA-19369,US,PA,19369,6,,,, +US-PA-19371,US,PA,19371,6,,,, +US-PA-19372,US,PA,19372,6,,,, +US-PA-19373,US,PA,19373,6,,,, +US-PA-19374,US,PA,19374,6,,,, +US-PA-19375,US,PA,19375,6,,,, +US-PA-19376,US,PA,19376,6,,,, +US-PA-19380,US,PA,19380,6,,,, +US-PA-19381,US,PA,19381,6,,,, +US-PA-19382,US,PA,19382,6,,,, +US-PA-19383,US,PA,19383,6,,,, +US-PA-19390,US,PA,19390,6,,,, +US-PA-19395,US,PA,19395,6,,,, +US-PA-19397,US,PA,19397,6,,,, +US-PA-19398,US,PA,19398,6,,,, +US-PA-19399,US,PA,19399,6,,,, +US-PA-19401,US,PA,19401,6,,,, +US-PA-19403,US,PA,19403,6,,,, +US-PA-19404,US,PA,19404,6,,,, +US-PA-19405,US,PA,19405,6,,,, +US-PA-19406,US,PA,19406,6,,,, +US-PA-19407,US,PA,19407,6,,,, +US-PA-19408,US,PA,19408,6,,,, +US-PA-19415,US,PA,19415,6,,,, +US-PA-19420,US,PA,19420,6,,,, +US-PA-19421,US,PA,19421,6,,,, +US-PA-19422,US,PA,19422,6,,,, +US-PA-19423,US,PA,19423,6,,,, +US-PA-19424,US,PA,19424,6,,,, +US-PA-19425,US,PA,19425,6,,,, +US-PA-19426,US,PA,19426,6,,,, +US-PA-19428,US,PA,19428,6,,,, +US-PA-19429,US,PA,19429,6,,,, +US-PA-19430,US,PA,19430,6,,,, +US-PA-19432,US,PA,19432,6,,,, +US-PA-19435,US,PA,19435,6,,,, +US-PA-19436,US,PA,19436,6,,,, +US-PA-19437,US,PA,19437,6,,,, +US-PA-19438,US,PA,19438,6,,,, +US-PA-19440,US,PA,19440,6,,,, +US-PA-19441,US,PA,19441,6,,,, +US-PA-19442,US,PA,19442,6,,,, +US-PA-19443,US,PA,19443,6,,,, +US-PA-19444,US,PA,19444,6,,,, +US-PA-19446,US,PA,19446,6,,,, +US-PA-19450,US,PA,19450,6,,,, +US-PA-19451,US,PA,19451,6,,,, +US-PA-19453,US,PA,19453,6,,,, +US-PA-19454,US,PA,19454,6,,,, +US-PA-19455,US,PA,19455,6,,,, +US-PA-19456,US,PA,19456,6,,,, +US-PA-19457,US,PA,19457,6,,,, +US-PA-19460,US,PA,19460,6,,,, +US-PA-19462,US,PA,19462,6,,,, +US-PA-19464,US,PA,19464,6,,,, +US-PA-19465,US,PA,19465,6,,,, +US-PA-19468,US,PA,19468,6,,,, +US-PA-19470,US,PA,19470,6,,,, +US-PA-19472,US,PA,19472,6,,,, +US-PA-19473,US,PA,19473,6,,,, +US-PA-19474,US,PA,19474,6,,,, +US-PA-19475,US,PA,19475,6,,,, +US-PA-19477,US,PA,19477,6,,,, +US-PA-19478,US,PA,19478,6,,,, +US-PA-19480,US,PA,19480,6,,,, +US-PA-19481,US,PA,19481,6,,,, +US-PA-19482,US,PA,19482,6,,,, +US-PA-19484,US,PA,19484,6,,,, +US-PA-19486,US,PA,19486,6,,,, +US-PA-19490,US,PA,19490,6,,,, +US-PA-19492,US,PA,19492,6,,,, +US-PA-19493,US,PA,19493,6,,,, +US-PA-19494,US,PA,19494,6,,,, +US-PA-19495,US,PA,19495,6,,,, +US-PA-19496,US,PA,19496,6,,,, +US-PA-19501,US,PA,19501,6,,,, +US-PA-19503,US,PA,19503,6,,,, +US-PA-19504,US,PA,19504,6,,,, +US-PA-19505,US,PA,19505,6,,,, +US-PA-19506,US,PA,19506,6,,,, +US-PA-19507,US,PA,19507,6,,,, +US-PA-19508,US,PA,19508,6,,,, +US-PA-19510,US,PA,19510,6,,,, +US-PA-19511,US,PA,19511,6,,,, +US-PA-19512,US,PA,19512,6,,,, +US-PA-19516,US,PA,19516,6,,,, +US-PA-19518,US,PA,19518,6,,,, +US-PA-19519,US,PA,19519,6,,,, +US-PA-19520,US,PA,19520,6,,,, +US-PA-19522,US,PA,19522,6,,,, +US-PA-19523,US,PA,19523,6,,,, +US-PA-19525,US,PA,19525,6,,,, +US-PA-19526,US,PA,19526,6,,,, +US-PA-19529,US,PA,19529,6,,,, +US-PA-19530,US,PA,19530,6,,,, +US-PA-19533,US,PA,19533,6,,,, +US-PA-19534,US,PA,19534,6,,,, +US-PA-19535,US,PA,19535,6,,,, +US-PA-19536,US,PA,19536,6,,,, +US-PA-19538,US,PA,19538,6,,,, +US-PA-19539,US,PA,19539,6,,,, +US-PA-19540,US,PA,19540,6,,,, +US-PA-19541,US,PA,19541,6,,,, +US-PA-19542,US,PA,19542,6,,,, +US-PA-19543,US,PA,19543,6,,,, +US-PA-19544,US,PA,19544,6,,,, +US-PA-19545,US,PA,19545,6,,,, +US-PA-19547,US,PA,19547,6,,,, +US-PA-19548,US,PA,19548,6,,,, +US-PA-19549,US,PA,19549,6,,,, +US-PA-19550,US,PA,19550,6,,,, +US-PA-19551,US,PA,19551,6,,,, +US-PA-19554,US,PA,19554,6,,,, +US-PA-19555,US,PA,19555,6,,,, +US-PA-19559,US,PA,19559,6,,,, +US-PA-19560,US,PA,19560,6,,,, +US-PA-19562,US,PA,19562,6,,,, +US-PA-19564,US,PA,19564,6,,,, +US-PA-19565,US,PA,19565,6,,,, +US-PA-19567,US,PA,19567,6,,,, +US-PA-19601,US,PA,19601,6,,,, +US-PA-19602,US,PA,19602,6,,,, +US-PA-19603,US,PA,19603,6,,,, +US-PA-19604,US,PA,19604,6,,,, +US-PA-19605,US,PA,19605,6,,,, +US-PA-19606,US,PA,19606,6,,,, +US-PA-19607,US,PA,19607,6,,,, +US-PA-19608,US,PA,19608,6,,,, +US-PA-19609,US,PA,19609,6,,,, +US-PA-19610,US,PA,19610,6,,,, +US-PA-19611,US,PA,19611,6,,,, +US-PA-19612,US,PA,19612,6,,,, +US-PR-00601,US,PR,00601,7,,,, +US-PR-00602,US,PR,00602,7,,,, +US-PR-00603,US,PR,00603,7,,,, +US-PR-00604,US,PR,00604,7,,,, +US-PR-00605,US,PR,00605,7,,,, +US-PR-00606,US,PR,00606,7,,,, +US-PR-00610,US,PR,00610,7,,,, +US-PR-00611,US,PR,00611,7,,,, +US-PR-00612,US,PR,00612,7,,,, +US-PR-00613,US,PR,00613,7,,,, +US-PR-00614,US,PR,00614,7,,,, +US-PR-00616,US,PR,00616,7,,,, +US-PR-00617,US,PR,00617,7,,,, +US-PR-00622,US,PR,00622,7,,,, +US-PR-00623,US,PR,00623,7,,,, +US-PR-00624,US,PR,00624,7,,,, +US-PR-00627,US,PR,00627,7,,,, +US-PR-00631,US,PR,00631,7,,,, +US-PR-00636,US,PR,00636,7,,,, +US-PR-00637,US,PR,00637,7,,,, +US-PR-00638,US,PR,00638,7,,,, +US-PR-00641,US,PR,00641,7,,,, +US-PR-00646,US,PR,00646,7,,,, +US-PR-00647,US,PR,00647,7,,,, +US-PR-00650,US,PR,00650,7,,,, +US-PR-00652,US,PR,00652,7,,,, +US-PR-00653,US,PR,00653,7,,,, +US-PR-00656,US,PR,00656,7,,,, +US-PR-00659,US,PR,00659,7,,,, +US-PR-00660,US,PR,00660,7,,,, +US-PR-00662,US,PR,00662,7,,,, +US-PR-00664,US,PR,00664,7,,,, +US-PR-00667,US,PR,00667,7,,,, +US-PR-00669,US,PR,00669,7,,,, +US-PR-00670,US,PR,00670,7,,,, +US-PR-00674,US,PR,00674,7,,,, +US-PR-00676,US,PR,00676,7,,,, +US-PR-00677,US,PR,00677,7,,,, +US-PR-00678,US,PR,00678,7,,,, +US-PR-00680,US,PR,00680,7,,,, +US-PR-00681,US,PR,00681,7,,,, +US-PR-00682,US,PR,00682,7,,,, +US-PR-00683,US,PR,00683,7,,,, +US-PR-00685,US,PR,00685,7,,,, +US-PR-00687,US,PR,00687,7,,,, +US-PR-00688,US,PR,00688,7,,,, +US-PR-00690,US,PR,00690,7,,,, +US-PR-00692,US,PR,00692,7,,,, +US-PR-00693,US,PR,00693,7,,,, +US-PR-00694,US,PR,00694,7,,,, +US-PR-00698,US,PR,00698,7,,,, +US-PR-00703,US,PR,00703,7,,,, +US-PR-00704,US,PR,00704,7,,,, +US-PR-00705,US,PR,00705,7,,,, +US-PR-00707,US,PR,00707,7,,,, +US-PR-00714,US,PR,00714,7,,,, +US-PR-00715,US,PR,00715,7,,,, +US-PR-00716,US,PR,00716,7,,,, +US-PR-00717,US,PR,00717,7,,,, +US-PR-00718,US,PR,00718,7,,,, +US-PR-00719,US,PR,00719,7,,,, +US-PR-00720,US,PR,00720,7,,,, +US-PR-00721,US,PR,00721,7,,,, +US-PR-00723,US,PR,00723,7,,,, +US-PR-00725,US,PR,00725,7,,,, +US-PR-00726,US,PR,00726,7,,,, +US-PR-00727,US,PR,00727,7,,,, +US-PR-00728,US,PR,00728,7,,,, +US-PR-00729,US,PR,00729,7,,,, +US-PR-00730,US,PR,00730,7,,,, +US-PR-00731,US,PR,00731,7,,,, +US-PR-00732,US,PR,00732,7,,,, +US-PR-00733,US,PR,00733,7,,,, +US-PR-00734,US,PR,00734,7,,,, +US-PR-00735,US,PR,00735,7,,,, +US-PR-00736,US,PR,00736,7,,,, +US-PR-00737,US,PR,00737,7,,,, +US-PR-00738,US,PR,00738,7,,,, +US-PR-00739,US,PR,00739,7,,,, +US-PR-00740,US,PR,00740,7,,,, +US-PR-00741,US,PR,00741,7,,,, +US-PR-00742,US,PR,00742,7,,,, +US-PR-00744,US,PR,00744,7,,,, +US-PR-00745,US,PR,00745,7,,,, +US-PR-00751,US,PR,00751,7,,,, +US-PR-00754,US,PR,00754,7,,,, +US-PR-00757,US,PR,00757,7,,,, +US-PR-00765,US,PR,00765,7,,,, +US-PR-00766,US,PR,00766,7,,,, +US-PR-00767,US,PR,00767,7,,,, +US-PR-00769,US,PR,00769,7,,,, +US-PR-00771,US,PR,00771,7,,,, +US-PR-00772,US,PR,00772,7,,,, +US-PR-00773,US,PR,00773,7,,,, +US-PR-00775,US,PR,00775,7,,,, +US-PR-00777,US,PR,00777,7,,,, +US-PR-00778,US,PR,00778,7,,,, +US-PR-00780,US,PR,00780,7,,,, +US-PR-00782,US,PR,00782,7,,,, +US-PR-00783,US,PR,00783,7,,,, +US-PR-00784,US,PR,00784,7,,,, +US-PR-00785,US,PR,00785,7,,,, +US-PR-00786,US,PR,00786,7,,,, +US-PR-00791,US,PR,00791,7,,,, +US-PR-00792,US,PR,00792,7,,,, +US-PR-00794,US,PR,00794,7,,,, +US-PR-00795,US,PR,00795,7,,,, +US-PR-00901,US,PR,00901,7,,,, +US-PR-00902,US,PR,00902,7,,,, +US-PR-00906,US,PR,00906,7,,,, +US-PR-00907,US,PR,00907,7,,,, +US-PR-00908,US,PR,00908,7,,,, +US-PR-00909,US,PR,00909,7,,,, +US-PR-00910,US,PR,00910,7,,,, +US-PR-00911,US,PR,00911,7,,,, +US-PR-00912,US,PR,00912,7,,,, +US-PR-00913,US,PR,00913,7,,,, +US-PR-00914,US,PR,00914,7,,,, +US-PR-00915,US,PR,00915,7,,,, +US-PR-00916,US,PR,00916,7,,,, +US-PR-00917,US,PR,00917,7,,,, +US-PR-00918,US,PR,00918,7,,,, +US-PR-00919,US,PR,00919,7,,,, +US-PR-00920,US,PR,00920,7,,,, +US-PR-00921,US,PR,00921,7,,,, +US-PR-00922,US,PR,00922,7,,,, +US-PR-00923,US,PR,00923,7,,,, +US-PR-00924,US,PR,00924,7,,,, +US-PR-00925,US,PR,00925,7,,,, +US-PR-00926,US,PR,00926,7,,,, +US-PR-00927,US,PR,00927,7,,,, +US-PR-00928,US,PR,00928,7,,,, +US-PR-00929,US,PR,00929,7,,,, +US-PR-00930,US,PR,00930,7,,,, +US-PR-00931,US,PR,00931,7,,,, +US-PR-00933,US,PR,00933,7,,,, +US-PR-00934,US,PR,00934,7,,,, +US-PR-00935,US,PR,00935,7,,,, +US-PR-00936,US,PR,00936,7,,,, +US-PR-00937,US,PR,00937,7,,,, +US-PR-00939,US,PR,00939,7,,,, +US-PR-00940,US,PR,00940,7,,,, +US-PR-00949,US,PR,00949,7,,,, +US-PR-00950,US,PR,00950,7,,,, +US-PR-00951,US,PR,00951,7,,,, +US-PR-00952,US,PR,00952,7,,,, +US-PR-00953,US,PR,00953,7,,,, +US-PR-00954,US,PR,00954,7,,,, +US-PR-00955,US,PR,00955,7,,,, +US-PR-00956,US,PR,00956,7,,,, +US-PR-00957,US,PR,00957,7,,,, +US-PR-00958,US,PR,00958,7,,,, +US-PR-00959,US,PR,00959,7,,,, +US-PR-00960,US,PR,00960,7,,,, +US-PR-00961,US,PR,00961,7,,,, +US-PR-00962,US,PR,00962,7,,,, +US-PR-00963,US,PR,00963,7,,,, +US-PR-00965,US,PR,00965,7,,,, +US-PR-00966,US,PR,00966,7,,,, +US-PR-00968,US,PR,00968,7,,,, +US-PR-00969,US,PR,00969,7,,,, +US-PR-00970,US,PR,00970,7,,,, +US-PR-00971,US,PR,00971,7,,,, +US-PR-00975,US,PR,00975,7,,,, +US-PR-00976,US,PR,00976,7,,,, +US-PR-00977,US,PR,00977,7,,,, +US-PR-00978,US,PR,00978,7,,,, +US-PR-00979,US,PR,00979,7,,,, +US-PR-00981,US,PR,00981,7,,,, +US-PR-00982,US,PR,00982,7,,,, +US-PR-00983,US,PR,00983,7,,,, +US-PR-00984,US,PR,00984,7,,,, +US-PR-00985,US,PR,00985,7,,,, +US-PR-00986,US,PR,00986,7,,,, +US-PR-00987,US,PR,00987,7,,,, +US-PR-00988,US,PR,00988,7,,,, +US-RI-02801,US,RI,02801,7,,,, +US-RI-02802,US,RI,02802,7,,,, +US-RI-02804,US,RI,02804,7,,,, +US-RI-02806,US,RI,02806,7,,,, +US-RI-02807,US,RI,02807,7,,,, +US-RI-02808,US,RI,02808,7,,,, +US-RI-02809,US,RI,02809,7,,,, +US-RI-02812,US,RI,02812,7,,,, +US-RI-02813,US,RI,02813,7,,,, +US-RI-02814,US,RI,02814,7,,,, +US-RI-02815,US,RI,02815,7,,,, +US-RI-02816,US,RI,02816,7,,,, +US-RI-02817,US,RI,02817,7,,,, +US-RI-02818,US,RI,02818,7,,,, +US-RI-02822,US,RI,02822,7,,,, +US-RI-02823,US,RI,02823,7,,,, +US-RI-02824,US,RI,02824,7,,,, +US-RI-02825,US,RI,02825,7,,,, +US-RI-02826,US,RI,02826,7,,,, +US-RI-02827,US,RI,02827,7,,,, +US-RI-02828,US,RI,02828,7,,,, +US-RI-02829,US,RI,02829,7,,,, +US-RI-02830,US,RI,02830,7,,,, +US-RI-02831,US,RI,02831,7,,,, +US-RI-02832,US,RI,02832,7,,,, +US-RI-02833,US,RI,02833,7,,,, +US-RI-02835,US,RI,02835,7,,,, +US-RI-02836,US,RI,02836,7,,,, +US-RI-02837,US,RI,02837,7,,,, +US-RI-02838,US,RI,02838,7,,,, +US-RI-02839,US,RI,02839,7,,,, +US-RI-02840,US,RI,02840,7,,,, +US-RI-02841,US,RI,02841,7,,,, +US-RI-02842,US,RI,02842,7,,,, +US-RI-02852,US,RI,02852,7,,,, +US-RI-02857,US,RI,02857,7,,,, +US-RI-02858,US,RI,02858,7,,,, +US-RI-02859,US,RI,02859,7,,,, +US-RI-02860,US,RI,02860,7,,,, +US-RI-02861,US,RI,02861,7,,,, +US-RI-02862,US,RI,02862,7,,,, +US-RI-02863,US,RI,02863,7,,,, +US-RI-02864,US,RI,02864,7,,,, +US-RI-02865,US,RI,02865,7,,,, +US-RI-02871,US,RI,02871,7,,,, +US-RI-02872,US,RI,02872,7,,,, +US-RI-02873,US,RI,02873,7,,,, +US-RI-02874,US,RI,02874,7,,,, +US-RI-02875,US,RI,02875,7,,,, +US-RI-02876,US,RI,02876,7,,,, +US-RI-02877,US,RI,02877,7,,,, +US-RI-02878,US,RI,02878,7,,,, +US-RI-02879,US,RI,02879,7,,,, +US-RI-02880,US,RI,02880,7,,,, +US-RI-02881,US,RI,02881,7,,,, +US-RI-02882,US,RI,02882,7,,,, +US-RI-02883,US,RI,02883,7,,,, +US-RI-02885,US,RI,02885,7,,,, +US-RI-02886,US,RI,02886,7,,,, +US-RI-02887,US,RI,02887,7,,,, +US-RI-02888,US,RI,02888,7,,,, +US-RI-02889,US,RI,02889,7,,,, +US-RI-02891,US,RI,02891,7,,,, +US-RI-02892,US,RI,02892,7,,,, +US-RI-02893,US,RI,02893,7,,,, +US-RI-02894,US,RI,02894,7,,,, +US-RI-02895,US,RI,02895,7,,,, +US-RI-02896,US,RI,02896,7,,,, +US-RI-02898,US,RI,02898,7,,,, +US-RI-02901,US,RI,02901,7,,,, +US-RI-02902,US,RI,02902,7,,,, +US-RI-02903,US,RI,02903,7,,,, +US-RI-02904,US,RI,02904,7,,,, +US-RI-02905,US,RI,02905,7,,,, +US-RI-02906,US,RI,02906,7,,,, +US-RI-02907,US,RI,02907,7,,,, +US-RI-02908,US,RI,02908,7,,,, +US-RI-02909,US,RI,02909,7,,,, +US-RI-02910,US,RI,02910,7,,,, +US-RI-02911,US,RI,02911,7,,,, +US-RI-02912,US,RI,02912,7,,,, +US-RI-02914,US,RI,02914,7,,,, +US-RI-02915,US,RI,02915,7,,,, +US-RI-02916,US,RI,02916,7,,,, +US-RI-02917,US,RI,02917,7,,,, +US-RI-02918,US,RI,02918,7,,,, +US-RI-02919,US,RI,02919,7,,,, +US-RI-02920,US,RI,02920,7,,,, +US-RI-02921,US,RI,02921,7,,,, +US-RI-02940,US,RI,02940,7,,,, +US-SC-29001,US,SC,29001,8,,,, +US-SC-29002,US,SC,29002,8,,,, +US-SC-29003,US,SC,29003,8,,,, +US-SC-29006,US,SC,29006,7,,,, +US-SC-29009,US,SC,29009,7,,,, +US-SC-29010,US,SC,29010,8,,,, +US-SC-29014,US,SC,29014,8,,,, +US-SC-29015,US,SC,29015,7,,,, +US-SC-29016,US,SC,29016,8,,,, +US-SC-29018,US,SC,29018,7,,,, +US-SC-29020,US,SC,29020,7,,,, +US-SC-29021,US,SC,29021,7,,,, +US-SC-29030,US,SC,29030,7,,,, +US-SC-29031,US,SC,29031,6,,,, +US-SC-29032,US,SC,29032,7,,,, +US-SC-29033,US,SC,29033,7,,,, +US-SC-29036,US,SC,29036,7,,,, +US-SC-29037,US,SC,29037,7,,,, +US-SC-29038,US,SC,29038,7,,,, +US-SC-29039,US,SC,29039,7,,,, +US-SC-29040,US,SC,29040,8,,,, +US-SC-29041,US,SC,29041,8,,,, +US-SC-29042,US,SC,29042,8,,,, +US-SC-29044,US,SC,29044,8,,,, +US-SC-29045,US,SC,29045,7,,,, +US-SC-29046,US,SC,29046,8,,,, +US-SC-29047,US,SC,29047,7,,,, +US-SC-29048,US,SC,29048,7,,,, +US-SC-29051,US,SC,29051,8,,,, +US-SC-29052,US,SC,29052,8,,,, +US-SC-29053,US,SC,29053,7,,,, +US-SC-29054,US,SC,29054,7,,,, +US-SC-29055,US,SC,29055,8,,,, +US-SC-29056,US,SC,29056,7,,,, +US-SC-29058,US,SC,29058,8,,,, +US-SC-29059,US,SC,29059,7,,,, +US-SC-29061,US,SC,29061,8,,,, +US-SC-29062,US,SC,29062,8,,,, +US-SC-29063,US,SC,29063,8,,,, +US-SC-29065,US,SC,29065,7,,,, +US-SC-29067,US,SC,29067,8,,,, +US-SC-29069,US,SC,29069,8,,,, +US-SC-29070,US,SC,29070,7,,,, +US-SC-29071,US,SC,29071,7,,,, +US-SC-29072,US,SC,29072,7,,,, +US-SC-29073,US,SC,29073,7,,,, +US-SC-29074,US,SC,29074,7,,,, +US-SC-29075,US,SC,29075,7,,,, +US-SC-29078,US,SC,29078,7,,,, +US-SC-29079,US,SC,29079,8,,,, +US-SC-29080,US,SC,29080,8,,,, +US-SC-29081,US,SC,29081,8,,,, +US-SC-29082,US,SC,29082,7,,,, +US-SC-29101,US,SC,29101,8,,,, +US-SC-29102,US,SC,29102,8,,,, +US-SC-29104,US,SC,29104,8,,,, +US-SC-29105,US,SC,29105,7,,,, +US-SC-29107,US,SC,29107,7,,,, +US-SC-29108,US,SC,29108,7,,,, +US-SC-29111,US,SC,29111,8,,,, +US-SC-29112,US,SC,29112,7,,,, +US-SC-29113,US,SC,29113,7,,,, +US-SC-29114,US,SC,29114,8,,,, +US-SC-29115,US,SC,29115,7,,,, +US-SC-29116,US,SC,29116,7,,,, +US-SC-29117,US,SC,29117,7,,,, +US-SC-29118,US,SC,29118,7,,,, +US-SC-29122,US,SC,29122,7,,,, +US-SC-29123,US,SC,29123,7,,,, +US-SC-29125,US,SC,29125,8,,,, +US-SC-29126,US,SC,29126,7,,,, +US-SC-29127,US,SC,29127,7,,,, +US-SC-29128,US,SC,29128,8,,,, +US-SC-29129,US,SC,29129,7,,,, +US-SC-29130,US,SC,29130,7,,,, +US-SC-29132,US,SC,29132,7,,,, +US-SC-29133,US,SC,29133,7,,,, +US-SC-29135,US,SC,29135,7,,,, +US-SC-29137,US,SC,29137,7,,,, +US-SC-29138,US,SC,29138,7,,,, +US-SC-29142,US,SC,29142,7,,,, +US-SC-29143,US,SC,29143,8,,,, +US-SC-29145,US,SC,29145,7,,,, +US-SC-29146,US,SC,29146,7,,,, +US-SC-29147,US,SC,29147,8,,,, +US-SC-29148,US,SC,29148,8,,,, +US-SC-29150,US,SC,29150,8,,,, +US-SC-29151,US,SC,29151,8,,,, +US-SC-29152,US,SC,29152,8,,,, +US-SC-29153,US,SC,29153,8,,,, +US-SC-29154,US,SC,29154,8,,,, +US-SC-29160,US,SC,29160,7,,,, +US-SC-29161,US,SC,29161,8,,,, +US-SC-29162,US,SC,29162,8,,,, +US-SC-29163,US,SC,29163,7,,,, +US-SC-29164,US,SC,29164,7,,,, +US-SC-29166,US,SC,29166,7,,,, +US-SC-29168,US,SC,29168,8,,,, +US-SC-29169,US,SC,29169,7,,,, +US-SC-29170,US,SC,29170,7,,,, +US-SC-29171,US,SC,29171,7,,,, +US-SC-29172,US,SC,29172,7,,,, +US-SC-29175,US,SC,29175,7,,,, +US-SC-29177,US,SC,29177,8,,,, +US-SC-29178,US,SC,29178,7,,,, +US-SC-29180,US,SC,29180,7,,,, +US-SC-29201,US,SC,29201,8,,,, +US-SC-29202,US,SC,29202,8,,,, +US-SC-29203,US,SC,29203,8,,,, +US-SC-29204,US,SC,29204,8,,,, +US-SC-29205,US,SC,29205,8,,,, +US-SC-29206,US,SC,29206,8,,,, +US-SC-29207,US,SC,29207,8,,,, +US-SC-29208,US,SC,29208,8,,,, +US-SC-29209,US,SC,29209,8,,,, +US-SC-29210,US,SC,29210,8,,,, +US-SC-29211,US,SC,29211,8,,,, +US-SC-29212,US,SC,29212,7,,,, +US-SC-29214,US,SC,29214,8,,,, +US-SC-29215,US,SC,29215,8,,,, +US-SC-29216,US,SC,29216,8,,,, +US-SC-29217,US,SC,29217,8,,,, +US-SC-29218,US,SC,29218,8,,,, +US-SC-29219,US,SC,29219,8,,,, +US-SC-29220,US,SC,29220,8,,,, +US-SC-29221,US,SC,29221,8,,,, +US-SC-29222,US,SC,29222,8,,,, +US-SC-29223,US,SC,29223,8,,,, +US-SC-29224,US,SC,29224,8,,,, +US-SC-29225,US,SC,29225,8,,,, +US-SC-29226,US,SC,29226,8,,,, +US-SC-29227,US,SC,29227,8,,,, +US-SC-29228,US,SC,29228,7,,,, +US-SC-29229,US,SC,29229,8,,,, +US-SC-29230,US,SC,29230,8,,,, +US-SC-29240,US,SC,29240,8,,,, +US-SC-29250,US,SC,29250,8,,,, +US-SC-29260,US,SC,29260,8,,,, +US-SC-29290,US,SC,29290,8,,,, +US-SC-29292,US,SC,29292,8,,,, +US-SC-29301,US,SC,29301,6,,,, +US-SC-29302,US,SC,29302,6,,,, +US-SC-29303,US,SC,29303,6,,,, +US-SC-29304,US,SC,29304,6,,,, +US-SC-29305,US,SC,29305,6,,,, +US-SC-29306,US,SC,29306,6,,,, +US-SC-29307,US,SC,29307,6,,,, +US-SC-29316,US,SC,29316,6,,,, +US-SC-29319,US,SC,29319,6,,,, +US-SC-29320,US,SC,29320,6,,,, +US-SC-29321,US,SC,29321,6,,,, +US-SC-29322,US,SC,29322,6,,,, +US-SC-29323,US,SC,29323,6,,,, +US-SC-29324,US,SC,29324,6,,,, +US-SC-29325,US,SC,29325,7,,,, +US-SC-29329,US,SC,29329,6,,,, +US-SC-29330,US,SC,29330,6,,,, +US-SC-29331,US,SC,29331,6,,,, +US-SC-29332,US,SC,29332,7,,,, +US-SC-29333,US,SC,29333,6,,,, +US-SC-29334,US,SC,29334,6,,,, +US-SC-29335,US,SC,29335,6,,,, +US-SC-29336,US,SC,29336,6,,,, +US-SC-29338,US,SC,29338,6,,,, +US-SC-29340,US,SC,29340,8,,,, +US-SC-29341,US,SC,29341,8,,,, +US-SC-29342,US,SC,29342,8,,,, +US-SC-29346,US,SC,29346,6,,,, +US-SC-29348,US,SC,29348,6,,,, +US-SC-29349,US,SC,29349,6,,,, +US-SC-29351,US,SC,29351,7,,,, +US-SC-29353,US,SC,29353,6,,,, +US-SC-29355,US,SC,29355,7,,,, +US-SC-29356,US,SC,29356,6,,,, +US-SC-29360,US,SC,29360,7,,,, +US-SC-29364,US,SC,29364,6,,,, +US-SC-29365,US,SC,29365,6,,,, +US-SC-29368,US,SC,29368,6,,,, +US-SC-29369,US,SC,29369,6,,,, +US-SC-29370,US,SC,29370,7,,,, +US-SC-29372,US,SC,29372,6,,,, +US-SC-29373,US,SC,29373,6,,,, +US-SC-29374,US,SC,29374,6,,,, +US-SC-29375,US,SC,29375,6,,,, +US-SC-29376,US,SC,29376,6,,,, +US-SC-29377,US,SC,29377,6,,,, +US-SC-29378,US,SC,29378,6,,,, +US-SC-29379,US,SC,29379,6,,,, +US-SC-29384,US,SC,29384,7,,,, +US-SC-29385,US,SC,29385,6,,,, +US-SC-29386,US,SC,29386,6,,,, +US-SC-29388,US,SC,29388,6,,,, +US-SC-29395,US,SC,29395,6,,,, +US-SC-29401,US,SC,29401,8.5,,,, +US-SC-29402,US,SC,29402,8.5,,,, +US-SC-29403,US,SC,29403,8.5,,,, +US-SC-29404,US,SC,29404,8.5,,,, +US-SC-29405,US,SC,29405,8.5,,,, +US-SC-29406,US,SC,29406,8.5,,,, +US-SC-29407,US,SC,29407,8.5,,,, +US-SC-29409,US,SC,29409,8.5,,,, +US-SC-29410,US,SC,29410,8,,,, +US-SC-29412,US,SC,29412,8.5,,,, +US-SC-29413,US,SC,29413,8.5,,,, +US-SC-29414,US,SC,29414,8.5,,,, +US-SC-29415,US,SC,29415,8.5,,,, +US-SC-29416,US,SC,29416,8.5,,,, +US-SC-29417,US,SC,29417,8.5,,,, +US-SC-29418,US,SC,29418,8.5,,,, +US-SC-29419,US,SC,29419,8.5,,,, +US-SC-29420,US,SC,29420,7,,,, +US-SC-29422,US,SC,29422,8.5,,,, +US-SC-29423,US,SC,29423,8.5,,,, +US-SC-29424,US,SC,29424,8.5,,,, +US-SC-29425,US,SC,29425,8.5,,,, +US-SC-29426,US,SC,29426,8.5,,,, +US-SC-29429,US,SC,29429,8.5,,,, +US-SC-29430,US,SC,29430,8,,,, +US-SC-29431,US,SC,29431,8,,,, +US-SC-29432,US,SC,29432,7,,,, +US-SC-29433,US,SC,29433,7,,,, +US-SC-29434,US,SC,29434,8,,,, +US-SC-29435,US,SC,29435,7,,,, +US-SC-29436,US,SC,29436,8,,,, +US-SC-29437,US,SC,29437,7,,,, +US-SC-29438,US,SC,29438,8.5,,,, +US-SC-29439,US,SC,29439,8.5,,,, +US-SC-29440,US,SC,29440,6,,,, +US-SC-29442,US,SC,29442,6,,,, +US-SC-29445,US,SC,29445,8,,,, +US-SC-29446,US,SC,29446,7,,,, +US-SC-29447,US,SC,29447,7,,,, +US-SC-29448,US,SC,29448,7,,,, +US-SC-29449,US,SC,29449,8.5,,,, +US-SC-29450,US,SC,29450,8,,,, +US-SC-29451,US,SC,29451,8.5,,,, +US-SC-29452,US,SC,29452,7,,,, +US-SC-29453,US,SC,29453,8,,,, +US-SC-29455,US,SC,29455,8.5,,,, +US-SC-29456,US,SC,29456,7,,,, +US-SC-29457,US,SC,29457,8.5,,,, +US-SC-29458,US,SC,29458,8.5,,,, +US-SC-29461,US,SC,29461,8,,,, +US-SC-29464,US,SC,29464,8.5,,,, +US-SC-29465,US,SC,29465,8.5,,,, +US-SC-29466,US,SC,29466,8.5,,,, +US-SC-29468,US,SC,29468,8,,,, +US-SC-29469,US,SC,29469,8,,,, +US-SC-29470,US,SC,29470,8.5,,,, +US-SC-29471,US,SC,29471,7,,,, +US-SC-29472,US,SC,29472,7,,,, +US-SC-29474,US,SC,29474,7,,,, +US-SC-29475,US,SC,29475,7,,,, +US-SC-29476,US,SC,29476,8,,,, +US-SC-29477,US,SC,29477,7,,,, +US-SC-29479,US,SC,29479,8,,,, +US-SC-29481,US,SC,29481,7,,,, +US-SC-29482,US,SC,29482,8.5,,,, +US-SC-29483,US,SC,29483,7,,,, +US-SC-29484,US,SC,29484,7,,,, +US-SC-29485,US,SC,29485,7,,,, +US-SC-29487,US,SC,29487,8.5,,,, +US-SC-29488,US,SC,29488,7,,,, +US-SC-29492,US,SC,29492,8,,,, +US-SC-29493,US,SC,29493,7,,,, +US-SC-29501,US,SC,29501,8,,,, +US-SC-29502,US,SC,29502,8,,,, +US-SC-29503,US,SC,29503,8,,,, +US-SC-29504,US,SC,29504,8,,,, +US-SC-29505,US,SC,29505,8,,,, +US-SC-29506,US,SC,29506,8,,,, +US-SC-29510,US,SC,29510,6,,,, +US-SC-29511,US,SC,29511,8,,,, +US-SC-29512,US,SC,29512,8,,,, +US-SC-29516,US,SC,29516,8,,,, +US-SC-29518,US,SC,29518,7,,,, +US-SC-29519,US,SC,29519,8,,,, +US-SC-29520,US,SC,29520,8,,,, +US-SC-29525,US,SC,29525,8,,,, +US-SC-29526,US,SC,29526,8,,,, +US-SC-29527,US,SC,29527,8,,,, +US-SC-29528,US,SC,29528,8,,,, +US-SC-29530,US,SC,29530,8,,,, +US-SC-29532,US,SC,29532,8,,,, +US-SC-29536,US,SC,29536,8,,,, +US-SC-29540,US,SC,29540,8,,,, +US-SC-29541,US,SC,29541,8,,,, +US-SC-29543,US,SC,29543,8,,,, +US-SC-29544,US,SC,29544,8,,,, +US-SC-29545,US,SC,29545,8,,,, +US-SC-29546,US,SC,29546,8,,,, +US-SC-29547,US,SC,29547,8,,,, +US-SC-29550,US,SC,29550,8,,,, +US-SC-29551,US,SC,29551,8,,,, +US-SC-29554,US,SC,29554,6,,,, +US-SC-29555,US,SC,29555,8,,,, +US-SC-29556,US,SC,29556,7,,,, +US-SC-29560,US,SC,29560,8,,,, +US-SC-29563,US,SC,29563,8,,,, +US-SC-29564,US,SC,29564,7,,,, +US-SC-29565,US,SC,29565,8,,,, +US-SC-29566,US,SC,29566,8,,,, +US-SC-29567,US,SC,29567,8,,,, +US-SC-29568,US,SC,29568,8,,,, +US-SC-29569,US,SC,29569,8,,,, +US-SC-29570,US,SC,29570,8,,,, +US-SC-29571,US,SC,29571,8,,,, +US-SC-29572,US,SC,29572,9,,,, +US-SC-29574,US,SC,29574,8,,,, +US-SC-29575,US,SC,29575,8,,,, +US-SC-29576,US,SC,29576,8,,,, +US-SC-29577,US,SC,29577,9,,,, +US-SC-29578,US,SC,29578,9,,,, +US-SC-29579,US,SC,29579,8,,,, +US-SC-29580,US,SC,29580,7,,,, +US-SC-29581,US,SC,29581,8,,,, +US-SC-29582,US,SC,29582,8,,,, +US-SC-29583,US,SC,29583,8,,,, +US-SC-29584,US,SC,29584,8,,,, +US-SC-29585,US,SC,29585,6,,,, +US-SC-29587,US,SC,29587,8,,,, +US-SC-29588,US,SC,29588,8,,,, +US-SC-29589,US,SC,29589,8,,,, +US-SC-29590,US,SC,29590,7,,,, +US-SC-29591,US,SC,29591,8,,,, +US-SC-29592,US,SC,29592,8,,,, +US-SC-29593,US,SC,29593,8,,,, +US-SC-29594,US,SC,29594,8,,,, +US-SC-29596,US,SC,29596,8,,,, +US-SC-29597,US,SC,29597,8,,,, +US-SC-29598,US,SC,29598,8,,,, +US-SC-29601,US,SC,29601,6,,,, +US-SC-29602,US,SC,29602,6,,,, +US-SC-29603,US,SC,29603,6,,,, +US-SC-29604,US,SC,29604,6,,,, +US-SC-29605,US,SC,29605,6,,,, +US-SC-29606,US,SC,29606,6,,,, +US-SC-29607,US,SC,29607,6,,,, +US-SC-29608,US,SC,29608,6,,,, +US-SC-29609,US,SC,29609,6,,,, +US-SC-29610,US,SC,29610,6,,,, +US-SC-29611,US,SC,29611,6,,,, +US-SC-29612,US,SC,29612,6,,,, +US-SC-29613,US,SC,29613,6,,,, +US-SC-29614,US,SC,29614,6,,,, +US-SC-29615,US,SC,29615,6,,,, +US-SC-29616,US,SC,29616,6,,,, +US-SC-29617,US,SC,29617,6,,,, +US-SC-29620,US,SC,29620,7,,,, +US-SC-29621,US,SC,29621,6,,,, +US-SC-29622,US,SC,29622,6,,,, +US-SC-29623,US,SC,29623,6,,,, +US-SC-29624,US,SC,29624,6,,,, +US-SC-29625,US,SC,29625,6,,,, +US-SC-29626,US,SC,29626,6,,,, +US-SC-29627,US,SC,29627,6,,,, +US-SC-29628,US,SC,29628,7,,,, +US-SC-29630,US,SC,29630,7,,,, +US-SC-29631,US,SC,29631,7,,,, +US-SC-29632,US,SC,29632,7,,,, +US-SC-29633,US,SC,29633,7,,,, +US-SC-29634,US,SC,29634,7,,,, +US-SC-29635,US,SC,29635,6,,,, +US-SC-29636,US,SC,29636,6,,,, +US-SC-29638,US,SC,29638,7,,,, +US-SC-29639,US,SC,29639,7,,,, +US-SC-29640,US,SC,29640,7,,,, +US-SC-29641,US,SC,29641,7,,,, +US-SC-29642,US,SC,29642,7,,,, +US-SC-29643,US,SC,29643,6,,,, +US-SC-29644,US,SC,29644,7,,,, +US-SC-29645,US,SC,29645,7,,,, +US-SC-29646,US,SC,29646,6,,,, +US-SC-29647,US,SC,29647,6,,,, +US-SC-29648,US,SC,29648,6,,,, +US-SC-29649,US,SC,29649,6,,,, +US-SC-29650,US,SC,29650,6,,,, +US-SC-29651,US,SC,29651,6,,,, +US-SC-29652,US,SC,29652,6,,,, +US-SC-29653,US,SC,29653,6,,,, +US-SC-29654,US,SC,29654,6,,,, +US-SC-29655,US,SC,29655,6,,,, +US-SC-29656,US,SC,29656,6,,,, +US-SC-29657,US,SC,29657,7,,,, +US-SC-29658,US,SC,29658,6,,,, +US-SC-29659,US,SC,29659,7,,,, +US-SC-29661,US,SC,29661,6,,,, +US-SC-29662,US,SC,29662,6,,,, +US-SC-29664,US,SC,29664,6,,,, +US-SC-29665,US,SC,29665,6,,,, +US-SC-29666,US,SC,29666,6,,,, +US-SC-29667,US,SC,29667,7,,,, +US-SC-29669,US,SC,29669,6,,,, +US-SC-29670,US,SC,29670,6,,,, +US-SC-29671,US,SC,29671,7,,,, +US-SC-29672,US,SC,29672,6,,,, +US-SC-29673,US,SC,29673,6,,,, +US-SC-29675,US,SC,29675,6,,,, +US-SC-29676,US,SC,29676,6,,,, +US-SC-29677,US,SC,29677,6,,,, +US-SC-29678,US,SC,29678,6,,,, +US-SC-29679,US,SC,29679,6,,,, +US-SC-29680,US,SC,29680,6,,,, +US-SC-29681,US,SC,29681,6,,,, +US-SC-29682,US,SC,29682,7,,,, +US-SC-29683,US,SC,29683,6,,,, +US-SC-29684,US,SC,29684,6,,,, +US-SC-29685,US,SC,29685,7,,,, +US-SC-29686,US,SC,29686,6,,,, +US-SC-29687,US,SC,29687,6,,,, +US-SC-29688,US,SC,29688,6,,,, +US-SC-29689,US,SC,29689,6,,,, +US-SC-29690,US,SC,29690,6,,,, +US-SC-29691,US,SC,29691,6,,,, +US-SC-29692,US,SC,29692,7,,,, +US-SC-29693,US,SC,29693,6,,,, +US-SC-29696,US,SC,29696,6,,,, +US-SC-29697,US,SC,29697,6,,,, +US-SC-29702,US,SC,29702,8,,,, +US-SC-29703,US,SC,29703,7,,,, +US-SC-29704,US,SC,29704,7,,,, +US-SC-29706,US,SC,29706,8,,,, +US-SC-29707,US,SC,29707,8,,,, +US-SC-29708,US,SC,29708,7,,,, +US-SC-29709,US,SC,29709,8,,,, +US-SC-29710,US,SC,29710,7,,,, +US-SC-29712,US,SC,29712,8,,,, +US-SC-29714,US,SC,29714,8,,,, +US-SC-29715,US,SC,29715,7,,,, +US-SC-29716,US,SC,29716,7,,,, +US-SC-29717,US,SC,29717,7,,,, +US-SC-29718,US,SC,29718,8,,,, +US-SC-29720,US,SC,29720,8,,,, +US-SC-29721,US,SC,29721,8,,,, +US-SC-29722,US,SC,29722,8,,,, +US-SC-29724,US,SC,29724,8,,,, +US-SC-29726,US,SC,29726,7,,,, +US-SC-29727,US,SC,29727,8,,,, +US-SC-29728,US,SC,29728,8,,,, +US-SC-29729,US,SC,29729,8,,,, +US-SC-29730,US,SC,29730,7,,,, +US-SC-29731,US,SC,29731,7,,,, +US-SC-29732,US,SC,29732,7,,,, +US-SC-29733,US,SC,29733,7,,,, +US-SC-29734,US,SC,29734,7,,,, +US-SC-29741,US,SC,29741,8,,,, +US-SC-29742,US,SC,29742,7,,,, +US-SC-29743,US,SC,29743,7,,,, +US-SC-29744,US,SC,29744,8,,,, +US-SC-29745,US,SC,29745,7,,,, +US-SC-29801,US,SC,29801,7,,,, +US-SC-29802,US,SC,29802,7,,,, +US-SC-29803,US,SC,29803,7,,,, +US-SC-29804,US,SC,29804,7,,,, +US-SC-29805,US,SC,29805,7,,,, +US-SC-29808,US,SC,29808,7,,,, +US-SC-29809,US,SC,29809,7,,,, +US-SC-29810,US,SC,29810,8,,,, +US-SC-29812,US,SC,29812,7,,,, +US-SC-29813,US,SC,29813,7,,,, +US-SC-29816,US,SC,29816,7,,,, +US-SC-29817,US,SC,29817,7,,,, +US-SC-29819,US,SC,29819,6,,,, +US-SC-29821,US,SC,29821,7,,,, +US-SC-29822,US,SC,29822,7,,,, +US-SC-29824,US,SC,29824,7,,,, +US-SC-29826,US,SC,29826,7,,,, +US-SC-29827,US,SC,29827,8,,,, +US-SC-29828,US,SC,29828,7,,,, +US-SC-29829,US,SC,29829,7,,,, +US-SC-29831,US,SC,29831,7,,,, +US-SC-29832,US,SC,29832,7,,,, +US-SC-29834,US,SC,29834,7,,,, +US-SC-29835,US,SC,29835,7,,,, +US-SC-29836,US,SC,29836,8,,,, +US-SC-29838,US,SC,29838,7,,,, +US-SC-29839,US,SC,29839,7,,,, +US-SC-29840,US,SC,29840,7,,,, +US-SC-29841,US,SC,29841,7,,,, +US-SC-29842,US,SC,29842,7,,,, +US-SC-29843,US,SC,29843,8,,,, +US-SC-29844,US,SC,29844,8,,,, +US-SC-29845,US,SC,29845,7,,,, +US-SC-29846,US,SC,29846,8,,,, +US-SC-29847,US,SC,29847,7,,,, +US-SC-29848,US,SC,29848,7,,,, +US-SC-29849,US,SC,29849,8,,,, +US-SC-29850,US,SC,29850,7,,,, +US-SC-29851,US,SC,29851,7,,,, +US-SC-29853,US,SC,29853,7,,,, +US-SC-29856,US,SC,29856,7,,,, +US-SC-29860,US,SC,29860,7,,,, +US-SC-29861,US,SC,29861,7,,,, +US-SC-29899,US,SC,29899,8,,,, +US-SC-29901,US,SC,29901,6,,,, +US-SC-29902,US,SC,29902,6,,,, +US-SC-29903,US,SC,29903,6,,,, +US-SC-29904,US,SC,29904,6,,,, +US-SC-29905,US,SC,29905,6,,,, +US-SC-29906,US,SC,29906,6,,,, +US-SC-29907,US,SC,29907,6,,,, +US-SC-29909,US,SC,29909,6,,,, +US-SC-29910,US,SC,29910,6,,,, +US-SC-29911,US,SC,29911,8,,,, +US-SC-29912,US,SC,29912,8,,,, +US-SC-29913,US,SC,29913,8,,,, +US-SC-29914,US,SC,29914,6,,,, +US-SC-29915,US,SC,29915,6,,,, +US-SC-29916,US,SC,29916,8,,,, +US-SC-29918,US,SC,29918,8,,,, +US-SC-29920,US,SC,29920,6,,,, +US-SC-29921,US,SC,29921,8,,,, +US-SC-29922,US,SC,29922,8,,,, +US-SC-29923,US,SC,29923,8,,,, +US-SC-29924,US,SC,29924,8,,,, +US-SC-29925,US,SC,29925,6,,,, +US-SC-29926,US,SC,29926,6,,,, +US-SC-29927,US,SC,29927,8,,,, +US-SC-29928,US,SC,29928,6,,,, +US-SC-29929,US,SC,29929,7,,,, +US-SC-29931,US,SC,29931,6,,,, +US-SC-29932,US,SC,29932,8,,,, +US-SC-29933,US,SC,29933,8,,,, +US-SC-29934,US,SC,29934,8,,,, +US-SC-29935,US,SC,29935,6,,,, +US-SC-29936,US,SC,29936,8,,,, +US-SC-29938,US,SC,29938,6,,,, +US-SC-29939,US,SC,29939,8,,,, +US-SC-29940,US,SC,29940,6,,,, +US-SC-29941,US,SC,29941,6,,,, +US-SC-29943,US,SC,29943,8,,,, +US-SC-29944,US,SC,29944,8,,,, +US-SC-29945,US,SC,29945,7,,,, +US-SD-57001,US,SD,57001,4,,,, +US-SD-57002,US,SD,57002,4,,,, +US-SD-57003,US,SD,57003,4,,,, +US-SD-57004,US,SD,57004,6,,,, +US-SD-57005,US,SD,57005,6,,,, +US-SD-57006,US,SD,57006,6,,,, +US-SD-57007,US,SD,57007,6,,,, +US-SD-57010,US,SD,57010,4,,,, +US-SD-57012,US,SD,57012,4,,,, +US-SD-57013,US,SD,57013,6,,,, +US-SD-57014,US,SD,57014,4,,,, +US-SD-57015,US,SD,57015,4,,,, +US-SD-57016,US,SD,57016,4,,,, +US-SD-57017,US,SD,57017,4,,,, +US-SD-57018,US,SD,57018,4,,,, +US-SD-57020,US,SD,57020,6,,,, +US-SD-57021,US,SD,57021,4,,,, +US-SD-57022,US,SD,57022,6,,,, +US-SD-57024,US,SD,57024,6,,,, +US-SD-57025,US,SD,57025,6,,,, +US-SD-57026,US,SD,57026,4,,,, +US-SD-57027,US,SD,57027,4,,,, +US-SD-57028,US,SD,57028,6,,,, +US-SD-57029,US,SD,57029,6,,,, +US-SD-57030,US,SD,57030,4,,,, +US-SD-57031,US,SD,57031,4,,,, +US-SD-57032,US,SD,57032,6,,,, +US-SD-57033,US,SD,57033,6,,,, +US-SD-57034,US,SD,57034,4,,,, +US-SD-57035,US,SD,57035,6,,,, +US-SD-57036,US,SD,57036,4,,,, +US-SD-57037,US,SD,57037,4,,,, +US-SD-57038,US,SD,57038,4,,,, +US-SD-57039,US,SD,57039,6,,,, +US-SD-57040,US,SD,57040,4,,,, +US-SD-57041,US,SD,57041,4,,,, +US-SD-57042,US,SD,57042,6,,,, +US-SD-57043,US,SD,57043,4,,,, +US-SD-57045,US,SD,57045,4,,,, +US-SD-57046,US,SD,57046,4,,,, +US-SD-57047,US,SD,57047,6,,,, +US-SD-57048,US,SD,57048,4,,,, +US-SD-57049,US,SD,57049,6,,,, +US-SD-57050,US,SD,57050,4,,,, +US-SD-57051,US,SD,57051,4,,,, +US-SD-57052,US,SD,57052,4,,,, +US-SD-57053,US,SD,57053,4,,,, +US-SD-57054,US,SD,57054,4,,,, +US-SD-57055,US,SD,57055,4,,,, +US-SD-57057,US,SD,57057,4,,,, +US-SD-57058,US,SD,57058,6,,,, +US-SD-57059,US,SD,57059,6,,,, +US-SD-57061,US,SD,57061,4,,,, +US-SD-57062,US,SD,57062,6,,,, +US-SD-57063,US,SD,57063,4,,,, +US-SD-57064,US,SD,57064,6,,,, +US-SD-57065,US,SD,57065,4,,,, +US-SD-57066,US,SD,57066,6,,,, +US-SD-57067,US,SD,57067,4,,,, +US-SD-57068,US,SD,57068,6,,,, +US-SD-57069,US,SD,57069,6,,,, +US-SD-57070,US,SD,57070,4,,,, +US-SD-57071,US,SD,57071,6,,,, +US-SD-57072,US,SD,57072,4,,,, +US-SD-57073,US,SD,57073,4,,,, +US-SD-57075,US,SD,57075,4,,,, +US-SD-57076,US,SD,57076,4,,,, +US-SD-57077,US,SD,57077,4,,,, +US-SD-57078,US,SD,57078,6,,,, +US-SD-57101,US,SD,57101,6,,,, +US-SD-57103,US,SD,57103,6,,,, +US-SD-57104,US,SD,57104,6,,,, +US-SD-57105,US,SD,57105,6,,,, +US-SD-57106,US,SD,57106,6,,,, +US-SD-57107,US,SD,57107,6,,,, +US-SD-57108,US,SD,57108,6,,,, +US-SD-57109,US,SD,57109,6,,,, +US-SD-57110,US,SD,57110,6,,,, +US-SD-57117,US,SD,57117,6,,,, +US-SD-57118,US,SD,57118,6,,,, +US-SD-57186,US,SD,57186,6,,,, +US-SD-57193,US,SD,57193,6,,,, +US-SD-57197,US,SD,57197,6,,,, +US-SD-57198,US,SD,57198,6,,,, +US-SD-57201,US,SD,57201,6,,,, +US-SD-57212,US,SD,57212,4,,,, +US-SD-57213,US,SD,57213,4,,,, +US-SD-57214,US,SD,57214,6,,,, +US-SD-57216,US,SD,57216,6,,,, +US-SD-57217,US,SD,57217,4,,,, +US-SD-57218,US,SD,57218,4,,,, +US-SD-57219,US,SD,57219,4,,,, +US-SD-57220,US,SD,57220,4,,,, +US-SD-57221,US,SD,57221,4,,,, +US-SD-57223,US,SD,57223,4,,,, +US-SD-57224,US,SD,57224,4,,,, +US-SD-57225,US,SD,57225,6,,,, +US-SD-57226,US,SD,57226,4,,,, +US-SD-57227,US,SD,57227,4,,,, +US-SD-57231,US,SD,57231,6,,,, +US-SD-57232,US,SD,57232,4,,,, +US-SD-57233,US,SD,57233,4,,,, +US-SD-57234,US,SD,57234,6,,,, +US-SD-57235,US,SD,57235,4,,,, +US-SD-57236,US,SD,57236,4,,,, +US-SD-57237,US,SD,57237,4,,,, +US-SD-57238,US,SD,57238,4,,,, +US-SD-57239,US,SD,57239,4,,,, +US-SD-57241,US,SD,57241,4,,,, +US-SD-57242,US,SD,57242,4,,,, +US-SD-57243,US,SD,57243,4,,,, +US-SD-57245,US,SD,57245,6,,,, +US-SD-57246,US,SD,57246,4,,,, +US-SD-57247,US,SD,57247,4,,,, +US-SD-57248,US,SD,57248,4,,,, +US-SD-57249,US,SD,57249,6,,,, +US-SD-57251,US,SD,57251,4,,,, +US-SD-57252,US,SD,57252,6,,,, +US-SD-57255,US,SD,57255,4,,,, +US-SD-57256,US,SD,57256,4,,,, +US-SD-57257,US,SD,57257,4,,,, +US-SD-57258,US,SD,57258,4,,,, +US-SD-57259,US,SD,57259,5,,,, +US-SD-57260,US,SD,57260,4,,,, +US-SD-57261,US,SD,57261,4,,,, +US-SD-57262,US,SD,57262,6,,,, +US-SD-57263,US,SD,57263,4,,,, +US-SD-57264,US,SD,57264,4,,,, +US-SD-57265,US,SD,57265,4,,,, +US-SD-57266,US,SD,57266,4,,,, +US-SD-57268,US,SD,57268,4,,,, +US-SD-57269,US,SD,57269,4,,,, +US-SD-57270,US,SD,57270,4,,,, +US-SD-57271,US,SD,57271,4,,,, +US-SD-57272,US,SD,57272,4,,,, +US-SD-57273,US,SD,57273,4,,,, +US-SD-57274,US,SD,57274,6,,,, +US-SD-57276,US,SD,57276,4,,,, +US-SD-57278,US,SD,57278,4,,,, +US-SD-57279,US,SD,57279,4,,,, +US-SD-57301,US,SD,57301,6,,,, +US-SD-57311,US,SD,57311,4,,,, +US-SD-57312,US,SD,57312,4,,,, +US-SD-57313,US,SD,57313,4,,,, +US-SD-57314,US,SD,57314,4,,,, +US-SD-57315,US,SD,57315,4,,,, +US-SD-57317,US,SD,57317,4,,,, +US-SD-57319,US,SD,57319,4,,,, +US-SD-57321,US,SD,57321,4,,,, +US-SD-57322,US,SD,57322,4,,,, +US-SD-57323,US,SD,57323,6,,,, +US-SD-57324,US,SD,57324,4,,,, +US-SD-57325,US,SD,57325,6,,,, +US-SD-57326,US,SD,57326,6,,,, +US-SD-57328,US,SD,57328,4,,,, +US-SD-57329,US,SD,57329,4,,,, +US-SD-57330,US,SD,57330,4,,,, +US-SD-57331,US,SD,57331,4,,,, +US-SD-57332,US,SD,57332,4,,,, +US-SD-57334,US,SD,57334,4,,,, +US-SD-57335,US,SD,57335,4,,,, +US-SD-57337,US,SD,57337,4,,,, +US-SD-57339,US,SD,57339,4,,,, +US-SD-57340,US,SD,57340,4,,,, +US-SD-57341,US,SD,57341,4,,,, +US-SD-57342,US,SD,57342,4,,,, +US-SD-57344,US,SD,57344,4,,,, +US-SD-57345,US,SD,57345,4,,,, +US-SD-57346,US,SD,57346,6,,,, +US-SD-57348,US,SD,57348,4,,,, +US-SD-57349,US,SD,57349,4,,,, +US-SD-57350,US,SD,57350,6,,,, +US-SD-57353,US,SD,57353,4,,,, +US-SD-57354,US,SD,57354,4,,,, +US-SD-57355,US,SD,57355,4,,,, +US-SD-57356,US,SD,57356,4,,,, +US-SD-57358,US,SD,57358,6,,,, +US-SD-57359,US,SD,57359,4,,,, +US-SD-57361,US,SD,57361,6,,,, +US-SD-57362,US,SD,57362,6,,,, +US-SD-57363,US,SD,57363,4,,,, +US-SD-57364,US,SD,57364,4,,,, +US-SD-57365,US,SD,57365,6,,,, +US-SD-57366,US,SD,57366,6,,,, +US-SD-57367,US,SD,57367,6,,,, +US-SD-57368,US,SD,57368,4,,,, +US-SD-57369,US,SD,57369,4,,,, +US-SD-57370,US,SD,57370,4,,,, +US-SD-57371,US,SD,57371,4,,,, +US-SD-57373,US,SD,57373,4,,,, +US-SD-57374,US,SD,57374,4,,,, +US-SD-57375,US,SD,57375,4,,,, +US-SD-57376,US,SD,57376,4,,,, +US-SD-57379,US,SD,57379,4,,,, +US-SD-57380,US,SD,57380,4,,,, +US-SD-57381,US,SD,57381,4,,,, +US-SD-57382,US,SD,57382,6,,,, +US-SD-57383,US,SD,57383,4,,,, +US-SD-57384,US,SD,57384,4,,,, +US-SD-57385,US,SD,57385,4,,,, +US-SD-57386,US,SD,57386,5,,,, +US-SD-57399,US,SD,57399,6,,,, +US-SD-57401,US,SD,57401,6,,,, +US-SD-57402,US,SD,57402,6,,,, +US-SD-57420,US,SD,57420,6,,,, +US-SD-57421,US,SD,57421,4,,,, +US-SD-57422,US,SD,57422,4,,,, +US-SD-57424,US,SD,57424,4,,,, +US-SD-57426,US,SD,57426,4,,,, +US-SD-57427,US,SD,57427,4,,,, +US-SD-57428,US,SD,57428,4,,,, +US-SD-57429,US,SD,57429,4,,,, +US-SD-57430,US,SD,57430,4,,,, +US-SD-57432,US,SD,57432,4,,,, +US-SD-57433,US,SD,57433,4,,,, +US-SD-57434,US,SD,57434,4,,,, +US-SD-57435,US,SD,57435,4,,,, +US-SD-57436,US,SD,57436,4,,,, +US-SD-57437,US,SD,57437,4,,,, +US-SD-57438,US,SD,57438,6,,,, +US-SD-57439,US,SD,57439,6,,,, +US-SD-57440,US,SD,57440,4,,,, +US-SD-57441,US,SD,57441,4,,,, +US-SD-57442,US,SD,57442,6,,,, +US-SD-57445,US,SD,57445,6,,,, +US-SD-57446,US,SD,57446,4,,,, +US-SD-57448,US,SD,57448,6,,,, +US-SD-57449,US,SD,57449,4,,,, +US-SD-57450,US,SD,57450,4,,,, +US-SD-57451,US,SD,57451,4,,,, +US-SD-57452,US,SD,57452,4,,,, +US-SD-57454,US,SD,57454,4,,,, +US-SD-57455,US,SD,57455,4,,,, +US-SD-57456,US,SD,57456,4,,,, +US-SD-57457,US,SD,57457,4,,,, +US-SD-57460,US,SD,57460,4,,,, +US-SD-57461,US,SD,57461,4,,,, +US-SD-57465,US,SD,57465,4,,,, +US-SD-57466,US,SD,57466,4,,,, +US-SD-57467,US,SD,57467,4,,,, +US-SD-57468,US,SD,57468,4,,,, +US-SD-57469,US,SD,57469,6,,,, +US-SD-57470,US,SD,57470,4,,,, +US-SD-57471,US,SD,57471,4,,,, +US-SD-57472,US,SD,57472,4,,,, +US-SD-57473,US,SD,57473,4,,,, +US-SD-57474,US,SD,57474,4,,,, +US-SD-57475,US,SD,57475,4,,,, +US-SD-57476,US,SD,57476,4,,,, +US-SD-57477,US,SD,57477,4,,,, +US-SD-57479,US,SD,57479,4,,,, +US-SD-57481,US,SD,57481,4,,,, +US-SD-57501,US,SD,57501,6,,,, +US-SD-57520,US,SD,57520,4,,,, +US-SD-57521,US,SD,57521,6,,,, +US-SD-57522,US,SD,57522,5,,,, +US-SD-57523,US,SD,57523,6,,,, +US-SD-57528,US,SD,57528,4,,,, +US-SD-57529,US,SD,57529,4,,,, +US-SD-57531,US,SD,57531,4,,,, +US-SD-57532,US,SD,57532,6,,,, +US-SD-57533,US,SD,57533,6,,,, +US-SD-57534,US,SD,57534,4,,,, +US-SD-57536,US,SD,57536,4,,,, +US-SD-57537,US,SD,57537,4,,,, +US-SD-57538,US,SD,57538,4,,,, +US-SD-57540,US,SD,57540,4,,,, +US-SD-57541,US,SD,57541,4,,,, +US-SD-57543,US,SD,57543,6,,,, +US-SD-57544,US,SD,57544,6,,,, +US-SD-57547,US,SD,57547,4,,,, +US-SD-57548,US,SD,57548,4,,,, +US-SD-57551,US,SD,57551,4,,,, +US-SD-57552,US,SD,57552,4,,,, +US-SD-57553,US,SD,57553,4,,,, +US-SD-57555,US,SD,57555,6,,,, +US-SD-57559,US,SD,57559,6,,,, +US-SD-57560,US,SD,57560,4,,,, +US-SD-57562,US,SD,57562,4,,,, +US-SD-57563,US,SD,57563,4,,,, +US-SD-57564,US,SD,57564,4,,,, +US-SD-57566,US,SD,57566,4,,,, +US-SD-57567,US,SD,57567,4,,,, +US-SD-57568,US,SD,57568,4,,,, +US-SD-57569,US,SD,57569,4,,,, +US-SD-57570,US,SD,57570,4,,,, +US-SD-57571,US,SD,57571,4,,,, +US-SD-57572,US,SD,57572,4,,,, +US-SD-57574,US,SD,57574,4,,,, +US-SD-57576,US,SD,57576,4,,,, +US-SD-57577,US,SD,57577,4,,,, +US-SD-57579,US,SD,57579,6,,,, +US-SD-57580,US,SD,57580,6,,,, +US-SD-57584,US,SD,57584,4,,,, +US-SD-57585,US,SD,57585,4,,,, +US-SD-57601,US,SD,57601,6,,,, +US-SD-57620,US,SD,57620,4,,,, +US-SD-57621,US,SD,57621,4,,,, +US-SD-57622,US,SD,57622,4,,,, +US-SD-57623,US,SD,57623,5,,,, +US-SD-57625,US,SD,57625,6,,,, +US-SD-57626,US,SD,57626,4,,,, +US-SD-57630,US,SD,57630,4,,,, +US-SD-57631,US,SD,57631,4,,,, +US-SD-57632,US,SD,57632,4,,,, +US-SD-57633,US,SD,57633,6,,,, +US-SD-57634,US,SD,57634,4,,,, +US-SD-57636,US,SD,57636,4,,,, +US-SD-57638,US,SD,57638,6,,,, +US-SD-57639,US,SD,57639,4,,,, +US-SD-57640,US,SD,57640,4,,,, +US-SD-57641,US,SD,57641,4,,,, +US-SD-57642,US,SD,57642,5,,,, +US-SD-57644,US,SD,57644,4,,,, +US-SD-57645,US,SD,57645,4,,,, +US-SD-57646,US,SD,57646,4,,,, +US-SD-57648,US,SD,57648,4,,,, +US-SD-57649,US,SD,57649,4,,,, +US-SD-57650,US,SD,57650,4,,,, +US-SD-57651,US,SD,57651,4,,,, +US-SD-57652,US,SD,57652,4,,,, +US-SD-57656,US,SD,57656,6,,,, +US-SD-57657,US,SD,57657,4,,,, +US-SD-57658,US,SD,57658,4,,,, +US-SD-57659,US,SD,57659,4,,,, +US-SD-57660,US,SD,57660,4,,,, +US-SD-57661,US,SD,57661,4,,,, +US-SD-57701,US,SD,57701,6,,,, +US-SD-57702,US,SD,57702,6,,,, +US-SD-57703,US,SD,57703,4,,,, +US-SD-57706,US,SD,57706,4,,,, +US-SD-57709,US,SD,57709,6,,,, +US-SD-57714,US,SD,57714,4,,,, +US-SD-57716,US,SD,57716,4,,,, +US-SD-57717,US,SD,57717,6,,,, +US-SD-57718,US,SD,57718,4,,,, +US-SD-57719,US,SD,57719,6,,,, +US-SD-57720,US,SD,57720,4,,,, +US-SD-57722,US,SD,57722,4,,,, +US-SD-57724,US,SD,57724,5,,,, +US-SD-57725,US,SD,57725,4,,,, +US-SD-57730,US,SD,57730,6,,,, +US-SD-57732,US,SD,57732,6,,,, +US-SD-57735,US,SD,57735,4,,,, +US-SD-57737,US,SD,57737,4,,,, +US-SD-57738,US,SD,57738,4,,,, +US-SD-57741,US,SD,57741,4,,,, +US-SD-57744,US,SD,57744,4,,,, +US-SD-57745,US,SD,57745,4,,,, +US-SD-57747,US,SD,57747,6,,,, +US-SD-57748,US,SD,57748,4,,,, +US-SD-57750,US,SD,57750,4,,,, +US-SD-57751,US,SD,57751,6,,,, +US-SD-57752,US,SD,57752,4,,,, +US-SD-57754,US,SD,57754,6,,,, +US-SD-57755,US,SD,57755,4,,,, +US-SD-57756,US,SD,57756,6,,,, +US-SD-57758,US,SD,57758,4,,,, +US-SD-57759,US,SD,57759,4,,,, +US-SD-57760,US,SD,57760,4,,,, +US-SD-57761,US,SD,57761,4,,,, +US-SD-57762,US,SD,57762,4,,,, +US-SD-57763,US,SD,57763,4,,,, +US-SD-57764,US,SD,57764,4,,,, +US-SD-57766,US,SD,57766,4,,,, +US-SD-57767,US,SD,57767,4,,,, +US-SD-57769,US,SD,57769,4,,,, +US-SD-57770,US,SD,57770,4,,,, +US-SD-57772,US,SD,57772,4,,,, +US-SD-57773,US,SD,57773,6,,,, +US-SD-57775,US,SD,57775,4,,,, +US-SD-57776,US,SD,57776,4,,,, +US-SD-57779,US,SD,57779,4,,,, +US-SD-57780,US,SD,57780,4,,,, +US-SD-57782,US,SD,57782,4,,,, +US-SD-57783,US,SD,57783,6,,,, +US-SD-57785,US,SD,57785,6,,,, +US-SD-57787,US,SD,57787,4,,,, +US-SD-57788,US,SD,57788,4,,,, +US-SD-57790,US,SD,57790,4,,,, +US-SD-57791,US,SD,57791,4,,,, +US-SD-57792,US,SD,57792,4,,,, +US-SD-57793,US,SD,57793,6,,,, +US-SD-57794,US,SD,57794,4,,,, +US-SD-57799,US,SD,57799,6,,,, +US-TN-37010,US,TN,37010,9.75,,,, +US-TN-37011,US,TN,37011,9.25,,,, +US-TN-37012,US,TN,37012,9.75,,,, +US-TN-37013,US,TN,37013,9.25,,,, +US-TN-37014,US,TN,37014,9.25,,,, +US-TN-37015,US,TN,37015,9.25,,,, +US-TN-37016,US,TN,37016,8.75,,,, +US-TN-37018,US,TN,37018,9.75,,,, +US-TN-37019,US,TN,37019,9.25,,,, +US-TN-37020,US,TN,37020,9.75,,,, +US-TN-37022,US,TN,37022,9.25,,,, +US-TN-37023,US,TN,37023,9.25,,,, +US-TN-37024,US,TN,37024,9.25,,,, +US-TN-37025,US,TN,37025,9.75,,,, +US-TN-37026,US,TN,37026,8.75,,,, +US-TN-37027,US,TN,37027,9.25,,,, +US-TN-37028,US,TN,37028,9.25,,,, +US-TN-37029,US,TN,37029,9.75,,,, +US-TN-37030,US,TN,37030,9.75,,,, +US-TN-37031,US,TN,37031,9.25,,,, +US-TN-37032,US,TN,37032,9.75,,,, +US-TN-37033,US,TN,37033,9.75,,,, +US-TN-37034,US,TN,37034,9.25,,,, +US-TN-37035,US,TN,37035,9.25,,,, +US-TN-37036,US,TN,37036,9.75,,,, +US-TN-37037,US,TN,37037,9.75,,,, +US-TN-37040,US,TN,37040,9.5,,,, +US-TN-37041,US,TN,37041,9.5,,,, +US-TN-37042,US,TN,37042,9.5,,,, +US-TN-37043,US,TN,37043,9.5,,,, +US-TN-37044,US,TN,37044,9.5,,,, +US-TN-37046,US,TN,37046,9.25,,,, +US-TN-37047,US,TN,37047,9.25,,,, +US-TN-37048,US,TN,37048,9.25,,,, +US-TN-37049,US,TN,37049,9.75,,,, +US-TN-37050,US,TN,37050,9.25,,,, +US-TN-37051,US,TN,37051,9.75,,,, +US-TN-37052,US,TN,37052,9.5,,,, +US-TN-37055,US,TN,37055,9.75,,,, +US-TN-37056,US,TN,37056,9.75,,,, +US-TN-37057,US,TN,37057,9.25,,,, +US-TN-37058,US,TN,37058,9.25,,,, +US-TN-37059,US,TN,37059,9.75,,,, +US-TN-37060,US,TN,37060,9.75,,,, +US-TN-37061,US,TN,37061,9.75,,,, +US-TN-37062,US,TN,37062,9.75,,,, +US-TN-37063,US,TN,37063,9.75,,,, +US-TN-37064,US,TN,37064,9.25,,,, +US-TN-37065,US,TN,37065,9.25,,,, +US-TN-37066,US,TN,37066,9.25,,,, +US-TN-37067,US,TN,37067,9.25,,,, +US-TN-37068,US,TN,37068,9.25,,,, +US-TN-37069,US,TN,37069,9.25,,,, +US-TN-37070,US,TN,37070,9.25,,,, +US-TN-37071,US,TN,37071,9.25,,,, +US-TN-37072,US,TN,37072,9.25,,,, +US-TN-37073,US,TN,37073,9.75,,,, +US-TN-37074,US,TN,37074,9.25,,,, +US-TN-37075,US,TN,37075,9.25,,,, +US-TN-37076,US,TN,37076,9.25,,,, +US-TN-37077,US,TN,37077,9.25,,,, +US-TN-37078,US,TN,37078,9.75,,,, +US-TN-37079,US,TN,37079,9.25,,,, +US-TN-37080,US,TN,37080,9.25,,,, +US-TN-37082,US,TN,37082,9.25,,,, +US-TN-37083,US,TN,37083,9.25,,,, +US-TN-37085,US,TN,37085,9.75,,,, +US-TN-37086,US,TN,37086,9.75,,,, +US-TN-37087,US,TN,37087,9.25,,,, +US-TN-37088,US,TN,37088,9.25,,,, +US-TN-37089,US,TN,37089,9.75,,,, +US-TN-37090,US,TN,37090,9.25,,,, +US-TN-37091,US,TN,37091,9.25,,,, +US-TN-37095,US,TN,37095,9.75,,,, +US-TN-37096,US,TN,37096,9.5,,,, +US-TN-37097,US,TN,37097,9.5,,,, +US-TN-37098,US,TN,37098,9.75,,,, +US-TN-37101,US,TN,37101,9.75,,,, +US-TN-37110,US,TN,37110,9.75,,,, +US-TN-37111,US,TN,37111,9.75,,,, +US-TN-37115,US,TN,37115,9.25,,,, +US-TN-37116,US,TN,37116,9.25,,,, +US-TN-37118,US,TN,37118,9.75,,,, +US-TN-37119,US,TN,37119,9.25,,,, +US-TN-37121,US,TN,37121,9.25,,,, +US-TN-37122,US,TN,37122,9.25,,,, +US-TN-37127,US,TN,37127,9.75,,,, +US-TN-37128,US,TN,37128,9.75,,,, +US-TN-37129,US,TN,37129,9.75,,,, +US-TN-37130,US,TN,37130,9.75,,,, +US-TN-37131,US,TN,37131,9.75,,,, +US-TN-37132,US,TN,37132,9.75,,,, +US-TN-37133,US,TN,37133,9.75,,,, +US-TN-37134,US,TN,37134,9.75,,,, +US-TN-37135,US,TN,37135,9.25,,,, +US-TN-37136,US,TN,37136,9.25,,,, +US-TN-37137,US,TN,37137,9.75,,,, +US-TN-37138,US,TN,37138,9.25,,,, +US-TN-37140,US,TN,37140,9.75,,,, +US-TN-37141,US,TN,37141,9.75,,,, +US-TN-37142,US,TN,37142,9.5,,,, +US-TN-37143,US,TN,37143,9.75,,,, +US-TN-37144,US,TN,37144,9.5,,,, +US-TN-37145,US,TN,37145,9.75,,,, +US-TN-37146,US,TN,37146,9.25,,,, +US-TN-37148,US,TN,37148,9.25,,,, +US-TN-37149,US,TN,37149,9.75,,,, +US-TN-37150,US,TN,37150,9.25,,,, +US-TN-37151,US,TN,37151,9.75,,,, +US-TN-37152,US,TN,37152,9.75,,,, +US-TN-37153,US,TN,37153,9.75,,,, +US-TN-37160,US,TN,37160,9.75,,,, +US-TN-37161,US,TN,37161,9.75,,,, +US-TN-37162,US,TN,37162,9.75,,,, +US-TN-37165,US,TN,37165,9.75,,,, +US-TN-37166,US,TN,37166,9.75,,,, +US-TN-37167,US,TN,37167,9.75,,,, +US-TN-37171,US,TN,37171,9.5,,,, +US-TN-37172,US,TN,37172,9.75,,,, +US-TN-37174,US,TN,37174,9.25,,,, +US-TN-37175,US,TN,37175,9.75,,,, +US-TN-37178,US,TN,37178,9.75,,,, +US-TN-37179,US,TN,37179,9.25,,,, +US-TN-37180,US,TN,37180,9.75,,,, +US-TN-37181,US,TN,37181,9.75,,,, +US-TN-37183,US,TN,37183,9.75,,,, +US-TN-37184,US,TN,37184,9.25,,,, +US-TN-37185,US,TN,37185,9.75,,,, +US-TN-37186,US,TN,37186,9.25,,,, +US-TN-37187,US,TN,37187,9.75,,,, +US-TN-37188,US,TN,37188,9.75,,,, +US-TN-37189,US,TN,37189,9.25,,,, +US-TN-37190,US,TN,37190,8.75,,,, +US-TN-37191,US,TN,37191,9.5,,,, +US-TN-37201,US,TN,37201,9.25,,,, +US-TN-37202,US,TN,37202,9.25,,,, +US-TN-37203,US,TN,37203,9.25,,,, +US-TN-37204,US,TN,37204,9.25,,,, +US-TN-37205,US,TN,37205,9.25,,,, +US-TN-37206,US,TN,37206,9.25,,,, +US-TN-37207,US,TN,37207,9.25,,,, +US-TN-37208,US,TN,37208,9.25,,,, +US-TN-37209,US,TN,37209,9.25,,,, +US-TN-37210,US,TN,37210,9.25,,,, +US-TN-37211,US,TN,37211,9.25,,,, +US-TN-37212,US,TN,37212,9.25,,,, +US-TN-37213,US,TN,37213,9.25,,,, +US-TN-37214,US,TN,37214,9.25,,,, +US-TN-37215,US,TN,37215,9.25,,,, +US-TN-37216,US,TN,37216,9.25,,,, +US-TN-37217,US,TN,37217,9.25,,,, +US-TN-37218,US,TN,37218,9.25,,,, +US-TN-37219,US,TN,37219,9.25,,,, +US-TN-37220,US,TN,37220,9.25,,,, +US-TN-37221,US,TN,37221,9.25,,,, +US-TN-37222,US,TN,37222,9.25,,,, +US-TN-37224,US,TN,37224,9.25,,,, +US-TN-37227,US,TN,37227,9.25,,,, +US-TN-37228,US,TN,37228,9.25,,,, +US-TN-37229,US,TN,37229,9.25,,,, +US-TN-37230,US,TN,37230,9.25,,,, +US-TN-37232,US,TN,37232,9.25,,,, +US-TN-37234,US,TN,37234,9.25,,,, +US-TN-37235,US,TN,37235,9.25,,,, +US-TN-37236,US,TN,37236,9.25,,,, +US-TN-37238,US,TN,37238,9.25,,,, +US-TN-37240,US,TN,37240,9.25,,,, +US-TN-37241,US,TN,37241,9.25,,,, +US-TN-37242,US,TN,37242,9.25,,,, +US-TN-37243,US,TN,37243,9.25,,,, +US-TN-37244,US,TN,37244,9.25,,,, +US-TN-37246,US,TN,37246,9.25,,,, +US-TN-37250,US,TN,37250,9.25,,,, +US-TN-37301,US,TN,37301,9.25,,,, +US-TN-37302,US,TN,37302,9.25,,,, +US-TN-37303,US,TN,37303,9,,,, +US-TN-37304,US,TN,37304,9.25,,,, +US-TN-37305,US,TN,37305,9.25,,,, +US-TN-37306,US,TN,37306,9.25,,,, +US-TN-37307,US,TN,37307,9.25,,,, +US-TN-37308,US,TN,37308,9.25,,,, +US-TN-37309,US,TN,37309,9,,,, +US-TN-37310,US,TN,37310,9.75,,,, +US-TN-37311,US,TN,37311,9.75,,,, +US-TN-37312,US,TN,37312,9.75,,,, +US-TN-37313,US,TN,37313,9.25,,,, +US-TN-37314,US,TN,37314,9.25,,,, +US-TN-37315,US,TN,37315,9.25,,,, +US-TN-37317,US,TN,37317,9.25,,,, +US-TN-37318,US,TN,37318,9.25,,,, +US-TN-37320,US,TN,37320,9.75,,,, +US-TN-37321,US,TN,37321,9.75,,,, +US-TN-37322,US,TN,37322,9,,,, +US-TN-37323,US,TN,37323,9.75,,,, +US-TN-37324,US,TN,37324,9.25,,,, +US-TN-37325,US,TN,37325,9.25,,,, +US-TN-37326,US,TN,37326,9.25,,,, +US-TN-37327,US,TN,37327,9.25,,,, +US-TN-37328,US,TN,37328,9.5,,,, +US-TN-37329,US,TN,37329,9,,,, +US-TN-37330,US,TN,37330,9.25,,,, +US-TN-37331,US,TN,37331,9,,,, +US-TN-37332,US,TN,37332,9.75,,,, +US-TN-37333,US,TN,37333,9.25,,,, +US-TN-37334,US,TN,37334,9.5,,,, +US-TN-37335,US,TN,37335,9.5,,,, +US-TN-37336,US,TN,37336,9.75,,,, +US-TN-37337,US,TN,37337,9.75,,,, +US-TN-37338,US,TN,37338,9.75,,,, +US-TN-37339,US,TN,37339,9.25,,,, +US-TN-37340,US,TN,37340,9.75,,,, +US-TN-37341,US,TN,37341,9.25,,,, +US-TN-37342,US,TN,37342,9.75,,,, +US-TN-37343,US,TN,37343,9.25,,,, +US-TN-37345,US,TN,37345,9.25,,,, +US-TN-37347,US,TN,37347,9.75,,,, +US-TN-37348,US,TN,37348,9.5,,,, +US-TN-37349,US,TN,37349,9.75,,,, +US-TN-37350,US,TN,37350,9.25,,,, +US-TN-37351,US,TN,37351,9.25,,,, +US-TN-37352,US,TN,37352,9.5,,,, +US-TN-37353,US,TN,37353,9.75,,,, +US-TN-37354,US,TN,37354,9.25,,,, +US-TN-37355,US,TN,37355,9.75,,,, +US-TN-37356,US,TN,37356,9.75,,,, +US-TN-37357,US,TN,37357,9.75,,,, +US-TN-37359,US,TN,37359,9.5,,,, +US-TN-37360,US,TN,37360,9.75,,,, +US-TN-37361,US,TN,37361,9.25,,,, +US-TN-37362,US,TN,37362,9.25,,,, +US-TN-37363,US,TN,37363,9.25,,,, +US-TN-37364,US,TN,37364,9.75,,,, +US-TN-37365,US,TN,37365,9.25,,,, +US-TN-37366,US,TN,37366,9.25,,,, +US-TN-37367,US,TN,37367,9.25,,,, +US-TN-37369,US,TN,37369,9.25,,,, +US-TN-37370,US,TN,37370,9,,,, +US-TN-37371,US,TN,37371,9,,,, +US-TN-37373,US,TN,37373,9.25,,,, +US-TN-37374,US,TN,37374,9.75,,,, +US-TN-37375,US,TN,37375,9.25,,,, +US-TN-37376,US,TN,37376,9.25,,,, +US-TN-37377,US,TN,37377,9.25,,,, +US-TN-37378,US,TN,37378,9.75,,,, +US-TN-37379,US,TN,37379,9.25,,,, +US-TN-37380,US,TN,37380,9.75,,,, +US-TN-37381,US,TN,37381,9.75,,,, +US-TN-37382,US,TN,37382,9.75,,,, +US-TN-37383,US,TN,37383,9.25,,,, +US-TN-37384,US,TN,37384,9.25,,,, +US-TN-37385,US,TN,37385,9.25,,,, +US-TN-37387,US,TN,37387,9.25,,,, +US-TN-37388,US,TN,37388,9.75,,,, +US-TN-37389,US,TN,37389,9.75,,,, +US-TN-37391,US,TN,37391,9.25,,,, +US-TN-37394,US,TN,37394,9.75,,,, +US-TN-37396,US,TN,37396,9.75,,,, +US-TN-37397,US,TN,37397,9.75,,,, +US-TN-37398,US,TN,37398,9.25,,,, +US-TN-37401,US,TN,37401,9.25,,,, +US-TN-37402,US,TN,37402,9.25,,,, +US-TN-37403,US,TN,37403,9.25,,,, +US-TN-37404,US,TN,37404,9.25,,,, +US-TN-37405,US,TN,37405,9.25,,,, +US-TN-37406,US,TN,37406,9.25,,,, +US-TN-37407,US,TN,37407,9.25,,,, +US-TN-37408,US,TN,37408,9.25,,,, +US-TN-37409,US,TN,37409,9.25,,,, +US-TN-37410,US,TN,37410,9.25,,,, +US-TN-37411,US,TN,37411,9.25,,,, +US-TN-37412,US,TN,37412,9.25,,,, +US-TN-37414,US,TN,37414,9.25,,,, +US-TN-37415,US,TN,37415,9.25,,,, +US-TN-37416,US,TN,37416,9.25,,,, +US-TN-37419,US,TN,37419,9.25,,,, +US-TN-37421,US,TN,37421,9.25,,,, +US-TN-37422,US,TN,37422,9.25,,,, +US-TN-37424,US,TN,37424,9.25,,,, +US-TN-37450,US,TN,37450,9.25,,,, +US-TN-37501,US,TN,37501,9.25,,,, +US-TN-37544,US,TN,37544,9.25,,,, +US-TN-37601,US,TN,37601,9.5,,,, +US-TN-37602,US,TN,37602,9.5,,,, +US-TN-37604,US,TN,37604,9.5,,,, +US-TN-37605,US,TN,37605,9.5,,,, +US-TN-37614,US,TN,37614,9.5,,,, +US-TN-37615,US,TN,37615,9.5,,,, +US-TN-37616,US,TN,37616,9.75,,,, +US-TN-37617,US,TN,37617,9.25,,,, +US-TN-37618,US,TN,37618,9.25,,,, +US-TN-37620,US,TN,37620,9.25,,,, +US-TN-37621,US,TN,37621,9.25,,,, +US-TN-37625,US,TN,37625,9.25,,,, +US-TN-37640,US,TN,37640,8.5,,,, +US-TN-37641,US,TN,37641,9.75,,,, +US-TN-37642,US,TN,37642,9.75,,,, +US-TN-37643,US,TN,37643,9.75,,,, +US-TN-37644,US,TN,37644,9.75,,,, +US-TN-37645,US,TN,37645,9.75,,,, +US-TN-37650,US,TN,37650,9.75,,,, +US-TN-37656,US,TN,37656,9.75,,,, +US-TN-37657,US,TN,37657,9.75,,,, +US-TN-37658,US,TN,37658,9.75,,,, +US-TN-37659,US,TN,37659,9.5,,,, +US-TN-37660,US,TN,37660,9.5,,,, +US-TN-37662,US,TN,37662,9.25,,,, +US-TN-37663,US,TN,37663,9.25,,,, +US-TN-37664,US,TN,37664,9.5,,,, +US-TN-37665,US,TN,37665,9.5,,,, +US-TN-37669,US,TN,37669,9.5,,,, +US-TN-37680,US,TN,37680,8.5,,,, +US-TN-37681,US,TN,37681,9.75,,,, +US-TN-37682,US,TN,37682,9.75,,,, +US-TN-37683,US,TN,37683,8.5,,,, +US-TN-37684,US,TN,37684,9.5,,,, +US-TN-37686,US,TN,37686,9.25,,,, +US-TN-37687,US,TN,37687,9.75,,,, +US-TN-37688,US,TN,37688,8.5,,,, +US-TN-37690,US,TN,37690,9.5,,,, +US-TN-37691,US,TN,37691,8.5,,,, +US-TN-37692,US,TN,37692,9.75,,,, +US-TN-37694,US,TN,37694,9.75,,,, +US-TN-37699,US,TN,37699,9.25,,,, +US-TN-37701,US,TN,37701,9.75,,,, +US-TN-37705,US,TN,37705,9.75,,,, +US-TN-37707,US,TN,37707,9.25,,,, +US-TN-37708,US,TN,37708,9.75,,,, +US-TN-37709,US,TN,37709,9.75,,,, +US-TN-37710,US,TN,37710,9.75,,,, +US-TN-37711,US,TN,37711,9.75,,,, +US-TN-37713,US,TN,37713,9.75,,,, +US-TN-37714,US,TN,37714,9.25,,,, +US-TN-37715,US,TN,37715,9.25,,,, +US-TN-37716,US,TN,37716,9.75,,,, +US-TN-37717,US,TN,37717,9.75,,,, +US-TN-37719,US,TN,37719,9,,,, +US-TN-37721,US,TN,37721,9.25,,,, +US-TN-37722,US,TN,37722,9.75,,,, +US-TN-37723,US,TN,37723,9.75,,,, +US-TN-37724,US,TN,37724,9.25,,,, +US-TN-37725,US,TN,37725,9.75,,,, +US-TN-37726,US,TN,37726,9,,,, +US-TN-37727,US,TN,37727,9.75,,,, +US-TN-37729,US,TN,37729,9.25,,,, +US-TN-37730,US,TN,37730,9.25,,,, +US-TN-37731,US,TN,37731,9.75,,,, +US-TN-37732,US,TN,37732,9.25,,,, +US-TN-37733,US,TN,37733,9.25,,,, +US-TN-37737,US,TN,37737,9.25,,,, +US-TN-37738,US,TN,37738,9.75,,,, +US-TN-37742,US,TN,37742,9,,,, +US-TN-37743,US,TN,37743,9.75,,,, +US-TN-37744,US,TN,37744,9.75,,,, +US-TN-37745,US,TN,37745,9.75,,,, +US-TN-37748,US,TN,37748,9.5,,,, +US-TN-37752,US,TN,37752,9.25,,,, +US-TN-37753,US,TN,37753,9.75,,,, +US-TN-37754,US,TN,37754,9.75,,,, +US-TN-37755,US,TN,37755,9.25,,,, +US-TN-37756,US,TN,37756,9.25,,,, +US-TN-37757,US,TN,37757,9.25,,,, +US-TN-37760,US,TN,37760,9.75,,,, +US-TN-37762,US,TN,37762,9.25,,,, +US-TN-37763,US,TN,37763,9.5,,,, +US-TN-37764,US,TN,37764,9.75,,,, +US-TN-37765,US,TN,37765,9,,,, +US-TN-37766,US,TN,37766,9.25,,,, +US-TN-37769,US,TN,37769,9.75,,,, +US-TN-37770,US,TN,37770,9,,,, +US-TN-37771,US,TN,37771,9,,,, +US-TN-37772,US,TN,37772,9,,,, +US-TN-37773,US,TN,37773,9.25,,,, +US-TN-37774,US,TN,37774,9,,,, +US-TN-37777,US,TN,37777,9.25,,,, +US-TN-37778,US,TN,37778,9.75,,,, +US-TN-37779,US,TN,37779,9.25,,,, +US-TN-37801,US,TN,37801,9.25,,,, +US-TN-37802,US,TN,37802,9.25,,,, +US-TN-37803,US,TN,37803,9.25,,,, +US-TN-37804,US,TN,37804,9.25,,,, +US-TN-37806,US,TN,37806,9.25,,,, +US-TN-37807,US,TN,37807,9.25,,,, +US-TN-37809,US,TN,37809,9.75,,,, +US-TN-37810,US,TN,37810,9.75,,,, +US-TN-37811,US,TN,37811,9.75,,,, +US-TN-37813,US,TN,37813,9.75,,,, +US-TN-37814,US,TN,37814,9.75,,,, +US-TN-37815,US,TN,37815,9.75,,,, +US-TN-37816,US,TN,37816,9.75,,,, +US-TN-37818,US,TN,37818,9.75,,,, +US-TN-37819,US,TN,37819,9.25,,,, +US-TN-37820,US,TN,37820,9.75,,,, +US-TN-37821,US,TN,37821,9.75,,,, +US-TN-37822,US,TN,37822,9.75,,,, +US-TN-37824,US,TN,37824,9.25,,,, +US-TN-37825,US,TN,37825,9.25,,,, +US-TN-37826,US,TN,37826,9,,,, +US-TN-37828,US,TN,37828,9.75,,,, +US-TN-37829,US,TN,37829,9,,,, +US-TN-37830,US,TN,37830,9.75,,,, +US-TN-37831,US,TN,37831,9.75,,,, +US-TN-37840,US,TN,37840,9.75,,,, +US-TN-37841,US,TN,37841,9.25,,,, +US-TN-37843,US,TN,37843,9.75,,,, +US-TN-37845,US,TN,37845,9,,,, +US-TN-37846,US,TN,37846,9,,,, +US-TN-37847,US,TN,37847,9.25,,,, +US-TN-37848,US,TN,37848,9.75,,,, +US-TN-37849,US,TN,37849,9.25,,,, +US-TN-37851,US,TN,37851,9.25,,,, +US-TN-37852,US,TN,37852,9.25,,,, +US-TN-37853,US,TN,37853,9.25,,,, +US-TN-37854,US,TN,37854,9.5,,,, +US-TN-37857,US,TN,37857,9.75,,,, +US-TN-37860,US,TN,37860,9.75,,,, +US-TN-37861,US,TN,37861,9.75,,,, +US-TN-37862,US,TN,37862,9.75,,,, +US-TN-37863,US,TN,37863,9.75,,,, +US-TN-37864,US,TN,37864,9.75,,,, +US-TN-37865,US,TN,37865,9.75,,,, +US-TN-37866,US,TN,37866,9.25,,,, +US-TN-37867,US,TN,37867,9.25,,,, +US-TN-37868,US,TN,37868,9.75,,,, +US-TN-37869,US,TN,37869,9,,,, +US-TN-37870,US,TN,37870,9.25,,,, +US-TN-37871,US,TN,37871,9.25,,,, +US-TN-37872,US,TN,37872,9,,,, +US-TN-37873,US,TN,37873,9.75,,,, +US-TN-37874,US,TN,37874,9.25,,,, +US-TN-37876,US,TN,37876,9.75,,,, +US-TN-37877,US,TN,37877,9.75,,,, +US-TN-37878,US,TN,37878,9.25,,,, +US-TN-37879,US,TN,37879,9.25,,,, +US-TN-37880,US,TN,37880,9.5,,,, +US-TN-37881,US,TN,37881,9.75,,,, +US-TN-37882,US,TN,37882,9.25,,,, +US-TN-37885,US,TN,37885,9.25,,,, +US-TN-37886,US,TN,37886,9.25,,,, +US-TN-37887,US,TN,37887,9,,,, +US-TN-37888,US,TN,37888,9.75,,,, +US-TN-37890,US,TN,37890,9.75,,,, +US-TN-37891,US,TN,37891,9.75,,,, +US-TN-37892,US,TN,37892,9.25,,,, +US-TN-37901,US,TN,37901,9.25,,,, +US-TN-37902,US,TN,37902,9.25,,,, +US-TN-37909,US,TN,37909,9.25,,,, +US-TN-37912,US,TN,37912,9.25,,,, +US-TN-37914,US,TN,37914,9.25,,,, +US-TN-37915,US,TN,37915,9.25,,,, +US-TN-37916,US,TN,37916,9.25,,,, +US-TN-37917,US,TN,37917,9.25,,,, +US-TN-37918,US,TN,37918,9.25,,,, +US-TN-37919,US,TN,37919,9.25,,,, +US-TN-37920,US,TN,37920,9.25,,,, +US-TN-37921,US,TN,37921,9.25,,,, +US-TN-37922,US,TN,37922,9.25,,,, +US-TN-37923,US,TN,37923,9.25,,,, +US-TN-37924,US,TN,37924,9.25,,,, +US-TN-37927,US,TN,37927,9.25,,,, +US-TN-37928,US,TN,37928,9.25,,,, +US-TN-37929,US,TN,37929,9.25,,,, +US-TN-37930,US,TN,37930,9.25,,,, +US-TN-37931,US,TN,37931,9.25,,,, +US-TN-37932,US,TN,37932,9.25,,,, +US-TN-37933,US,TN,37933,9.25,,,, +US-TN-37934,US,TN,37934,9.25,,,, +US-TN-37938,US,TN,37938,9.25,,,, +US-TN-37939,US,TN,37939,9.25,,,, +US-TN-37940,US,TN,37940,9.25,,,, +US-TN-37950,US,TN,37950,9.25,,,, +US-TN-37995,US,TN,37995,9.25,,,, +US-TN-37996,US,TN,37996,9.25,,,, +US-TN-37997,US,TN,37997,9.25,,,, +US-TN-37998,US,TN,37998,9.25,,,, +US-TN-38001,US,TN,38001,9.75,,,, +US-TN-38002,US,TN,38002,9.75,,,, +US-TN-38004,US,TN,38004,9.25,,,, +US-TN-38006,US,TN,38006,9.75,,,, +US-TN-38007,US,TN,38007,9.75,,,, +US-TN-38008,US,TN,38008,9.75,,,, +US-TN-38010,US,TN,38010,9.25,,,, +US-TN-38011,US,TN,38011,9.25,,,, +US-TN-38012,US,TN,38012,9.75,,,, +US-TN-38014,US,TN,38014,9.25,,,, +US-TN-38015,US,TN,38015,9.25,,,, +US-TN-38016,US,TN,38016,9.25,,,, +US-TN-38017,US,TN,38017,9.75,,,, +US-TN-38018,US,TN,38018,9.25,,,, +US-TN-38019,US,TN,38019,9.25,,,, +US-TN-38021,US,TN,38021,9.75,,,, +US-TN-38023,US,TN,38023,9.25,,,, +US-TN-38024,US,TN,38024,9.75,,,, +US-TN-38025,US,TN,38025,9.75,,,, +US-TN-38027,US,TN,38027,9.75,,,, +US-TN-38028,US,TN,38028,9.25,,,, +US-TN-38029,US,TN,38029,9.75,,,, +US-TN-38030,US,TN,38030,9.75,,,, +US-TN-38034,US,TN,38034,9.75,,,, +US-TN-38036,US,TN,38036,9.25,,,, +US-TN-38037,US,TN,38037,9.75,,,, +US-TN-38039,US,TN,38039,9.75,,,, +US-TN-38040,US,TN,38040,9.75,,,, +US-TN-38041,US,TN,38041,9.75,,,, +US-TN-38042,US,TN,38042,9.75,,,, +US-TN-38044,US,TN,38044,9.75,,,, +US-TN-38045,US,TN,38045,9.25,,,, +US-TN-38046,US,TN,38046,9.25,,,, +US-TN-38047,US,TN,38047,9.75,,,, +US-TN-38048,US,TN,38048,9.25,,,, +US-TN-38049,US,TN,38049,9.25,,,, +US-TN-38050,US,TN,38050,9.75,,,, +US-TN-38052,US,TN,38052,9.75,,,, +US-TN-38053,US,TN,38053,9.25,,,, +US-TN-38054,US,TN,38054,9.75,,,, +US-TN-38055,US,TN,38055,9.75,,,, +US-TN-38057,US,TN,38057,9.25,,,, +US-TN-38058,US,TN,38058,9.25,,,, +US-TN-38059,US,TN,38059,9.75,,,, +US-TN-38060,US,TN,38060,9.25,,,, +US-TN-38061,US,TN,38061,9.75,,,, +US-TN-38063,US,TN,38063,9.75,,,, +US-TN-38066,US,TN,38066,9.25,,,, +US-TN-38067,US,TN,38067,9.75,,,, +US-TN-38068,US,TN,38068,9.25,,,, +US-TN-38069,US,TN,38069,9.75,,,, +US-TN-38070,US,TN,38070,9.75,,,, +US-TN-38071,US,TN,38071,9.25,,,, +US-TN-38075,US,TN,38075,9.75,,,, +US-TN-38076,US,TN,38076,9.25,,,, +US-TN-38077,US,TN,38077,9.75,,,, +US-TN-38079,US,TN,38079,9.75,,,, +US-TN-38080,US,TN,38080,9.75,,,, +US-TN-38083,US,TN,38083,9.75,,,, +US-TN-38088,US,TN,38088,9.25,,,, +US-TN-38101,US,TN,38101,9.25,,,, +US-TN-38103,US,TN,38103,9.25,,,, +US-TN-38104,US,TN,38104,9.25,,,, +US-TN-38105,US,TN,38105,9.25,,,, +US-TN-38106,US,TN,38106,9.25,,,, +US-TN-38107,US,TN,38107,9.25,,,, +US-TN-38108,US,TN,38108,9.25,,,, +US-TN-38109,US,TN,38109,9.25,,,, +US-TN-38111,US,TN,38111,9.25,,,, +US-TN-38112,US,TN,38112,9.25,,,, +US-TN-38114,US,TN,38114,9.25,,,, +US-TN-38115,US,TN,38115,9.25,,,, +US-TN-38116,US,TN,38116,9.25,,,, +US-TN-38117,US,TN,38117,9.25,,,, +US-TN-38118,US,TN,38118,9.25,,,, +US-TN-38119,US,TN,38119,9.25,,,, +US-TN-38120,US,TN,38120,9.25,,,, +US-TN-38122,US,TN,38122,9.25,,,, +US-TN-38124,US,TN,38124,9.25,,,, +US-TN-38125,US,TN,38125,9.25,,,, +US-TN-38126,US,TN,38126,9.25,,,, +US-TN-38127,US,TN,38127,9.25,,,, +US-TN-38128,US,TN,38128,9.25,,,, +US-TN-38130,US,TN,38130,9.25,,,, +US-TN-38131,US,TN,38131,9.25,,,, +US-TN-38132,US,TN,38132,9.25,,,, +US-TN-38133,US,TN,38133,9.75,,,, +US-TN-38134,US,TN,38134,9.25,,,, +US-TN-38135,US,TN,38135,9.75,,,, +US-TN-38136,US,TN,38136,9.25,,,, +US-TN-38137,US,TN,38137,9.25,,,, +US-TN-38138,US,TN,38138,9.75,,,, +US-TN-38139,US,TN,38139,9.75,,,, +US-TN-38141,US,TN,38141,9.25,,,, +US-TN-38148,US,TN,38148,9.25,,,, +US-TN-38152,US,TN,38152,9.25,,,, +US-TN-38157,US,TN,38157,9.25,,,, +US-TN-38161,US,TN,38161,9.25,,,, +US-TN-38163,US,TN,38163,9.25,,,, +US-TN-38166,US,TN,38166,9.25,,,, +US-TN-38167,US,TN,38167,9.25,,,, +US-TN-38168,US,TN,38168,9.25,,,, +US-TN-38173,US,TN,38173,9.25,,,, +US-TN-38174,US,TN,38174,9.25,,,, +US-TN-38175,US,TN,38175,9.25,,,, +US-TN-38177,US,TN,38177,9.25,,,, +US-TN-38181,US,TN,38181,9.25,,,, +US-TN-38182,US,TN,38182,9.25,,,, +US-TN-38183,US,TN,38183,9.75,,,, +US-TN-38184,US,TN,38184,9.75,,,, +US-TN-38186,US,TN,38186,9.25,,,, +US-TN-38187,US,TN,38187,9.25,,,, +US-TN-38188,US,TN,38188,9.25,,,, +US-TN-38190,US,TN,38190,9.25,,,, +US-TN-38193,US,TN,38193,9.25,,,, +US-TN-38194,US,TN,38194,9.25,,,, +US-TN-38197,US,TN,38197,9.25,,,, +US-TN-38201,US,TN,38201,9.75,,,, +US-TN-38220,US,TN,38220,9.75,,,, +US-TN-38221,US,TN,38221,9.75,,,, +US-TN-38222,US,TN,38222,9.25,,,, +US-TN-38223,US,TN,38223,9.25,,,, +US-TN-38224,US,TN,38224,9.25,,,, +US-TN-38225,US,TN,38225,9.75,,,, +US-TN-38226,US,TN,38226,9.75,,,, +US-TN-38229,US,TN,38229,9.75,,,, +US-TN-38230,US,TN,38230,9.75,,,, +US-TN-38231,US,TN,38231,9.25,,,, +US-TN-38232,US,TN,38232,9.75,,,, +US-TN-38233,US,TN,38233,9.75,,,, +US-TN-38235,US,TN,38235,9.75,,,, +US-TN-38236,US,TN,38236,9.25,,,, +US-TN-38237,US,TN,38237,9.75,,,, +US-TN-38238,US,TN,38238,9.75,,,, +US-TN-38240,US,TN,38240,9.75,,,, +US-TN-38241,US,TN,38241,9.75,,,, +US-TN-38242,US,TN,38242,9.25,,,, +US-TN-38251,US,TN,38251,9.25,,,, +US-TN-38253,US,TN,38253,9.75,,,, +US-TN-38254,US,TN,38254,9.75,,,, +US-TN-38255,US,TN,38255,9.75,,,, +US-TN-38256,US,TN,38256,9.25,,,, +US-TN-38257,US,TN,38257,9.75,,,, +US-TN-38258,US,TN,38258,9.75,,,, +US-TN-38259,US,TN,38259,9.75,,,, +US-TN-38260,US,TN,38260,9.75,,,, +US-TN-38261,US,TN,38261,9.75,,,, +US-TN-38271,US,TN,38271,9.75,,,, +US-TN-38281,US,TN,38281,9.75,,,, +US-TN-38301,US,TN,38301,9.75,,,, +US-TN-38302,US,TN,38302,9.75,,,, +US-TN-38303,US,TN,38303,9.75,,,, +US-TN-38305,US,TN,38305,9.75,,,, +US-TN-38308,US,TN,38308,9.75,,,, +US-TN-38310,US,TN,38310,9.25,,,, +US-TN-38311,US,TN,38311,9.5,,,, +US-TN-38313,US,TN,38313,9.75,,,, +US-TN-38314,US,TN,38314,9.75,,,, +US-TN-38315,US,TN,38315,9.25,,,, +US-TN-38316,US,TN,38316,9.75,,,, +US-TN-38317,US,TN,38317,9.75,,,, +US-TN-38318,US,TN,38318,9.75,,,, +US-TN-38320,US,TN,38320,9.75,,,, +US-TN-38321,US,TN,38321,9.75,,,, +US-TN-38324,US,TN,38324,9.75,,,, +US-TN-38326,US,TN,38326,9.5,,,, +US-TN-38327,US,TN,38327,9.5,,,, +US-TN-38328,US,TN,38328,9.75,,,, +US-TN-38329,US,TN,38329,9.5,,,, +US-TN-38330,US,TN,38330,9.75,,,, +US-TN-38331,US,TN,38331,9.75,,,, +US-TN-38332,US,TN,38332,9.75,,,, +US-TN-38333,US,TN,38333,9.75,,,, +US-TN-38334,US,TN,38334,9.25,,,, +US-TN-38336,US,TN,38336,9.75,,,, +US-TN-38337,US,TN,38337,9.75,,,, +US-TN-38338,US,TN,38338,9.75,,,, +US-TN-38339,US,TN,38339,9.25,,,, +US-TN-38340,US,TN,38340,9.75,,,, +US-TN-38341,US,TN,38341,9.75,,,, +US-TN-38342,US,TN,38342,9.75,,,, +US-TN-38343,US,TN,38343,9.75,,,, +US-TN-38344,US,TN,38344,9.75,,,, +US-TN-38345,US,TN,38345,9.75,,,, +US-TN-38346,US,TN,38346,9.75,,,, +US-TN-38347,US,TN,38347,9.75,,,, +US-TN-38348,US,TN,38348,9.75,,,, +US-TN-38351,US,TN,38351,9.75,,,, +US-TN-38352,US,TN,38352,9.75,,,, +US-TN-38355,US,TN,38355,9.75,,,, +US-TN-38356,US,TN,38356,9.75,,,, +US-TN-38357,US,TN,38357,9.25,,,, +US-TN-38358,US,TN,38358,9.75,,,, +US-TN-38359,US,TN,38359,9.25,,,, +US-TN-38361,US,TN,38361,9.5,,,, +US-TN-38362,US,TN,38362,9.75,,,, +US-TN-38363,US,TN,38363,9.5,,,, +US-TN-38365,US,TN,38365,9.5,,,, +US-TN-38366,US,TN,38366,9.75,,,, +US-TN-38367,US,TN,38367,9.25,,,, +US-TN-38368,US,TN,38368,9.75,,,, +US-TN-38369,US,TN,38369,9.75,,,, +US-TN-38370,US,TN,38370,9.5,,,, +US-TN-38371,US,TN,38371,9.75,,,, +US-TN-38372,US,TN,38372,9.5,,,, +US-TN-38374,US,TN,38374,9.75,,,, +US-TN-38375,US,TN,38375,9.25,,,, +US-TN-38376,US,TN,38376,9.5,,,, +US-TN-38377,US,TN,38377,9.75,,,, +US-TN-38378,US,TN,38378,9.75,,,, +US-TN-38379,US,TN,38379,9.25,,,, +US-TN-38380,US,TN,38380,9.5,,,, +US-TN-38381,US,TN,38381,9.75,,,, +US-TN-38382,US,TN,38382,9.75,,,, +US-TN-38387,US,TN,38387,9.75,,,, +US-TN-38388,US,TN,38388,9.75,,,, +US-TN-38389,US,TN,38389,9.75,,,, +US-TN-38390,US,TN,38390,9.75,,,, +US-TN-38391,US,TN,38391,9.75,,,, +US-TN-38392,US,TN,38392,9.75,,,, +US-TN-38393,US,TN,38393,9.25,,,, +US-TN-38401,US,TN,38401,9.25,,,, +US-TN-38402,US,TN,38402,9.25,,,, +US-TN-38425,US,TN,38425,9.75,,,, +US-TN-38449,US,TN,38449,9.5,,,, +US-TN-38450,US,TN,38450,9.75,,,, +US-TN-38451,US,TN,38451,9.25,,,, +US-TN-38452,US,TN,38452,9.75,,,, +US-TN-38453,US,TN,38453,9.5,,,, +US-TN-38454,US,TN,38454,9.75,,,, +US-TN-38455,US,TN,38455,9.5,,,, +US-TN-38456,US,TN,38456,9.75,,,, +US-TN-38457,US,TN,38457,9.75,,,, +US-TN-38459,US,TN,38459,9.5,,,, +US-TN-38460,US,TN,38460,9.5,,,, +US-TN-38461,US,TN,38461,9.25,,,, +US-TN-38462,US,TN,38462,9.5,,,, +US-TN-38463,US,TN,38463,9.75,,,, +US-TN-38464,US,TN,38464,9.75,,,, +US-TN-38468,US,TN,38468,9.75,,,, +US-TN-38469,US,TN,38469,9.75,,,, +US-TN-38471,US,TN,38471,9.75,,,, +US-TN-38472,US,TN,38472,9.5,,,, +US-TN-38473,US,TN,38473,9.5,,,, +US-TN-38474,US,TN,38474,9.25,,,, +US-TN-38475,US,TN,38475,9.5,,,, +US-TN-38476,US,TN,38476,9.75,,,, +US-TN-38477,US,TN,38477,9.5,,,, +US-TN-38478,US,TN,38478,9.5,,,, +US-TN-38481,US,TN,38481,9.75,,,, +US-TN-38482,US,TN,38482,9.25,,,, +US-TN-38483,US,TN,38483,9.75,,,, +US-TN-38485,US,TN,38485,9.75,,,, +US-TN-38486,US,TN,38486,9.75,,,, +US-TN-38487,US,TN,38487,9.25,,,, +US-TN-38488,US,TN,38488,9.5,,,, +US-TN-38501,US,TN,38501,9.75,,,, +US-TN-38502,US,TN,38502,9.75,,,, +US-TN-38503,US,TN,38503,9.75,,,, +US-TN-38504,US,TN,38504,9.5,,,, +US-TN-38505,US,TN,38505,9.75,,,, +US-TN-38506,US,TN,38506,9.75,,,, +US-TN-38541,US,TN,38541,9.5,,,, +US-TN-38542,US,TN,38542,9.5,,,, +US-TN-38543,US,TN,38543,9.5,,,, +US-TN-38544,US,TN,38544,9.75,,,, +US-TN-38545,US,TN,38545,9.75,,,, +US-TN-38547,US,TN,38547,9.75,,,, +US-TN-38548,US,TN,38548,9.75,,,, +US-TN-38549,US,TN,38549,9.75,,,, +US-TN-38550,US,TN,38550,9.75,,,, +US-TN-38551,US,TN,38551,9.75,,,, +US-TN-38552,US,TN,38552,9.75,,,, +US-TN-38553,US,TN,38553,9.5,,,, +US-TN-38554,US,TN,38554,9.5,,,, +US-TN-38555,US,TN,38555,9.75,,,, +US-TN-38556,US,TN,38556,9.5,,,, +US-TN-38557,US,TN,38557,9.75,,,, +US-TN-38558,US,TN,38558,9.75,,,, +US-TN-38559,US,TN,38559,9.25,,,, +US-TN-38560,US,TN,38560,9.75,,,, +US-TN-38562,US,TN,38562,9.75,,,, +US-TN-38563,US,TN,38563,9.75,,,, +US-TN-38564,US,TN,38564,9.75,,,, +US-TN-38565,US,TN,38565,9.5,,,, +US-TN-38567,US,TN,38567,9.75,,,, +US-TN-38568,US,TN,38568,9.5,,,, +US-TN-38569,US,TN,38569,9.75,,,, +US-TN-38570,US,TN,38570,9.5,,,, +US-TN-38571,US,TN,38571,9.75,,,, +US-TN-38572,US,TN,38572,9.75,,,, +US-TN-38573,US,TN,38573,9.5,,,, +US-TN-38574,US,TN,38574,9.75,,,, +US-TN-38575,US,TN,38575,9.75,,,, +US-TN-38577,US,TN,38577,9.75,,,, +US-TN-38578,US,TN,38578,9.75,,,, +US-TN-38579,US,TN,38579,9.25,,,, +US-TN-38580,US,TN,38580,9.5,,,, +US-TN-38581,US,TN,38581,9.75,,,, +US-TN-38582,US,TN,38582,9.75,,,, +US-TN-38583,US,TN,38583,9.25,,,, +US-TN-38585,US,TN,38585,9.75,,,, +US-TN-38587,US,TN,38587,9.25,,,, +US-TN-38588,US,TN,38588,9.75,,,, +US-TN-38589,US,TN,38589,9.5,,,, +US-TX-73301,US,TX,73301,8.25,,,, +US-TX-73344,US,TX,73344,8.25,,,, +US-TX-73960,US,TX,73960,6.25,,,, +US-TX-75001,US,TX,75001,8.25,,,, +US-TX-75002,US,TX,75002,8.25,,,, +US-TX-75006,US,TX,75006,8.25,,,, +US-TX-75007,US,TX,75007,8.25,,,, +US-TX-75009,US,TX,75009,8.25,,,, +US-TX-75010,US,TX,75010,8.25,,,, +US-TX-75011,US,TX,75011,8.25,,,, +US-TX-75013,US,TX,75013,8.25,,,, +US-TX-75014,US,TX,75014,8.25,,,, +US-TX-75015,US,TX,75015,8.25,,,, +US-TX-75016,US,TX,75016,8.25,,,, +US-TX-75017,US,TX,75017,8.25,,,, +US-TX-75019,US,TX,75019,8.25,,,, +US-TX-75020,US,TX,75020,8.25,,,, +US-TX-75021,US,TX,75021,6.25,,,, +US-TX-75022,US,TX,75022,8.25,,,, +US-TX-75023,US,TX,75023,8.25,,,, +US-TX-75024,US,TX,75024,8.25,,,, +US-TX-75025,US,TX,75025,8.25,,,, +US-TX-75026,US,TX,75026,8.25,,,, +US-TX-75027,US,TX,75027,8.25,,,, +US-TX-75028,US,TX,75028,8.25,,,, +US-TX-75029,US,TX,75029,8.25,,,, +US-TX-75030,US,TX,75030,8.25,,,, +US-TX-75032,US,TX,75032,8.25,,,, +US-TX-75033,US,TX,75033,8.25,,,, +US-TX-75034,US,TX,75034,8.25,,,, +US-TX-75035,US,TX,75035,8.25,,,, +US-TX-75038,US,TX,75038,8.25,,,, +US-TX-75039,US,TX,75039,8.25,,,, +US-TX-75040,US,TX,75040,8.25,,,, +US-TX-75041,US,TX,75041,8.25,,,, +US-TX-75042,US,TX,75042,8.25,,,, +US-TX-75043,US,TX,75043,8.25,,,, +US-TX-75044,US,TX,75044,8.25,,,, +US-TX-75045,US,TX,75045,8.25,,,, +US-TX-75046,US,TX,75046,8.25,,,, +US-TX-75047,US,TX,75047,8.25,,,, +US-TX-75048,US,TX,75048,8,,,, +US-TX-75049,US,TX,75049,8.25,,,, +US-TX-75050,US,TX,75050,8.25,,,, +US-TX-75051,US,TX,75051,8.25,,,, +US-TX-75052,US,TX,75052,8.25,,,, +US-TX-75053,US,TX,75053,8.25,,,, +US-TX-75054,US,TX,75054,8.25,,,, +US-TX-75056,US,TX,75056,8.25,,,, +US-TX-75057,US,TX,75057,8.25,,,, +US-TX-75058,US,TX,75058,6.25,,,, +US-TX-75060,US,TX,75060,8.25,,,, +US-TX-75061,US,TX,75061,8.25,,,, +US-TX-75062,US,TX,75062,8.25,,,, +US-TX-75063,US,TX,75063,8.25,,,, +US-TX-75065,US,TX,75065,8.25,,,, +US-TX-75067,US,TX,75067,8.25,,,, +US-TX-75068,US,TX,75068,8.25,,,, +US-TX-75069,US,TX,75069,8.25,,,, +US-TX-75070,US,TX,75070,8.25,,,, +US-TX-75071,US,TX,75071,8.25,,,, +US-TX-75074,US,TX,75074,8.25,,,, +US-TX-75075,US,TX,75075,8.25,,,, +US-TX-75076,US,TX,75076,6.25,,,, +US-TX-75077,US,TX,75077,8.25,,,, +US-TX-75078,US,TX,75078,8.25,,,, +US-TX-75080,US,TX,75080,8.25,,,, +US-TX-75081,US,TX,75081,8.25,,,, +US-TX-75082,US,TX,75082,8.25,,,, +US-TX-75083,US,TX,75083,8.25,,,, +US-TX-75085,US,TX,75085,8.25,,,, +US-TX-75086,US,TX,75086,8.25,,,, +US-TX-75087,US,TX,75087,8.25,,,, +US-TX-75088,US,TX,75088,8.25,,,, +US-TX-75089,US,TX,75089,8.25,,,, +US-TX-75090,US,TX,75090,8.25,,,, +US-TX-75091,US,TX,75091,8.25,,,, +US-TX-75092,US,TX,75092,8.25,,,, +US-TX-75093,US,TX,75093,8.25,,,, +US-TX-75094,US,TX,75094,8.25,,,, +US-TX-75097,US,TX,75097,7.25,,,, +US-TX-75098,US,TX,75098,8.25,,,, +US-TX-75099,US,TX,75099,8.25,,,, +US-TX-75101,US,TX,75101,7.25,,,, +US-TX-75102,US,TX,75102,6.75,,,, +US-TX-75103,US,TX,75103,6.25,,,, +US-TX-75104,US,TX,75104,8.25,,,, +US-TX-75105,US,TX,75105,6.75,,,, +US-TX-75106,US,TX,75106,8.25,,,, +US-TX-75109,US,TX,75109,6.75,,,, +US-TX-75110,US,TX,75110,8.25,,,, +US-TX-75114,US,TX,75114,8.25,,,, +US-TX-75115,US,TX,75115,8.25,,,, +US-TX-75116,US,TX,75116,8.25,,,, +US-TX-75117,US,TX,75117,6.25,,,, +US-TX-75118,US,TX,75118,6.25,,,, +US-TX-75119,US,TX,75119,7.75,,,, +US-TX-75120,US,TX,75120,7.75,,,, +US-TX-75121,US,TX,75121,6.25,,,, +US-TX-75123,US,TX,75123,8.25,,,, +US-TX-75124,US,TX,75124,6.25,,,, +US-TX-75125,US,TX,75125,6.25,,,, +US-TX-75126,US,TX,75126,6.25,,,, +US-TX-75127,US,TX,75127,6.25,,,, +US-TX-75132,US,TX,75132,8.25,,,, +US-TX-75134,US,TX,75134,8.25,,,, +US-TX-75135,US,TX,75135,6.75,,,, +US-TX-75137,US,TX,75137,8.25,,,, +US-TX-75138,US,TX,75138,8.25,,,, +US-TX-75140,US,TX,75140,6.25,,,, +US-TX-75141,US,TX,75141,8.25,,,, +US-TX-75142,US,TX,75142,6.25,,,, +US-TX-75143,US,TX,75143,6.25,,,, +US-TX-75144,US,TX,75144,6.75,,,, +US-TX-75146,US,TX,75146,8.25,,,, +US-TX-75147,US,TX,75147,6.25,,,, +US-TX-75148,US,TX,75148,6.25,,,, +US-TX-75149,US,TX,75149,8.25,,,, +US-TX-75150,US,TX,75150,8.25,,,, +US-TX-75151,US,TX,75151,8.25,,,, +US-TX-75152,US,TX,75152,6.25,,,, +US-TX-75153,US,TX,75153,6.75,,,, +US-TX-75154,US,TX,75154,8.25,,,, +US-TX-75155,US,TX,75155,6.75,,,, +US-TX-75156,US,TX,75156,6.25,,,, +US-TX-75157,US,TX,75157,7.25,,,, +US-TX-75158,US,TX,75158,6.25,,,, +US-TX-75159,US,TX,75159,8.25,,,, +US-TX-75160,US,TX,75160,8.25,,,, +US-TX-75161,US,TX,75161,6.25,,,, +US-TX-75163,US,TX,75163,6.25,,,, +US-TX-75164,US,TX,75164,7.25,,,, +US-TX-75165,US,TX,75165,8.25,,,, +US-TX-75166,US,TX,75166,8,,,, +US-TX-75167,US,TX,75167,6.25,,,, +US-TX-75168,US,TX,75168,8.25,,,, +US-TX-75169,US,TX,75169,6.25,,,, +US-TX-75172,US,TX,75172,8.25,,,, +US-TX-75173,US,TX,75173,6.25,,,, +US-TX-75180,US,TX,75180,8.25,,,, +US-TX-75181,US,TX,75181,8.25,,,, +US-TX-75182,US,TX,75182,8.25,,,, +US-TX-75185,US,TX,75185,8.25,,,, +US-TX-75187,US,TX,75187,8.25,,,, +US-TX-75189,US,TX,75189,8.25,,,, +US-TX-75201,US,TX,75201,8.25,,,, +US-TX-75202,US,TX,75202,8.25,,,, +US-TX-75203,US,TX,75203,8.25,,,, +US-TX-75204,US,TX,75204,8.25,,,, +US-TX-75205,US,TX,75205,8.25,,,, +US-TX-75206,US,TX,75206,8.25,,,, +US-TX-75207,US,TX,75207,8.25,,,, +US-TX-75208,US,TX,75208,8.25,,,, +US-TX-75209,US,TX,75209,8.25,,,, +US-TX-75210,US,TX,75210,8.25,,,, +US-TX-75211,US,TX,75211,8.25,,,, +US-TX-75212,US,TX,75212,8.25,,,, +US-TX-75214,US,TX,75214,8.25,,,, +US-TX-75215,US,TX,75215,8.25,,,, +US-TX-75216,US,TX,75216,8.25,,,, +US-TX-75217,US,TX,75217,8.25,,,, +US-TX-75218,US,TX,75218,8.25,,,, +US-TX-75219,US,TX,75219,8.25,,,, +US-TX-75220,US,TX,75220,8.25,,,, +US-TX-75221,US,TX,75221,8.25,,,, +US-TX-75222,US,TX,75222,8.25,,,, +US-TX-75223,US,TX,75223,8.25,,,, +US-TX-75224,US,TX,75224,8.25,,,, +US-TX-75225,US,TX,75225,8.25,,,, +US-TX-75226,US,TX,75226,8.25,,,, +US-TX-75227,US,TX,75227,8.25,,,, +US-TX-75228,US,TX,75228,8.25,,,, +US-TX-75229,US,TX,75229,8.25,,,, +US-TX-75230,US,TX,75230,8.25,,,, +US-TX-75231,US,TX,75231,8.25,,,, +US-TX-75232,US,TX,75232,8.25,,,, +US-TX-75233,US,TX,75233,8.25,,,, +US-TX-75234,US,TX,75234,8.25,,,, +US-TX-75235,US,TX,75235,8.25,,,, +US-TX-75236,US,TX,75236,8.25,,,, +US-TX-75237,US,TX,75237,8.25,,,, +US-TX-75238,US,TX,75238,8.25,,,, +US-TX-75240,US,TX,75240,8.25,,,, +US-TX-75241,US,TX,75241,8.25,,,, +US-TX-75242,US,TX,75242,8.25,,,, +US-TX-75243,US,TX,75243,8.25,,,, +US-TX-75244,US,TX,75244,8.25,,,, +US-TX-75246,US,TX,75246,8.25,,,, +US-TX-75247,US,TX,75247,8.25,,,, +US-TX-75248,US,TX,75248,8.25,,,, +US-TX-75249,US,TX,75249,8.25,,,, +US-TX-75250,US,TX,75250,8.25,,,, +US-TX-75251,US,TX,75251,8.25,,,, +US-TX-75252,US,TX,75252,8.25,,,, +US-TX-75253,US,TX,75253,8.25,,,, +US-TX-75254,US,TX,75254,8.25,,,, +US-TX-75261,US,TX,75261,8.25,,,, +US-TX-75270,US,TX,75270,8.25,,,, +US-TX-75287,US,TX,75287,8.25,,,, +US-TX-75313,US,TX,75313,8.25,,,, +US-TX-75315,US,TX,75315,8.25,,,, +US-TX-75336,US,TX,75336,8.25,,,, +US-TX-75339,US,TX,75339,8.25,,,, +US-TX-75342,US,TX,75342,8.25,,,, +US-TX-75354,US,TX,75354,8.25,,,, +US-TX-75355,US,TX,75355,8.25,,,, +US-TX-75356,US,TX,75356,8.25,,,, +US-TX-75357,US,TX,75357,8.25,,,, +US-TX-75359,US,TX,75359,8.25,,,, +US-TX-75360,US,TX,75360,8.25,,,, +US-TX-75367,US,TX,75367,8.25,,,, +US-TX-75370,US,TX,75370,8.25,,,, +US-TX-75371,US,TX,75371,8.25,,,, +US-TX-75372,US,TX,75372,8.25,,,, +US-TX-75374,US,TX,75374,8.25,,,, +US-TX-75376,US,TX,75376,8.25,,,, +US-TX-75378,US,TX,75378,8.25,,,, +US-TX-75379,US,TX,75379,8.25,,,, +US-TX-75380,US,TX,75380,8.25,,,, +US-TX-75381,US,TX,75381,8.25,,,, +US-TX-75382,US,TX,75382,8.25,,,, +US-TX-75390,US,TX,75390,8.25,,,, +US-TX-75393,US,TX,75393,8.25,,,, +US-TX-75394,US,TX,75394,8.25,,,, +US-TX-75398,US,TX,75398,8.25,,,, +US-TX-75401,US,TX,75401,8.25,,,, +US-TX-75402,US,TX,75402,8.25,,,, +US-TX-75403,US,TX,75403,8.25,,,, +US-TX-75404,US,TX,75404,8.25,,,, +US-TX-75407,US,TX,75407,6.25,,,, +US-TX-75409,US,TX,75409,8.25,,,, +US-TX-75410,US,TX,75410,6.75,,,, +US-TX-75411,US,TX,75411,6.75,,,, +US-TX-75412,US,TX,75412,6.75,,,, +US-TX-75413,US,TX,75413,7.75,,,, +US-TX-75414,US,TX,75414,6.25,,,, +US-TX-75415,US,TX,75415,7.25,,,, +US-TX-75416,US,TX,75416,6.75,,,, +US-TX-75417,US,TX,75417,6.75,,,, +US-TX-75418,US,TX,75418,8.25,,,, +US-TX-75420,US,TX,75420,6.75,,,, +US-TX-75421,US,TX,75421,6.75,,,, +US-TX-75422,US,TX,75422,6.75,,,, +US-TX-75423,US,TX,75423,6.75,,,, +US-TX-75424,US,TX,75424,6.25,,,, +US-TX-75425,US,TX,75425,6.75,,,, +US-TX-75426,US,TX,75426,8.25,,,, +US-TX-75428,US,TX,75428,8.25,,,, +US-TX-75429,US,TX,75429,8.25,,,, +US-TX-75431,US,TX,75431,6.75,,,, +US-TX-75432,US,TX,75432,8.25,,,, +US-TX-75433,US,TX,75433,6.75,,,, +US-TX-75434,US,TX,75434,6.75,,,, +US-TX-75435,US,TX,75435,7.75,,,, +US-TX-75436,US,TX,75436,7.75,,,, +US-TX-75437,US,TX,75437,6.75,,,, +US-TX-75438,US,TX,75438,6.75,,,, +US-TX-75439,US,TX,75439,7.75,,,, +US-TX-75440,US,TX,75440,6.75,,,, +US-TX-75441,US,TX,75441,7.25,,,, +US-TX-75442,US,TX,75442,6.25,,,, +US-TX-75443,US,TX,75443,6.75,,,, +US-TX-75444,US,TX,75444,6.75,,,, +US-TX-75446,US,TX,75446,8.25,,,, +US-TX-75447,US,TX,75447,6.75,,,, +US-TX-75448,US,TX,75448,7.25,,,, +US-TX-75449,US,TX,75449,7.75,,,, +US-TX-75450,US,TX,75450,7.25,,,, +US-TX-75451,US,TX,75451,6.75,,,, +US-TX-75452,US,TX,75452,8.25,,,, +US-TX-75453,US,TX,75453,6.75,,,, +US-TX-75454,US,TX,75454,8.25,,,, +US-TX-75455,US,TX,75455,6.75,,,, +US-TX-75456,US,TX,75456,8.25,,,, +US-TX-75457,US,TX,75457,6.75,,,, +US-TX-75458,US,TX,75458,6.75,,,, +US-TX-75459,US,TX,75459,6.25,,,, +US-TX-75460,US,TX,75460,8.25,,,, +US-TX-75461,US,TX,75461,8.25,,,, +US-TX-75462,US,TX,75462,6.75,,,, +US-TX-75468,US,TX,75468,6.75,,,, +US-TX-75469,US,TX,75469,7.25,,,, +US-TX-75470,US,TX,75470,6.75,,,, +US-TX-75471,US,TX,75471,6.75,,,, +US-TX-75472,US,TX,75472,6.75,,,, +US-TX-75473,US,TX,75473,6.75,,,, +US-TX-75474,US,TX,75474,6.75,,,, +US-TX-75475,US,TX,75475,6.75,,,, +US-TX-75476,US,TX,75476,6.75,,,, +US-TX-75477,US,TX,75477,6.75,,,, +US-TX-75478,US,TX,75478,6.75,,,, +US-TX-75479,US,TX,75479,6.75,,,, +US-TX-75480,US,TX,75480,6.75,,,, +US-TX-75481,US,TX,75481,6.75,,,, +US-TX-75482,US,TX,75482,6.75,,,, +US-TX-75483,US,TX,75483,8.25,,,, +US-TX-75485,US,TX,75485,6.25,,,, +US-TX-75486,US,TX,75486,6.75,,,, +US-TX-75487,US,TX,75487,6.75,,,, +US-TX-75488,US,TX,75488,6.75,,,, +US-TX-75489,US,TX,75489,8.25,,,, +US-TX-75490,US,TX,75490,6.75,,,, +US-TX-75491,US,TX,75491,6.25,,,, +US-TX-75492,US,TX,75492,6.75,,,, +US-TX-75493,US,TX,75493,8,,,, +US-TX-75494,US,TX,75494,6.75,,,, +US-TX-75495,US,TX,75495,6.25,,,, +US-TX-75496,US,TX,75496,6.75,,,, +US-TX-75497,US,TX,75497,6.75,,,, +US-TX-75501,US,TX,75501,8.25,,,, +US-TX-75503,US,TX,75503,8.25,,,, +US-TX-75505,US,TX,75505,8.25,,,, +US-TX-75507,US,TX,75507,8.25,,,, +US-TX-75550,US,TX,75550,6.75,,,, +US-TX-75551,US,TX,75551,6.25,,,, +US-TX-75554,US,TX,75554,7.75,,,, +US-TX-75555,US,TX,75555,6.25,,,, +US-TX-75556,US,TX,75556,6.25,,,, +US-TX-75558,US,TX,75558,6.75,,,, +US-TX-75559,US,TX,75559,6.75,,,, +US-TX-75560,US,TX,75560,6.25,,,, +US-TX-75561,US,TX,75561,6.75,,,, +US-TX-75562,US,TX,75562,6.25,,,, +US-TX-75563,US,TX,75563,6.25,,,, +US-TX-75564,US,TX,75564,6.75,,,, +US-TX-75565,US,TX,75565,6.25,,,, +US-TX-75566,US,TX,75566,6.25,,,, +US-TX-75567,US,TX,75567,6.75,,,, +US-TX-75568,US,TX,75568,6.25,,,, +US-TX-75569,US,TX,75569,8.25,,,, +US-TX-75570,US,TX,75570,6.75,,,, +US-TX-75571,US,TX,75571,6.75,,,, +US-TX-75572,US,TX,75572,6.25,,,, +US-TX-75573,US,TX,75573,8.25,,,, +US-TX-75574,US,TX,75574,6.75,,,, +US-TX-75599,US,TX,75599,8.25,,,, +US-TX-75601,US,TX,75601,8.25,,,, +US-TX-75602,US,TX,75602,8.25,,,, +US-TX-75603,US,TX,75603,6.75,,,, +US-TX-75604,US,TX,75604,8.25,,,, +US-TX-75605,US,TX,75605,8.25,,,, +US-TX-75606,US,TX,75606,8.25,,,, +US-TX-75607,US,TX,75607,8.25,,,, +US-TX-75608,US,TX,75608,8.25,,,, +US-TX-75615,US,TX,75615,8.25,,,, +US-TX-75630,US,TX,75630,6.75,,,, +US-TX-75631,US,TX,75631,6.25,,,, +US-TX-75633,US,TX,75633,6.25,,,, +US-TX-75636,US,TX,75636,6.75,,,, +US-TX-75637,US,TX,75637,6.25,,,, +US-TX-75638,US,TX,75638,6.75,,,, +US-TX-75639,US,TX,75639,6.25,,,, +US-TX-75640,US,TX,75640,6.75,,,, +US-TX-75641,US,TX,75641,7.75,,,, +US-TX-75642,US,TX,75642,6.25,,,, +US-TX-75643,US,TX,75643,6.25,,,, +US-TX-75644,US,TX,75644,6.75,,,, +US-TX-75645,US,TX,75645,6.75,,,, +US-TX-75647,US,TX,75647,8.25,,,, +US-TX-75650,US,TX,75650,6.25,,,, +US-TX-75651,US,TX,75651,6.25,,,, +US-TX-75652,US,TX,75652,6.25,,,, +US-TX-75653,US,TX,75653,8.25,,,, +US-TX-75654,US,TX,75654,6.25,,,, +US-TX-75656,US,TX,75656,6.25,,,, +US-TX-75657,US,TX,75657,6.75,,,, +US-TX-75658,US,TX,75658,6.25,,,, +US-TX-75659,US,TX,75659,6.25,,,, +US-TX-75660,US,TX,75660,6.75,,,, +US-TX-75661,US,TX,75661,6.25,,,, +US-TX-75662,US,TX,75662,8.25,,,, +US-TX-75663,US,TX,75663,8.25,,,, +US-TX-75666,US,TX,75666,6.25,,,, +US-TX-75667,US,TX,75667,6.25,,,, +US-TX-75668,US,TX,75668,7.75,,,, +US-TX-75669,US,TX,75669,6.25,,,, +US-TX-75670,US,TX,75670,8.25,,,, +US-TX-75671,US,TX,75671,8.25,,,, +US-TX-75672,US,TX,75672,6.25,,,, +US-TX-75680,US,TX,75680,8.25,,,, +US-TX-75681,US,TX,75681,6.25,,,, +US-TX-75682,US,TX,75682,6.25,,,, +US-TX-75683,US,TX,75683,6.75,,,, +US-TX-75684,US,TX,75684,6.25,,,, +US-TX-75685,US,TX,75685,6.25,,,, +US-TX-75686,US,TX,75686,6.75,,,, +US-TX-75687,US,TX,75687,6.25,,,, +US-TX-75688,US,TX,75688,6.25,,,, +US-TX-75689,US,TX,75689,6.25,,,, +US-TX-75691,US,TX,75691,6.25,,,, +US-TX-75692,US,TX,75692,6.25,,,, +US-TX-75693,US,TX,75693,8.25,,,, +US-TX-75694,US,TX,75694,6.25,,,, +US-TX-75701,US,TX,75701,8.25,,,, +US-TX-75702,US,TX,75702,8.25,,,, +US-TX-75703,US,TX,75703,8.25,,,, +US-TX-75704,US,TX,75704,6.75,,,, +US-TX-75705,US,TX,75705,6.75,,,, +US-TX-75706,US,TX,75706,6.75,,,, +US-TX-75707,US,TX,75707,6.75,,,, +US-TX-75708,US,TX,75708,6.75,,,, +US-TX-75709,US,TX,75709,6.75,,,, +US-TX-75710,US,TX,75710,8.25,,,, +US-TX-75711,US,TX,75711,8.25,,,, +US-TX-75712,US,TX,75712,8.25,,,, +US-TX-75713,US,TX,75713,8.25,,,, +US-TX-75750,US,TX,75750,6.75,,,, +US-TX-75751,US,TX,75751,8.25,,,, +US-TX-75752,US,TX,75752,6.25,,,, +US-TX-75754,US,TX,75754,6.25,,,, +US-TX-75755,US,TX,75755,6.75,,,, +US-TX-75756,US,TX,75756,6.25,,,, +US-TX-75757,US,TX,75757,6.75,,,, +US-TX-75758,US,TX,75758,6.25,,,, +US-TX-75759,US,TX,75759,8.25,,,, +US-TX-75760,US,TX,75760,7.25,,,, +US-TX-75762,US,TX,75762,6.75,,,, +US-TX-75763,US,TX,75763,6.75,,,, +US-TX-75764,US,TX,75764,6.75,,,, +US-TX-75765,US,TX,75765,6.75,,,, +US-TX-75766,US,TX,75766,6.75,,,, +US-TX-75770,US,TX,75770,6.25,,,, +US-TX-75771,US,TX,75771,6.75,,,, +US-TX-75772,US,TX,75772,6.75,,,, +US-TX-75773,US,TX,75773,6.75,,,, +US-TX-75778,US,TX,75778,6.25,,,, +US-TX-75779,US,TX,75779,6.75,,,, +US-TX-75780,US,TX,75780,7.75,,,, +US-TX-75782,US,TX,75782,7.25,,,, +US-TX-75783,US,TX,75783,6.75,,,, +US-TX-75784,US,TX,75784,7.75,,,, +US-TX-75785,US,TX,75785,6.75,,,, +US-TX-75788,US,TX,75788,7.25,,,, +US-TX-75789,US,TX,75789,6.75,,,, +US-TX-75790,US,TX,75790,8.25,,,, +US-TX-75791,US,TX,75791,8.25,,,, +US-TX-75792,US,TX,75792,6.75,,,, +US-TX-75797,US,TX,75797,8.25,,,, +US-TX-75798,US,TX,75798,8.25,,,, +US-TX-75799,US,TX,75799,8.25,,,, +US-TX-75801,US,TX,75801,8.25,,,, +US-TX-75802,US,TX,75802,8.25,,,, +US-TX-75803,US,TX,75803,6.75,,,, +US-TX-75831,US,TX,75831,6.75,,,, +US-TX-75832,US,TX,75832,6.75,,,, +US-TX-75833,US,TX,75833,6.75,,,, +US-TX-75834,US,TX,75834,6.25,,,, +US-TX-75835,US,TX,75835,8.25,,,, +US-TX-75838,US,TX,75838,6.25,,,, +US-TX-75839,US,TX,75839,6.75,,,, +US-TX-75840,US,TX,75840,8.25,,,, +US-TX-75844,US,TX,75844,6.75,,,, +US-TX-75845,US,TX,75845,6.25,,,, +US-TX-75846,US,TX,75846,6.75,,,, +US-TX-75847,US,TX,75847,6.75,,,, +US-TX-75848,US,TX,75848,7.75,,,, +US-TX-75849,US,TX,75849,7.75,,,, +US-TX-75850,US,TX,75850,6.75,,,, +US-TX-75851,US,TX,75851,6.75,,,, +US-TX-75852,US,TX,75852,6.75,,,, +US-TX-75853,US,TX,75853,6.75,,,, +US-TX-75855,US,TX,75855,6.75,,,, +US-TX-75856,US,TX,75856,6.25,,,, +US-TX-75858,US,TX,75858,6.75,,,, +US-TX-75859,US,TX,75859,6.25,,,, +US-TX-75860,US,TX,75860,8.25,,,, +US-TX-75861,US,TX,75861,6.75,,,, +US-TX-75862,US,TX,75862,6.25,,,, +US-TX-75865,US,TX,75865,6.25,,,, +US-TX-75880,US,TX,75880,6.75,,,, +US-TX-75882,US,TX,75882,6.75,,,, +US-TX-75884,US,TX,75884,6.75,,,, +US-TX-75886,US,TX,75886,6.75,,,, +US-TX-75901,US,TX,75901,8.25,,,, +US-TX-75902,US,TX,75902,8.25,,,, +US-TX-75903,US,TX,75903,8.25,,,, +US-TX-75904,US,TX,75904,8.25,,,, +US-TX-75915,US,TX,75915,8.25,,,, +US-TX-75925,US,TX,75925,6.75,,,, +US-TX-75926,US,TX,75926,6.25,,,, +US-TX-75928,US,TX,75928,6.25,,,, +US-TX-75929,US,TX,75929,6.75,,,, +US-TX-75930,US,TX,75930,6.75,,,, +US-TX-75931,US,TX,75931,6.25,,,, +US-TX-75932,US,TX,75932,6.25,,,, +US-TX-75933,US,TX,75933,6.25,,,, +US-TX-75934,US,TX,75934,6.75,,,, +US-TX-75935,US,TX,75935,6.25,,,, +US-TX-75936,US,TX,75936,6.75,,,, +US-TX-75937,US,TX,75937,7.25,,,, +US-TX-75938,US,TX,75938,6.75,,,, +US-TX-75939,US,TX,75939,6.75,,,, +US-TX-75941,US,TX,75941,8.25,,,, +US-TX-75942,US,TX,75942,6.75,,,, +US-TX-75943,US,TX,75943,7.25,,,, +US-TX-75944,US,TX,75944,7.25,,,, +US-TX-75946,US,TX,75946,7.25,,,, +US-TX-75948,US,TX,75948,6.75,,,, +US-TX-75949,US,TX,75949,6.75,,,, +US-TX-75951,US,TX,75951,8.25,,,, +US-TX-75954,US,TX,75954,6.25,,,, +US-TX-75956,US,TX,75956,6.25,,,, +US-TX-75958,US,TX,75958,7.25,,,, +US-TX-75959,US,TX,75959,6.75,,,, +US-TX-75960,US,TX,75960,6.75,,,, +US-TX-75961,US,TX,75961,8.25,,,, +US-TX-75962,US,TX,75962,8.25,,,, +US-TX-75963,US,TX,75963,8.25,,,, +US-TX-75964,US,TX,75964,7.25,,,, +US-TX-75965,US,TX,75965,8.25,,,, +US-TX-75966,US,TX,75966,6.25,,,, +US-TX-75968,US,TX,75968,6.75,,,, +US-TX-75969,US,TX,75969,6.75,,,, +US-TX-75972,US,TX,75972,8.25,,,, +US-TX-75973,US,TX,75973,6.25,,,, +US-TX-75974,US,TX,75974,6.25,,,, +US-TX-75975,US,TX,75975,6.75,,,, +US-TX-75976,US,TX,75976,7.75,,,, +US-TX-75977,US,TX,75977,6.25,,,, +US-TX-75978,US,TX,75978,7.25,,,, +US-TX-75979,US,TX,75979,6.75,,,, +US-TX-75980,US,TX,75980,6.75,,,, +US-TX-75990,US,TX,75990,8.25,,,, +US-TX-76001,US,TX,76001,8,,,, +US-TX-76002,US,TX,76002,8,,,, +US-TX-76003,US,TX,76003,8,,,, +US-TX-76004,US,TX,76004,8,,,, +US-TX-76005,US,TX,76005,8,,,, +US-TX-76006,US,TX,76006,8,,,, +US-TX-76007,US,TX,76007,8,,,, +US-TX-76008,US,TX,76008,6.75,,,, +US-TX-76009,US,TX,76009,6.25,,,, +US-TX-76010,US,TX,76010,8,,,, +US-TX-76011,US,TX,76011,8,,,, +US-TX-76012,US,TX,76012,8,,,, +US-TX-76013,US,TX,76013,8,,,, +US-TX-76014,US,TX,76014,8,,,, +US-TX-76015,US,TX,76015,8,,,, +US-TX-76016,US,TX,76016,8,,,, +US-TX-76017,US,TX,76017,8,,,, +US-TX-76018,US,TX,76018,8,,,, +US-TX-76019,US,TX,76019,8,,,, +US-TX-76020,US,TX,76020,6.75,,,, +US-TX-76021,US,TX,76021,8.25,,,, +US-TX-76022,US,TX,76022,8.25,,,, +US-TX-76023,US,TX,76023,6.75,,,, +US-TX-76028,US,TX,76028,8.25,,,, +US-TX-76031,US,TX,76031,6.25,,,, +US-TX-76033,US,TX,76033,7.75,,,, +US-TX-76034,US,TX,76034,8.25,,,, +US-TX-76035,US,TX,76035,8,,,, +US-TX-76036,US,TX,76036,8.25,,,, +US-TX-76039,US,TX,76039,8.25,,,, +US-TX-76040,US,TX,76040,8.25,,,, +US-TX-76041,US,TX,76041,6.25,,,, +US-TX-76043,US,TX,76043,6.25,,,, +US-TX-76044,US,TX,76044,6.25,,,, +US-TX-76048,US,TX,76048,6.75,,,, +US-TX-76049,US,TX,76049,6.75,,,, +US-TX-76050,US,TX,76050,6.25,,,, +US-TX-76051,US,TX,76051,8.25,,,, +US-TX-76052,US,TX,76052,8.25,,,, +US-TX-76053,US,TX,76053,8.25,,,, +US-TX-76054,US,TX,76054,8.25,,,, +US-TX-76055,US,TX,76055,6.75,,,, +US-TX-76058,US,TX,76058,6.25,,,, +US-TX-76059,US,TX,76059,8.25,,,, +US-TX-76060,US,TX,76060,8.25,,,, +US-TX-76061,US,TX,76061,6.25,,,, +US-TX-76063,US,TX,76063,8.25,,,, +US-TX-76064,US,TX,76064,6.25,,,, +US-TX-76065,US,TX,76065,8.25,,,, +US-TX-76066,US,TX,76066,6.75,,,, +US-TX-76067,US,TX,76067,8.25,,,, +US-TX-76068,US,TX,76068,8.25,,,, +US-TX-76070,US,TX,76070,6.25,,,, +US-TX-76071,US,TX,76071,6.75,,,, +US-TX-76073,US,TX,76073,6.75,,,, +US-TX-76077,US,TX,76077,6.25,,,, +US-TX-76078,US,TX,76078,6.75,,,, +US-TX-76082,US,TX,76082,6.75,,,, +US-TX-76084,US,TX,76084,6.25,,,, +US-TX-76085,US,TX,76085,6.75,,,, +US-TX-76086,US,TX,76086,8.25,,,, +US-TX-76087,US,TX,76087,6.75,,,, +US-TX-76088,US,TX,76088,6.75,,,, +US-TX-76092,US,TX,76092,8.25,,,, +US-TX-76093,US,TX,76093,6.25,,,, +US-TX-76094,US,TX,76094,8,,,, +US-TX-76095,US,TX,76095,8.25,,,, +US-TX-76096,US,TX,76096,8,,,, +US-TX-76097,US,TX,76097,8.25,,,, +US-TX-76098,US,TX,76098,8.25,,,, +US-TX-76099,US,TX,76099,8.25,,,, +US-TX-76101,US,TX,76101,8.25,,,, +US-TX-76102,US,TX,76102,8.25,,,, +US-TX-76103,US,TX,76103,8.25,,,, +US-TX-76104,US,TX,76104,8.25,,,, +US-TX-76105,US,TX,76105,8.25,,,, +US-TX-76106,US,TX,76106,8.25,,,, +US-TX-76107,US,TX,76107,8.25,,,, +US-TX-76108,US,TX,76108,8.25,,,, +US-TX-76109,US,TX,76109,8.25,,,, +US-TX-76110,US,TX,76110,8.25,,,, +US-TX-76111,US,TX,76111,8.25,,,, +US-TX-76112,US,TX,76112,8.25,,,, +US-TX-76113,US,TX,76113,8.25,,,, +US-TX-76114,US,TX,76114,8.25,,,, +US-TX-76115,US,TX,76115,8.25,,,, +US-TX-76116,US,TX,76116,8.25,,,, +US-TX-76117,US,TX,76117,8.25,,,, +US-TX-76118,US,TX,76118,8.25,,,, +US-TX-76119,US,TX,76119,8.25,,,, +US-TX-76120,US,TX,76120,8.25,,,, +US-TX-76121,US,TX,76121,8.25,,,, +US-TX-76122,US,TX,76122,8.25,,,, +US-TX-76123,US,TX,76123,8.25,,,, +US-TX-76124,US,TX,76124,8.25,,,, +US-TX-76126,US,TX,76126,8.25,,,, +US-TX-76127,US,TX,76127,8.25,,,, +US-TX-76129,US,TX,76129,8.25,,,, +US-TX-76130,US,TX,76130,8.25,,,, +US-TX-76131,US,TX,76131,8.25,,,, +US-TX-76132,US,TX,76132,8.25,,,, +US-TX-76133,US,TX,76133,8.25,,,, +US-TX-76134,US,TX,76134,8.25,,,, +US-TX-76135,US,TX,76135,8.25,,,, +US-TX-76136,US,TX,76136,8.25,,,, +US-TX-76137,US,TX,76137,8.25,,,, +US-TX-76140,US,TX,76140,8.25,,,, +US-TX-76147,US,TX,76147,8.25,,,, +US-TX-76148,US,TX,76148,8.25,,,, +US-TX-76150,US,TX,76150,8.25,,,, +US-TX-76155,US,TX,76155,8.25,,,, +US-TX-76161,US,TX,76161,8.25,,,, +US-TX-76162,US,TX,76162,8.25,,,, +US-TX-76163,US,TX,76163,8.25,,,, +US-TX-76164,US,TX,76164,8.25,,,, +US-TX-76166,US,TX,76166,8.25,,,, +US-TX-76177,US,TX,76177,8.25,,,, +US-TX-76179,US,TX,76179,8.25,,,, +US-TX-76180,US,TX,76180,8.25,,,, +US-TX-76181,US,TX,76181,8.25,,,, +US-TX-76182,US,TX,76182,8.25,,,, +US-TX-76185,US,TX,76185,8.25,,,, +US-TX-76190,US,TX,76190,8.25,,,, +US-TX-76191,US,TX,76191,8.25,,,, +US-TX-76192,US,TX,76192,8.25,,,, +US-TX-76193,US,TX,76193,8.25,,,, +US-TX-76195,US,TX,76195,8.25,,,, +US-TX-76196,US,TX,76196,8.25,,,, +US-TX-76197,US,TX,76197,8.25,,,, +US-TX-76198,US,TX,76198,8.25,,,, +US-TX-76199,US,TX,76199,8.25,,,, +US-TX-76201,US,TX,76201,8.25,,,, +US-TX-76202,US,TX,76202,8.25,,,, +US-TX-76203,US,TX,76203,8.25,,,, +US-TX-76204,US,TX,76204,8.25,,,, +US-TX-76205,US,TX,76205,8.25,,,, +US-TX-76206,US,TX,76206,8.25,,,, +US-TX-76207,US,TX,76207,8.25,,,, +US-TX-76208,US,TX,76208,8.25,,,, +US-TX-76209,US,TX,76209,8.25,,,, +US-TX-76210,US,TX,76210,8.25,,,, +US-TX-76225,US,TX,76225,6.75,,,, +US-TX-76226,US,TX,76226,8.25,,,, +US-TX-76227,US,TX,76227,6.25,,,, +US-TX-76228,US,TX,76228,6.25,,,, +US-TX-76230,US,TX,76230,8.25,,,, +US-TX-76233,US,TX,76233,6.25,,,, +US-TX-76234,US,TX,76234,6.75,,,, +US-TX-76238,US,TX,76238,6.75,,,, +US-TX-76239,US,TX,76239,6.25,,,, +US-TX-76240,US,TX,76240,6.75,,,, +US-TX-76241,US,TX,76241,8.25,,,, +US-TX-76244,US,TX,76244,8.25,,,, +US-TX-76245,US,TX,76245,6.25,,,, +US-TX-76247,US,TX,76247,6.25,,,, +US-TX-76248,US,TX,76248,8.25,,,, +US-TX-76249,US,TX,76249,6.25,,,, +US-TX-76250,US,TX,76250,8.25,,,, +US-TX-76251,US,TX,76251,6.25,,,, +US-TX-76252,US,TX,76252,6.75,,,, +US-TX-76253,US,TX,76253,6.75,,,, +US-TX-76255,US,TX,76255,6.25,,,, +US-TX-76258,US,TX,76258,6.25,,,, +US-TX-76259,US,TX,76259,6.25,,,, +US-TX-76261,US,TX,76261,6.25,,,, +US-TX-76262,US,TX,76262,8.25,,,, +US-TX-76263,US,TX,76263,6.75,,,, +US-TX-76264,US,TX,76264,6.25,,,, +US-TX-76265,US,TX,76265,8.25,,,, +US-TX-76266,US,TX,76266,6.25,,,, +US-TX-76267,US,TX,76267,6.75,,,, +US-TX-76268,US,TX,76268,8.25,,,, +US-TX-76270,US,TX,76270,6.25,,,, +US-TX-76271,US,TX,76271,6.25,,,, +US-TX-76272,US,TX,76272,6.75,,,, +US-TX-76273,US,TX,76273,6.25,,,, +US-TX-76301,US,TX,76301,8.25,,,, +US-TX-76302,US,TX,76302,8.25,,,, +US-TX-76305,US,TX,76305,6.25,,,, +US-TX-76306,US,TX,76306,8.25,,,, +US-TX-76307,US,TX,76307,8.25,,,, +US-TX-76308,US,TX,76308,8.25,,,, +US-TX-76309,US,TX,76309,8.25,,,, +US-TX-76310,US,TX,76310,8.25,,,, +US-TX-76311,US,TX,76311,8.25,,,, +US-TX-76351,US,TX,76351,8.25,,,, +US-TX-76352,US,TX,76352,6.25,,,, +US-TX-76354,US,TX,76354,8.25,,,, +US-TX-76357,US,TX,76357,6.25,,,, +US-TX-76360,US,TX,76360,6.25,,,, +US-TX-76363,US,TX,76363,8.25,,,, +US-TX-76364,US,TX,76364,6.75,,,, +US-TX-76365,US,TX,76365,8.25,,,, +US-TX-76366,US,TX,76366,6.75,,,, +US-TX-76367,US,TX,76367,6.25,,,, +US-TX-76369,US,TX,76369,6.25,,,, +US-TX-76370,US,TX,76370,7.75,,,, +US-TX-76371,US,TX,76371,6.25,,,, +US-TX-76372,US,TX,76372,7.75,,,, +US-TX-76373,US,TX,76373,6.75,,,, +US-TX-76374,US,TX,76374,8.25,,,, +US-TX-76377,US,TX,76377,6.25,,,, +US-TX-76379,US,TX,76379,8.25,,,, +US-TX-76380,US,TX,76380,8.25,,,, +US-TX-76384,US,TX,76384,8.25,,,, +US-TX-76385,US,TX,76385,8.25,,,, +US-TX-76388,US,TX,76388,6.25,,,, +US-TX-76389,US,TX,76389,6.75,,,, +US-TX-76401,US,TX,76401,6.75,,,, +US-TX-76402,US,TX,76402,8.25,,,, +US-TX-76424,US,TX,76424,8.25,,,, +US-TX-76426,US,TX,76426,8.25,,,, +US-TX-76427,US,TX,76427,6.25,,,, +US-TX-76429,US,TX,76429,6.25,,,, +US-TX-76430,US,TX,76430,8.25,,,, +US-TX-76431,US,TX,76431,6.75,,,, +US-TX-76432,US,TX,76432,6.25,,,, +US-TX-76433,US,TX,76433,6.75,,,, +US-TX-76435,US,TX,76435,7.25,,,, +US-TX-76436,US,TX,76436,6.75,,,, +US-TX-76437,US,TX,76437,8.25,,,, +US-TX-76439,US,TX,76439,6.75,,,, +US-TX-76442,US,TX,76442,8.25,,,, +US-TX-76443,US,TX,76443,6.25,,,, +US-TX-76444,US,TX,76444,8.25,,,, +US-TX-76445,US,TX,76445,6.25,,,, +US-TX-76446,US,TX,76446,6.75,,,, +US-TX-76448,US,TX,76448,8.25,,,, +US-TX-76449,US,TX,76449,6.75,,,, +US-TX-76450,US,TX,76450,8.25,,,, +US-TX-76452,US,TX,76452,6.75,,,, +US-TX-76453,US,TX,76453,6.75,,,, +US-TX-76454,US,TX,76454,8.25,,,, +US-TX-76455,US,TX,76455,6.75,,,, +US-TX-76457,US,TX,76457,8.25,,,, +US-TX-76458,US,TX,76458,8.25,,,, +US-TX-76459,US,TX,76459,6.25,,,, +US-TX-76460,US,TX,76460,6.75,,,, +US-TX-76461,US,TX,76461,6.75,,,, +US-TX-76462,US,TX,76462,6.75,,,, +US-TX-76463,US,TX,76463,6.75,,,, +US-TX-76464,US,TX,76464,6.25,,,, +US-TX-76465,US,TX,76465,6.75,,,, +US-TX-76466,US,TX,76466,6.75,,,, +US-TX-76467,US,TX,76467,8.25,,,, +US-TX-76468,US,TX,76468,6.75,,,, +US-TX-76469,US,TX,76469,7.25,,,, +US-TX-76470,US,TX,76470,8.25,,,, +US-TX-76471,US,TX,76471,6.25,,,, +US-TX-76472,US,TX,76472,6.75,,,, +US-TX-76474,US,TX,76474,6.75,,,, +US-TX-76475,US,TX,76475,6.75,,,, +US-TX-76476,US,TX,76476,6.75,,,, +US-TX-76481,US,TX,76481,6.75,,,, +US-TX-76483,US,TX,76483,8.25,,,, +US-TX-76484,US,TX,76484,6.75,,,, +US-TX-76485,US,TX,76485,6.75,,,, +US-TX-76486,US,TX,76486,6.25,,,, +US-TX-76487,US,TX,76487,6.75,,,, +US-TX-76490,US,TX,76490,6.75,,,, +US-TX-76491,US,TX,76491,6.25,,,, +US-TX-76501,US,TX,76501,8.25,,,, +US-TX-76502,US,TX,76502,8.25,,,, +US-TX-76503,US,TX,76503,8.25,,,, +US-TX-76504,US,TX,76504,8.25,,,, +US-TX-76505,US,TX,76505,8.25,,,, +US-TX-76508,US,TX,76508,8.25,,,, +US-TX-76511,US,TX,76511,7.75,,,, +US-TX-76513,US,TX,76513,8.25,,,, +US-TX-76518,US,TX,76518,6.75,,,, +US-TX-76519,US,TX,76519,6.75,,,, +US-TX-76520,US,TX,76520,8.25,,,, +US-TX-76522,US,TX,76522,8.25,,,, +US-TX-76523,US,TX,76523,6.75,,,, +US-TX-76524,US,TX,76524,6.75,,,, +US-TX-76525,US,TX,76525,8.25,,,, +US-TX-76526,US,TX,76526,6.75,,,, +US-TX-76527,US,TX,76527,6.5,,,, +US-TX-76528,US,TX,76528,6.75,,,, +US-TX-76530,US,TX,76530,6.25,,,, +US-TX-76531,US,TX,76531,8.25,,,, +US-TX-76533,US,TX,76533,6.75,,,, +US-TX-76534,US,TX,76534,6.75,,,, +US-TX-76537,US,TX,76537,6.25,,,, +US-TX-76538,US,TX,76538,6.75,,,, +US-TX-76539,US,TX,76539,6.75,,,, +US-TX-76540,US,TX,76540,8.25,,,, +US-TX-76541,US,TX,76541,8.25,,,, +US-TX-76542,US,TX,76542,8.25,,,, +US-TX-76543,US,TX,76543,8.25,,,, +US-TX-76544,US,TX,76544,6.75,,,, +US-TX-76547,US,TX,76547,8.25,,,, +US-TX-76548,US,TX,76548,8.25,,,, +US-TX-76549,US,TX,76549,8.25,,,, +US-TX-76550,US,TX,76550,8.25,,,, +US-TX-76554,US,TX,76554,7.75,,,, +US-TX-76556,US,TX,76556,6.75,,,, +US-TX-76557,US,TX,76557,6.75,,,, +US-TX-76558,US,TX,76558,6.75,,,, +US-TX-76559,US,TX,76559,8.25,,,, +US-TX-76561,US,TX,76561,6.75,,,, +US-TX-76564,US,TX,76564,6.75,,,, +US-TX-76565,US,TX,76565,6.75,,,, +US-TX-76566,US,TX,76566,6.75,,,, +US-TX-76567,US,TX,76567,8.25,,,, +US-TX-76569,US,TX,76569,6.75,,,, +US-TX-76570,US,TX,76570,8.25,,,, +US-TX-76571,US,TX,76571,7.25,,,, +US-TX-76573,US,TX,76573,6.25,,,, +US-TX-76574,US,TX,76574,8.25,,,, +US-TX-76577,US,TX,76577,6.75,,,, +US-TX-76578,US,TX,76578,6.25,,,, +US-TX-76579,US,TX,76579,8.25,,,, +US-TX-76596,US,TX,76596,8.25,,,, +US-TX-76597,US,TX,76597,6.75,,,, +US-TX-76598,US,TX,76598,8.25,,,, +US-TX-76599,US,TX,76599,8.25,,,, +US-TX-76621,US,TX,76621,6.75,,,, +US-TX-76622,US,TX,76622,6.75,,,, +US-TX-76623,US,TX,76623,6.25,,,, +US-TX-76624,US,TX,76624,6.75,,,, +US-TX-76626,US,TX,76626,7.75,,,, +US-TX-76627,US,TX,76627,6.75,,,, +US-TX-76628,US,TX,76628,6.75,,,, +US-TX-76629,US,TX,76629,8.25,,,, +US-TX-76630,US,TX,76630,6.75,,,, +US-TX-76631,US,TX,76631,7.75,,,, +US-TX-76632,US,TX,76632,6.75,,,, +US-TX-76633,US,TX,76633,6.75,,,, +US-TX-76634,US,TX,76634,8.25,,,, +US-TX-76635,US,TX,76635,7.25,,,, +US-TX-76636,US,TX,76636,6.75,,,, +US-TX-76637,US,TX,76637,7.75,,,, +US-TX-76638,US,TX,76638,6.75,,,, +US-TX-76639,US,TX,76639,6.75,,,, +US-TX-76640,US,TX,76640,6.75,,,, +US-TX-76641,US,TX,76641,6.75,,,, +US-TX-76642,US,TX,76642,8.25,,,, +US-TX-76643,US,TX,76643,8.25,,,, +US-TX-76644,US,TX,76644,8.25,,,, +US-TX-76645,US,TX,76645,8.25,,,, +US-TX-76648,US,TX,76648,8.25,,,, +US-TX-76649,US,TX,76649,6.75,,,, +US-TX-76650,US,TX,76650,6.75,,,, +US-TX-76651,US,TX,76651,6.25,,,, +US-TX-76652,US,TX,76652,6.75,,,, +US-TX-76653,US,TX,76653,7.25,,,, +US-TX-76654,US,TX,76654,7.75,,,, +US-TX-76655,US,TX,76655,6.75,,,, +US-TX-76656,US,TX,76656,8.25,,,, +US-TX-76657,US,TX,76657,8.25,,,, +US-TX-76660,US,TX,76660,8.25,,,, +US-TX-76661,US,TX,76661,8.25,,,, +US-TX-76664,US,TX,76664,8,,,, +US-TX-76665,US,TX,76665,8.25,,,, +US-TX-76666,US,TX,76666,7.75,,,, +US-TX-76667,US,TX,76667,8.25,,,, +US-TX-76670,US,TX,76670,7.25,,,, +US-TX-76671,US,TX,76671,6.75,,,, +US-TX-76673,US,TX,76673,6.75,,,, +US-TX-76676,US,TX,76676,7.75,,,, +US-TX-76678,US,TX,76678,6.25,,,, +US-TX-76679,US,TX,76679,6.75,,,, +US-TX-76680,US,TX,76680,6.75,,,, +US-TX-76681,US,TX,76681,7.75,,,, +US-TX-76682,US,TX,76682,6.75,,,, +US-TX-76684,US,TX,76684,7.75,,,, +US-TX-76685,US,TX,76685,6.75,,,, +US-TX-76686,US,TX,76686,6.25,,,, +US-TX-76687,US,TX,76687,6.25,,,, +US-TX-76689,US,TX,76689,6.75,,,, +US-TX-76690,US,TX,76690,7.75,,,, +US-TX-76691,US,TX,76691,8.25,,,, +US-TX-76692,US,TX,76692,6.75,,,, +US-TX-76693,US,TX,76693,8.25,,,, +US-TX-76701,US,TX,76701,8.25,,,, +US-TX-76702,US,TX,76702,8.25,,,, +US-TX-76703,US,TX,76703,8.25,,,, +US-TX-76704,US,TX,76704,8.25,,,, +US-TX-76705,US,TX,76705,8.25,,,, +US-TX-76706,US,TX,76706,8.25,,,, +US-TX-76707,US,TX,76707,8.25,,,, +US-TX-76708,US,TX,76708,8.25,,,, +US-TX-76710,US,TX,76710,8.25,,,, +US-TX-76711,US,TX,76711,8.25,,,, +US-TX-76712,US,TX,76712,8.25,,,, +US-TX-76714,US,TX,76714,8.25,,,, +US-TX-76715,US,TX,76715,8.25,,,, +US-TX-76716,US,TX,76716,8.25,,,, +US-TX-76797,US,TX,76797,8.25,,,, +US-TX-76798,US,TX,76798,8.25,,,, +US-TX-76799,US,TX,76799,8.25,,,, +US-TX-76801,US,TX,76801,8.25,,,, +US-TX-76802,US,TX,76802,6.25,,,, +US-TX-76803,US,TX,76803,8.25,,,, +US-TX-76804,US,TX,76804,8.25,,,, +US-TX-76820,US,TX,76820,7.25,,,, +US-TX-76821,US,TX,76821,8.25,,,, +US-TX-76823,US,TX,76823,8.25,,,, +US-TX-76824,US,TX,76824,6.75,,,, +US-TX-76825,US,TX,76825,8.25,,,, +US-TX-76827,US,TX,76827,6.25,,,, +US-TX-76828,US,TX,76828,6.25,,,, +US-TX-76831,US,TX,76831,6.25,,,, +US-TX-76832,US,TX,76832,6.75,,,, +US-TX-76834,US,TX,76834,8.25,,,, +US-TX-76836,US,TX,76836,8.25,,,, +US-TX-76837,US,TX,76837,6.75,,,, +US-TX-76841,US,TX,76841,6.75,,,, +US-TX-76842,US,TX,76842,7.25,,,, +US-TX-76844,US,TX,76844,8.25,,,, +US-TX-76845,US,TX,76845,6.25,,,, +US-TX-76848,US,TX,76848,6.75,,,, +US-TX-76849,US,TX,76849,8.25,,,, +US-TX-76852,US,TX,76852,7,,,, +US-TX-76853,US,TX,76853,6.75,,,, +US-TX-76854,US,TX,76854,6.75,,,, +US-TX-76855,US,TX,76855,6.75,,,, +US-TX-76856,US,TX,76856,7.25,,,, +US-TX-76857,US,TX,76857,6.25,,,, +US-TX-76858,US,TX,76858,8,,,, +US-TX-76859,US,TX,76859,6.75,,,, +US-TX-76861,US,TX,76861,6.75,,,, +US-TX-76862,US,TX,76862,6.75,,,, +US-TX-76864,US,TX,76864,6.25,,,, +US-TX-76865,US,TX,76865,6.75,,,, +US-TX-76866,US,TX,76866,6.75,,,, +US-TX-76869,US,TX,76869,6.25,,,, +US-TX-76870,US,TX,76870,6.25,,,, +US-TX-76871,US,TX,76871,6.75,,,, +US-TX-76872,US,TX,76872,7,,,, +US-TX-76873,US,TX,76873,6.25,,,, +US-TX-76874,US,TX,76874,6.25,,,, +US-TX-76875,US,TX,76875,6.75,,,, +US-TX-76877,US,TX,76877,8.25,,,, +US-TX-76878,US,TX,76878,8.25,,,, +US-TX-76882,US,TX,76882,6.25,,,, +US-TX-76883,US,TX,76883,6.75,,,, +US-TX-76884,US,TX,76884,6.25,,,, +US-TX-76885,US,TX,76885,6.25,,,, +US-TX-76886,US,TX,76886,6.75,,,, +US-TX-76887,US,TX,76887,7,,,, +US-TX-76888,US,TX,76888,6.25,,,, +US-TX-76890,US,TX,76890,6.25,,,, +US-TX-76901,US,TX,76901,8.25,,,, +US-TX-76902,US,TX,76902,8.25,,,, +US-TX-76903,US,TX,76903,8.25,,,, +US-TX-76904,US,TX,76904,8.25,,,, +US-TX-76905,US,TX,76905,6.75,,,, +US-TX-76906,US,TX,76906,8.25,,,, +US-TX-76908,US,TX,76908,8.25,,,, +US-TX-76909,US,TX,76909,8.25,,,, +US-TX-76930,US,TX,76930,6.25,,,, +US-TX-76932,US,TX,76932,8.25,,,, +US-TX-76933,US,TX,76933,8.25,,,, +US-TX-76934,US,TX,76934,6.75,,,, +US-TX-76935,US,TX,76935,6.75,,,, +US-TX-76936,US,TX,76936,8.25,,,, +US-TX-76937,US,TX,76937,6.75,,,, +US-TX-76939,US,TX,76939,6.75,,,, +US-TX-76940,US,TX,76940,6.75,,,, +US-TX-76941,US,TX,76941,6.25,,,, +US-TX-76943,US,TX,76943,6.25,,,, +US-TX-76945,US,TX,76945,6.25,,,, +US-TX-76950,US,TX,76950,8,,,, +US-TX-76951,US,TX,76951,7.75,,,, +US-TX-76953,US,TX,76953,6.25,,,, +US-TX-76955,US,TX,76955,6.75,,,, +US-TX-76957,US,TX,76957,6.75,,,, +US-TX-76958,US,TX,76958,6.75,,,, +US-TX-77001,US,TX,77001,8.25,,,, +US-TX-77002,US,TX,77002,8.25,,,, +US-TX-77003,US,TX,77003,8.25,,,, +US-TX-77004,US,TX,77004,8.25,,,, +US-TX-77005,US,TX,77005,8.25,,,, +US-TX-77006,US,TX,77006,8.25,,,, +US-TX-77007,US,TX,77007,8.25,,,, +US-TX-77008,US,TX,77008,8.25,,,, +US-TX-77009,US,TX,77009,8.25,,,, +US-TX-77010,US,TX,77010,8.25,,,, +US-TX-77011,US,TX,77011,8.25,,,, +US-TX-77012,US,TX,77012,8.25,,,, +US-TX-77013,US,TX,77013,8.25,,,, +US-TX-77014,US,TX,77014,8.25,,,, +US-TX-77015,US,TX,77015,7.25,,,, +US-TX-77016,US,TX,77016,8.25,,,, +US-TX-77017,US,TX,77017,8.25,,,, +US-TX-77018,US,TX,77018,8.25,,,, +US-TX-77019,US,TX,77019,8.25,,,, +US-TX-77020,US,TX,77020,8.25,,,, +US-TX-77021,US,TX,77021,8.25,,,, +US-TX-77022,US,TX,77022,8.25,,,, +US-TX-77023,US,TX,77023,8.25,,,, +US-TX-77024,US,TX,77024,8.25,,,, +US-TX-77025,US,TX,77025,8.25,,,, +US-TX-77026,US,TX,77026,8.25,,,, +US-TX-77027,US,TX,77027,8.25,,,, +US-TX-77028,US,TX,77028,8.25,,,, +US-TX-77029,US,TX,77029,8.25,,,, +US-TX-77030,US,TX,77030,8.25,,,, +US-TX-77031,US,TX,77031,8.25,,,, +US-TX-77032,US,TX,77032,8.25,,,, +US-TX-77033,US,TX,77033,8.25,,,, +US-TX-77034,US,TX,77034,8.25,,,, +US-TX-77035,US,TX,77035,8.25,,,, +US-TX-77036,US,TX,77036,8.25,,,, +US-TX-77037,US,TX,77037,8.25,,,, +US-TX-77038,US,TX,77038,8.25,,,, +US-TX-77039,US,TX,77039,8.25,,,, +US-TX-77040,US,TX,77040,8.25,,,, +US-TX-77041,US,TX,77041,8.25,,,, +US-TX-77042,US,TX,77042,8.25,,,, +US-TX-77043,US,TX,77043,8.25,,,, +US-TX-77044,US,TX,77044,8.25,,,, +US-TX-77045,US,TX,77045,8.25,,,, +US-TX-77046,US,TX,77046,8.25,,,, +US-TX-77047,US,TX,77047,8.25,,,, +US-TX-77048,US,TX,77048,8.25,,,, +US-TX-77049,US,TX,77049,8.25,,,, +US-TX-77050,US,TX,77050,6.25,,,, +US-TX-77051,US,TX,77051,8.25,,,, +US-TX-77052,US,TX,77052,8.25,,,, +US-TX-77053,US,TX,77053,8.25,,,, +US-TX-77054,US,TX,77054,8.25,,,, +US-TX-77055,US,TX,77055,8.25,,,, +US-TX-77056,US,TX,77056,8.25,,,, +US-TX-77057,US,TX,77057,8.25,,,, +US-TX-77058,US,TX,77058,8.25,,,, +US-TX-77059,US,TX,77059,8.25,,,, +US-TX-77060,US,TX,77060,8.25,,,, +US-TX-77061,US,TX,77061,8.25,,,, +US-TX-77062,US,TX,77062,8.25,,,, +US-TX-77063,US,TX,77063,8.25,,,, +US-TX-77064,US,TX,77064,8.25,,,, +US-TX-77065,US,TX,77065,8.25,,,, +US-TX-77066,US,TX,77066,8.25,,,, +US-TX-77067,US,TX,77067,8.25,,,, +US-TX-77068,US,TX,77068,7.25,,,, +US-TX-77069,US,TX,77069,8.25,,,, +US-TX-77070,US,TX,77070,7.25,,,, +US-TX-77071,US,TX,77071,8.25,,,, +US-TX-77072,US,TX,77072,8.25,,,, +US-TX-77073,US,TX,77073,7.25,,,, +US-TX-77074,US,TX,77074,8.25,,,, +US-TX-77075,US,TX,77075,8.25,,,, +US-TX-77076,US,TX,77076,8.25,,,, +US-TX-77077,US,TX,77077,8.25,,,, +US-TX-77078,US,TX,77078,8.25,,,, +US-TX-77079,US,TX,77079,8.25,,,, +US-TX-77080,US,TX,77080,8.25,,,, +US-TX-77081,US,TX,77081,8.25,,,, +US-TX-77082,US,TX,77082,8.25,,,, +US-TX-77083,US,TX,77083,8.25,,,, +US-TX-77084,US,TX,77084,8.25,,,, +US-TX-77085,US,TX,77085,8.25,,,, +US-TX-77086,US,TX,77086,8.25,,,, +US-TX-77087,US,TX,77087,8.25,,,, +US-TX-77088,US,TX,77088,8.25,,,, +US-TX-77089,US,TX,77089,8.25,,,, +US-TX-77090,US,TX,77090,8.25,,,, +US-TX-77091,US,TX,77091,8.25,,,, +US-TX-77092,US,TX,77092,8.25,,,, +US-TX-77093,US,TX,77093,8.25,,,, +US-TX-77094,US,TX,77094,7.25,,,, +US-TX-77095,US,TX,77095,8.25,,,, +US-TX-77096,US,TX,77096,8.25,,,, +US-TX-77098,US,TX,77098,8.25,,,, +US-TX-77099,US,TX,77099,8.25,,,, +US-TX-77201,US,TX,77201,8.25,,,, +US-TX-77202,US,TX,77202,8.25,,,, +US-TX-77203,US,TX,77203,8.25,,,, +US-TX-77204,US,TX,77204,8.25,,,, +US-TX-77205,US,TX,77205,8.25,,,, +US-TX-77206,US,TX,77206,8.25,,,, +US-TX-77207,US,TX,77207,8.25,,,, +US-TX-77208,US,TX,77208,8.25,,,, +US-TX-77209,US,TX,77209,8.25,,,, +US-TX-77210,US,TX,77210,8.25,,,, +US-TX-77212,US,TX,77212,8.25,,,, +US-TX-77213,US,TX,77213,8.25,,,, +US-TX-77215,US,TX,77215,8.25,,,, +US-TX-77216,US,TX,77216,8.25,,,, +US-TX-77217,US,TX,77217,8.25,,,, +US-TX-77218,US,TX,77218,8.25,,,, +US-TX-77219,US,TX,77219,8.25,,,, +US-TX-77220,US,TX,77220,8.25,,,, +US-TX-77221,US,TX,77221,8.25,,,, +US-TX-77222,US,TX,77222,8.25,,,, +US-TX-77223,US,TX,77223,8.25,,,, +US-TX-77224,US,TX,77224,8.25,,,, +US-TX-77225,US,TX,77225,8.25,,,, +US-TX-77226,US,TX,77226,8.25,,,, +US-TX-77227,US,TX,77227,8.25,,,, +US-TX-77228,US,TX,77228,8.25,,,, +US-TX-77229,US,TX,77229,8.25,,,, +US-TX-77230,US,TX,77230,8.25,,,, +US-TX-77231,US,TX,77231,8.25,,,, +US-TX-77233,US,TX,77233,8.25,,,, +US-TX-77234,US,TX,77234,8.25,,,, +US-TX-77235,US,TX,77235,8.25,,,, +US-TX-77236,US,TX,77236,8.25,,,, +US-TX-77237,US,TX,77237,8.25,,,, +US-TX-77238,US,TX,77238,8.25,,,, +US-TX-77240,US,TX,77240,8.25,,,, +US-TX-77241,US,TX,77241,8.25,,,, +US-TX-77242,US,TX,77242,8.25,,,, +US-TX-77243,US,TX,77243,8.25,,,, +US-TX-77244,US,TX,77244,8.25,,,, +US-TX-77245,US,TX,77245,8.25,,,, +US-TX-77248,US,TX,77248,8.25,,,, +US-TX-77249,US,TX,77249,8.25,,,, +US-TX-77251,US,TX,77251,8.25,,,, +US-TX-77252,US,TX,77252,8.25,,,, +US-TX-77253,US,TX,77253,8.25,,,, +US-TX-77254,US,TX,77254,8.25,,,, +US-TX-77255,US,TX,77255,8.25,,,, +US-TX-77256,US,TX,77256,8.25,,,, +US-TX-77257,US,TX,77257,8.25,,,, +US-TX-77258,US,TX,77258,8.25,,,, +US-TX-77259,US,TX,77259,8.25,,,, +US-TX-77261,US,TX,77261,8.25,,,, +US-TX-77262,US,TX,77262,8.25,,,, +US-TX-77263,US,TX,77263,8.25,,,, +US-TX-77265,US,TX,77265,8.25,,,, +US-TX-77266,US,TX,77266,8.25,,,, +US-TX-77267,US,TX,77267,8.25,,,, +US-TX-77268,US,TX,77268,8.25,,,, +US-TX-77269,US,TX,77269,8.25,,,, +US-TX-77270,US,TX,77270,8.25,,,, +US-TX-77271,US,TX,77271,8.25,,,, +US-TX-77272,US,TX,77272,8.25,,,, +US-TX-77273,US,TX,77273,8.25,,,, +US-TX-77274,US,TX,77274,8.25,,,, +US-TX-77275,US,TX,77275,8.25,,,, +US-TX-77277,US,TX,77277,8.25,,,, +US-TX-77279,US,TX,77279,8.25,,,, +US-TX-77280,US,TX,77280,8.25,,,, +US-TX-77282,US,TX,77282,8.25,,,, +US-TX-77284,US,TX,77284,8.25,,,, +US-TX-77287,US,TX,77287,8.25,,,, +US-TX-77288,US,TX,77288,8.25,,,, +US-TX-77289,US,TX,77289,8.25,,,, +US-TX-77290,US,TX,77290,8.25,,,, +US-TX-77291,US,TX,77291,8.25,,,, +US-TX-77292,US,TX,77292,8.25,,,, +US-TX-77293,US,TX,77293,8.25,,,, +US-TX-77297,US,TX,77297,8.25,,,, +US-TX-77299,US,TX,77299,8.25,,,, +US-TX-77301,US,TX,77301,8.25,,,, +US-TX-77302,US,TX,77302,8.25,,,, +US-TX-77303,US,TX,77303,8.25,,,, +US-TX-77304,US,TX,77304,8.25,,,, +US-TX-77305,US,TX,77305,8.25,,,, +US-TX-77306,US,TX,77306,8.25,,,, +US-TX-77315,US,TX,77315,8.25,,,, +US-TX-77316,US,TX,77316,8.25,,,, +US-TX-77318,US,TX,77318,8.25,,,, +US-TX-77320,US,TX,77320,6.75,,,, +US-TX-77325,US,TX,77325,8.25,,,, +US-TX-77326,US,TX,77326,6.75,,,, +US-TX-77327,US,TX,77327,6.75,,,, +US-TX-77328,US,TX,77328,7.25,,,, +US-TX-77331,US,TX,77331,7.25,,,, +US-TX-77332,US,TX,77332,6.75,,,, +US-TX-77333,US,TX,77333,6.25,,,, +US-TX-77334,US,TX,77334,6.75,,,, +US-TX-77335,US,TX,77335,6.75,,,, +US-TX-77336,US,TX,77336,8.25,,,, +US-TX-77337,US,TX,77337,8.25,,,, +US-TX-77338,US,TX,77338,8.25,,,, +US-TX-77339,US,TX,77339,8.25,,,, +US-TX-77340,US,TX,77340,8.25,,,, +US-TX-77341,US,TX,77341,8.25,,,, +US-TX-77342,US,TX,77342,8.25,,,, +US-TX-77343,US,TX,77343,8.25,,,, +US-TX-77344,US,TX,77344,8.25,,,, +US-TX-77345,US,TX,77345,8.25,,,, +US-TX-77346,US,TX,77346,7.25,,,, +US-TX-77347,US,TX,77347,8.25,,,, +US-TX-77348,US,TX,77348,8.25,,,, +US-TX-77349,US,TX,77349,8.25,,,, +US-TX-77350,US,TX,77350,6.75,,,, +US-TX-77351,US,TX,77351,6.75,,,, +US-TX-77353,US,TX,77353,8.25,,,, +US-TX-77354,US,TX,77354,6.25,,,, +US-TX-77355,US,TX,77355,6.25,,,, +US-TX-77356,US,TX,77356,6.25,,,, +US-TX-77357,US,TX,77357,8.25,,,, +US-TX-77358,US,TX,77358,7.25,,,, +US-TX-77359,US,TX,77359,7.25,,,, +US-TX-77360,US,TX,77360,6.75,,,, +US-TX-77362,US,TX,77362,6.25,,,, +US-TX-77363,US,TX,77363,6.75,,,, +US-TX-77364,US,TX,77364,7.25,,,, +US-TX-77365,US,TX,77365,8.25,,,, +US-TX-77367,US,TX,77367,8.25,,,, +US-TX-77368,US,TX,77368,6.75,,,, +US-TX-77369,US,TX,77369,6.75,,,, +US-TX-77371,US,TX,77371,7.25,,,, +US-TX-77372,US,TX,77372,7.75,,,, +US-TX-77373,US,TX,77373,8.25,,,, +US-TX-77374,US,TX,77374,6.25,,,, +US-TX-77375,US,TX,77375,8.25,,,, +US-TX-77376,US,TX,77376,6.25,,,, +US-TX-77377,US,TX,77377,7.25,,,, +US-TX-77378,US,TX,77378,8.25,,,, +US-TX-77379,US,TX,77379,7.25,,,, +US-TX-77380,US,TX,77380,8.25,,,, +US-TX-77381,US,TX,77381,8.25,,,, +US-TX-77382,US,TX,77382,8.25,,,, +US-TX-77383,US,TX,77383,8.25,,,, +US-TX-77384,US,TX,77384,8.25,,,, +US-TX-77385,US,TX,77385,7.75,,,, +US-TX-77386,US,TX,77386,7.25,,,, +US-TX-77387,US,TX,77387,8.25,,,, +US-TX-77388,US,TX,77388,8.25,,,, +US-TX-77389,US,TX,77389,8.25,,,, +US-TX-77391,US,TX,77391,8.25,,,, +US-TX-77393,US,TX,77393,8.25,,,, +US-TX-77396,US,TX,77396,7.25,,,, +US-TX-77399,US,TX,77399,6.75,,,, +US-TX-77401,US,TX,77401,8.25,,,, +US-TX-77402,US,TX,77402,8.25,,,, +US-TX-77404,US,TX,77404,8.25,,,, +US-TX-77406,US,TX,77406,6.25,,,, +US-TX-77407,US,TX,77407,7.25,,,, +US-TX-77410,US,TX,77410,8.25,,,, +US-TX-77411,US,TX,77411,8.25,,,, +US-TX-77412,US,TX,77412,7.25,,,, +US-TX-77413,US,TX,77413,7.25,,,, +US-TX-77414,US,TX,77414,8.25,,,, +US-TX-77415,US,TX,77415,6.25,,,, +US-TX-77417,US,TX,77417,6.25,,,, +US-TX-77418,US,TX,77418,6.75,,,, +US-TX-77419,US,TX,77419,6.25,,,, +US-TX-77420,US,TX,77420,6.75,,,, +US-TX-77422,US,TX,77422,6.75,,,, +US-TX-77423,US,TX,77423,6.25,,,, +US-TX-77426,US,TX,77426,6.75,,,, +US-TX-77428,US,TX,77428,6.25,,,, +US-TX-77429,US,TX,77429,8.25,,,, +US-TX-77430,US,TX,77430,6.75,,,, +US-TX-77431,US,TX,77431,6.75,,,, +US-TX-77432,US,TX,77432,6.75,,,, +US-TX-77433,US,TX,77433,8.25,,,, +US-TX-77434,US,TX,77434,8.25,,,, +US-TX-77435,US,TX,77435,6.75,,,, +US-TX-77436,US,TX,77436,6.75,,,, +US-TX-77437,US,TX,77437,8.25,,,, +US-TX-77440,US,TX,77440,6.25,,,, +US-TX-77441,US,TX,77441,6.25,,,, +US-TX-77442,US,TX,77442,7.25,,,, +US-TX-77443,US,TX,77443,6.75,,,, +US-TX-77444,US,TX,77444,6.25,,,, +US-TX-77445,US,TX,77445,6.25,,,, +US-TX-77446,US,TX,77446,8.25,,,, +US-TX-77447,US,TX,77447,6.25,,,, +US-TX-77448,US,TX,77448,6.75,,,, +US-TX-77449,US,TX,77449,8.25,,,, +US-TX-77450,US,TX,77450,7.25,,,, +US-TX-77451,US,TX,77451,7.25,,,, +US-TX-77452,US,TX,77452,6.75,,,, +US-TX-77453,US,TX,77453,6.75,,,, +US-TX-77454,US,TX,77454,6.75,,,, +US-TX-77455,US,TX,77455,6.75,,,, +US-TX-77456,US,TX,77456,6.25,,,, +US-TX-77457,US,TX,77457,6.25,,,, +US-TX-77458,US,TX,77458,6.25,,,, +US-TX-77459,US,TX,77459,8.25,,,, +US-TX-77460,US,TX,77460,7.25,,,, +US-TX-77461,US,TX,77461,6.25,,,, +US-TX-77463,US,TX,77463,6.75,,,, +US-TX-77464,US,TX,77464,8.25,,,, +US-TX-77465,US,TX,77465,8.25,,,, +US-TX-77466,US,TX,77466,7.25,,,, +US-TX-77467,US,TX,77467,6.75,,,, +US-TX-77468,US,TX,77468,6.25,,,, +US-TX-77469,US,TX,77469,6.25,,,, +US-TX-77470,US,TX,77470,6.75,,,, +US-TX-77471,US,TX,77471,8.25,,,, +US-TX-77473,US,TX,77473,8.25,,,, +US-TX-77474,US,TX,77474,6.75,,,, +US-TX-77475,US,TX,77475,7.25,,,, +US-TX-77476,US,TX,77476,8.25,,,, +US-TX-77477,US,TX,77477,8.25,,,, +US-TX-77478,US,TX,77478,8.25,,,, +US-TX-77479,US,TX,77479,8.25,,,, +US-TX-77480,US,TX,77480,6.75,,,, +US-TX-77481,US,TX,77481,6.25,,,, +US-TX-77482,US,TX,77482,6.25,,,, +US-TX-77483,US,TX,77483,6.25,,,, +US-TX-77484,US,TX,77484,6.25,,,, +US-TX-77485,US,TX,77485,6.75,,,, +US-TX-77486,US,TX,77486,6.75,,,, +US-TX-77487,US,TX,77487,8.25,,,, +US-TX-77488,US,TX,77488,8.25,,,, +US-TX-77489,US,TX,77489,8.25,,,, +US-TX-77491,US,TX,77491,8.25,,,, +US-TX-77492,US,TX,77492,8.25,,,, +US-TX-77493,US,TX,77493,8.25,,,, +US-TX-77494,US,TX,77494,6.25,,,, +US-TX-77496,US,TX,77496,8.25,,,, +US-TX-77497,US,TX,77497,8.25,,,, +US-TX-77498,US,TX,77498,6.25,,,, +US-TX-77501,US,TX,77501,8.25,,,, +US-TX-77502,US,TX,77502,8.25,,,, +US-TX-77503,US,TX,77503,8.25,,,, +US-TX-77504,US,TX,77504,8.25,,,, +US-TX-77505,US,TX,77505,8.25,,,, +US-TX-77506,US,TX,77506,8.25,,,, +US-TX-77507,US,TX,77507,6.25,,,, +US-TX-77508,US,TX,77508,8.25,,,, +US-TX-77510,US,TX,77510,8.25,,,, +US-TX-77511,US,TX,77511,8.25,,,, +US-TX-77512,US,TX,77512,8.25,,,, +US-TX-77514,US,TX,77514,6.75,,,, +US-TX-77515,US,TX,77515,8.25,,,, +US-TX-77516,US,TX,77516,8.25,,,, +US-TX-77517,US,TX,77517,6.25,,,, +US-TX-77518,US,TX,77518,6.25,,,, +US-TX-77519,US,TX,77519,6.25,,,, +US-TX-77520,US,TX,77520,8.25,,,, +US-TX-77521,US,TX,77521,8.25,,,, +US-TX-77522,US,TX,77522,8.25,,,, +US-TX-77523,US,TX,77523,6.75,,,, +US-TX-77530,US,TX,77530,7.25,,,, +US-TX-77531,US,TX,77531,8.25,,,, +US-TX-77532,US,TX,77532,8.25,,,, +US-TX-77533,US,TX,77533,7.75,,,, +US-TX-77534,US,TX,77534,7.75,,,, +US-TX-77535,US,TX,77535,6.75,,,, +US-TX-77536,US,TX,77536,7.75,,,, +US-TX-77538,US,TX,77538,6.75,,,, +US-TX-77539,US,TX,77539,8.25,,,, +US-TX-77541,US,TX,77541,8.25,,,, +US-TX-77542,US,TX,77542,8.25,,,, +US-TX-77545,US,TX,77545,6.25,,,, +US-TX-77546,US,TX,77546,7.75,,,, +US-TX-77547,US,TX,77547,7.25,,,, +US-TX-77549,US,TX,77549,7.75,,,, +US-TX-77550,US,TX,77550,8.25,,,, +US-TX-77551,US,TX,77551,8.25,,,, +US-TX-77552,US,TX,77552,8.25,,,, +US-TX-77553,US,TX,77553,8.25,,,, +US-TX-77554,US,TX,77554,8.25,,,, +US-TX-77555,US,TX,77555,8.25,,,, +US-TX-77560,US,TX,77560,6.75,,,, +US-TX-77561,US,TX,77561,7.75,,,, +US-TX-77562,US,TX,77562,8.25,,,, +US-TX-77563,US,TX,77563,8.25,,,, +US-TX-77564,US,TX,77564,6.75,,,, +US-TX-77565,US,TX,77565,8.25,,,, +US-TX-77566,US,TX,77566,8.25,,,, +US-TX-77568,US,TX,77568,8.25,,,, +US-TX-77571,US,TX,77571,8.25,,,, +US-TX-77572,US,TX,77572,8.25,,,, +US-TX-77573,US,TX,77573,8,,,, +US-TX-77574,US,TX,77574,8,,,, +US-TX-77575,US,TX,77575,8.25,,,, +US-TX-77577,US,TX,77577,6.75,,,, +US-TX-77578,US,TX,77578,8.25,,,, +US-TX-77580,US,TX,77580,8.25,,,, +US-TX-77581,US,TX,77581,8.25,,,, +US-TX-77582,US,TX,77582,6.75,,,, +US-TX-77583,US,TX,77583,6.75,,,, +US-TX-77584,US,TX,77584,8.25,,,, +US-TX-77585,US,TX,77585,6.25,,,, +US-TX-77586,US,TX,77586,8.25,,,, +US-TX-77587,US,TX,77587,8.25,,,, +US-TX-77588,US,TX,77588,8.25,,,, +US-TX-77590,US,TX,77590,8.25,,,, +US-TX-77591,US,TX,77591,8.25,,,, +US-TX-77592,US,TX,77592,8.25,,,, +US-TX-77597,US,TX,77597,6.75,,,, +US-TX-77598,US,TX,77598,8.25,,,, +US-TX-77611,US,TX,77611,8.25,,,, +US-TX-77612,US,TX,77612,6.25,,,, +US-TX-77613,US,TX,77613,8.25,,,, +US-TX-77614,US,TX,77614,6.25,,,, +US-TX-77615,US,TX,77615,6.25,,,, +US-TX-77616,US,TX,77616,6.75,,,, +US-TX-77617,US,TX,77617,6.25,,,, +US-TX-77619,US,TX,77619,8.25,,,, +US-TX-77622,US,TX,77622,6.75,,,, +US-TX-77623,US,TX,77623,6.25,,,, +US-TX-77624,US,TX,77624,6.75,,,, +US-TX-77625,US,TX,77625,6.25,,,, +US-TX-77626,US,TX,77626,6.75,,,, +US-TX-77627,US,TX,77627,8.25,,,, +US-TX-77629,US,TX,77629,7.75,,,, +US-TX-77630,US,TX,77630,8.25,,,, +US-TX-77631,US,TX,77631,8.25,,,, +US-TX-77632,US,TX,77632,6.75,,,, +US-TX-77639,US,TX,77639,6.75,,,, +US-TX-77640,US,TX,77640,8.25,,,, +US-TX-77641,US,TX,77641,8.25,,,, +US-TX-77642,US,TX,77642,8.25,,,, +US-TX-77643,US,TX,77643,8.25,,,, +US-TX-77650,US,TX,77650,6.25,,,, +US-TX-77651,US,TX,77651,8.25,,,, +US-TX-77655,US,TX,77655,8.25,,,, +US-TX-77656,US,TX,77656,6.25,,,, +US-TX-77657,US,TX,77657,8.25,,,, +US-TX-77659,US,TX,77659,6.25,,,, +US-TX-77660,US,TX,77660,6.75,,,, +US-TX-77661,US,TX,77661,8.125,,,, +US-TX-77662,US,TX,77662,6.75,,,, +US-TX-77663,US,TX,77663,6.25,,,, +US-TX-77664,US,TX,77664,6.75,,,, +US-TX-77665,US,TX,77665,8.125,,,, +US-TX-77670,US,TX,77670,8.25,,,, +US-TX-77701,US,TX,77701,8.25,,,, +US-TX-77702,US,TX,77702,8.25,,,, +US-TX-77703,US,TX,77703,8.25,,,, +US-TX-77704,US,TX,77704,8.25,,,, +US-TX-77705,US,TX,77705,8.25,,,, +US-TX-77706,US,TX,77706,8.25,,,, +US-TX-77707,US,TX,77707,8.25,,,, +US-TX-77708,US,TX,77708,8.25,,,, +US-TX-77709,US,TX,77709,8.25,,,, +US-TX-77710,US,TX,77710,8.25,,,, +US-TX-77713,US,TX,77713,6.75,,,, +US-TX-77720,US,TX,77720,8.25,,,, +US-TX-77725,US,TX,77725,8.25,,,, +US-TX-77726,US,TX,77726,8.25,,,, +US-TX-77801,US,TX,77801,8.25,,,, +US-TX-77802,US,TX,77802,8.25,,,, +US-TX-77803,US,TX,77803,8.25,,,, +US-TX-77805,US,TX,77805,8.25,,,, +US-TX-77806,US,TX,77806,8.25,,,, +US-TX-77807,US,TX,77807,6.75,,,, +US-TX-77808,US,TX,77808,6.75,,,, +US-TX-77830,US,TX,77830,6.75,,,, +US-TX-77831,US,TX,77831,6.75,,,, +US-TX-77833,US,TX,77833,6.75,,,, +US-TX-77834,US,TX,77834,8.25,,,, +US-TX-77835,US,TX,77835,6.75,,,, +US-TX-77836,US,TX,77836,6.75,,,, +US-TX-77837,US,TX,77837,6.25,,,, +US-TX-77838,US,TX,77838,6.75,,,, +US-TX-77840,US,TX,77840,8.25,,,, +US-TX-77841,US,TX,77841,8.25,,,, +US-TX-77842,US,TX,77842,8.25,,,, +US-TX-77843,US,TX,77843,8.25,,,, +US-TX-77844,US,TX,77844,8.25,,,, +US-TX-77845,US,TX,77845,8.25,,,, +US-TX-77850,US,TX,77850,6.75,,,, +US-TX-77852,US,TX,77852,6.75,,,, +US-TX-77853,US,TX,77853,6.75,,,, +US-TX-77855,US,TX,77855,6.75,,,, +US-TX-77856,US,TX,77856,6.25,,,, +US-TX-77857,US,TX,77857,6.75,,,, +US-TX-77859,US,TX,77859,8.25,,,, +US-TX-77861,US,TX,77861,6.75,,,, +US-TX-77862,US,TX,77862,7.75,,,, +US-TX-77863,US,TX,77863,6.75,,,, +US-TX-77864,US,TX,77864,6.75,,,, +US-TX-77865,US,TX,77865,6.75,,,, +US-TX-77866,US,TX,77866,6.75,,,, +US-TX-77867,US,TX,77867,6.25,,,, +US-TX-77868,US,TX,77868,6.75,,,, +US-TX-77870,US,TX,77870,6.25,,,, +US-TX-77871,US,TX,77871,6.75,,,, +US-TX-77872,US,TX,77872,6.75,,,, +US-TX-77873,US,TX,77873,6.25,,,, +US-TX-77875,US,TX,77875,8,,,, +US-TX-77876,US,TX,77876,6.75,,,, +US-TX-77878,US,TX,77878,8.25,,,, +US-TX-77879,US,TX,77879,6.75,,,, +US-TX-77880,US,TX,77880,6.75,,,, +US-TX-77881,US,TX,77881,8.25,,,, +US-TX-77882,US,TX,77882,6.25,,,, +US-TX-77901,US,TX,77901,8.25,,,, +US-TX-77902,US,TX,77902,8.25,,,, +US-TX-77903,US,TX,77903,8.25,,,, +US-TX-77904,US,TX,77904,8.25,,,, +US-TX-77905,US,TX,77905,6.75,,,, +US-TX-77950,US,TX,77950,7.25,,,, +US-TX-77951,US,TX,77951,6.75,,,, +US-TX-77954,US,TX,77954,8.25,,,, +US-TX-77957,US,TX,77957,8.25,,,, +US-TX-77960,US,TX,77960,6.25,,,, +US-TX-77961,US,TX,77961,7.75,,,, +US-TX-77962,US,TX,77962,6.75,,,, +US-TX-77963,US,TX,77963,6.25,,,, +US-TX-77964,US,TX,77964,6.25,,,, +US-TX-77967,US,TX,77967,8.25,,,, +US-TX-77968,US,TX,77968,6.75,,,, +US-TX-77969,US,TX,77969,6.75,,,, +US-TX-77970,US,TX,77970,7.75,,,, +US-TX-77971,US,TX,77971,6.75,,,, +US-TX-77973,US,TX,77973,6.75,,,, +US-TX-77974,US,TX,77974,6.25,,,, +US-TX-77975,US,TX,77975,6.25,,,, +US-TX-77976,US,TX,77976,6.75,,,, +US-TX-77977,US,TX,77977,6.75,,,, +US-TX-77978,US,TX,77978,8.25,,,, +US-TX-77979,US,TX,77979,8.25,,,, +US-TX-77982,US,TX,77982,6.75,,,, +US-TX-77983,US,TX,77983,8.25,,,, +US-TX-77984,US,TX,77984,6.25,,,, +US-TX-77986,US,TX,77986,6.25,,,, +US-TX-77987,US,TX,77987,6.25,,,, +US-TX-77988,US,TX,77988,6.75,,,, +US-TX-77989,US,TX,77989,6.25,,,, +US-TX-77990,US,TX,77990,6.25,,,, +US-TX-77991,US,TX,77991,6.75,,,, +US-TX-77993,US,TX,77993,6.25,,,, +US-TX-77994,US,TX,77994,6.25,,,, +US-TX-77995,US,TX,77995,6.25,,,, +US-TX-78001,US,TX,78001,8.25,,,, +US-TX-78002,US,TX,78002,6.75,,,, +US-TX-78003,US,TX,78003,6.75,,,, +US-TX-78004,US,TX,78004,6.75,,,, +US-TX-78005,US,TX,78005,6.75,,,, +US-TX-78006,US,TX,78006,6.75,,,, +US-TX-78007,US,TX,78007,6.25,,,, +US-TX-78008,US,TX,78008,6.75,,,, +US-TX-78009,US,TX,78009,8.25,,,, +US-TX-78010,US,TX,78010,6.75,,,, +US-TX-78011,US,TX,78011,6.75,,,, +US-TX-78012,US,TX,78012,6.75,,,, +US-TX-78013,US,TX,78013,6.75,,,, +US-TX-78014,US,TX,78014,8.25,,,, +US-TX-78015,US,TX,78015,8.25,,,, +US-TX-78016,US,TX,78016,6.75,,,, +US-TX-78017,US,TX,78017,8.25,,,, +US-TX-78019,US,TX,78019,8.25,,,, +US-TX-78021,US,TX,78021,6.25,,,, +US-TX-78022,US,TX,78022,6.75,,,, +US-TX-78023,US,TX,78023,7.75,,,, +US-TX-78024,US,TX,78024,6.75,,,, +US-TX-78025,US,TX,78025,6.75,,,, +US-TX-78026,US,TX,78026,8.25,,,, +US-TX-78027,US,TX,78027,6.75,,,, +US-TX-78028,US,TX,78028,8.25,,,, +US-TX-78029,US,TX,78029,8.25,,,, +US-TX-78039,US,TX,78039,6.75,,,, +US-TX-78040,US,TX,78040,8.25,,,, +US-TX-78041,US,TX,78041,8.25,,,, +US-TX-78042,US,TX,78042,8.25,,,, +US-TX-78043,US,TX,78043,8.25,,,, +US-TX-78044,US,TX,78044,8.25,,,, +US-TX-78045,US,TX,78045,8.25,,,, +US-TX-78046,US,TX,78046,8.25,,,, +US-TX-78049,US,TX,78049,8.25,,,, +US-TX-78050,US,TX,78050,6.75,,,, +US-TX-78052,US,TX,78052,6.75,,,, +US-TX-78054,US,TX,78054,6.75,,,, +US-TX-78055,US,TX,78055,6.75,,,, +US-TX-78056,US,TX,78056,6.75,,,, +US-TX-78057,US,TX,78057,6.75,,,, +US-TX-78058,US,TX,78058,6.75,,,, +US-TX-78059,US,TX,78059,6.75,,,, +US-TX-78061,US,TX,78061,8.25,,,, +US-TX-78062,US,TX,78062,6.75,,,, +US-TX-78063,US,TX,78063,6.75,,,, +US-TX-78064,US,TX,78064,8.25,,,, +US-TX-78065,US,TX,78065,6.75,,,, +US-TX-78066,US,TX,78066,6.75,,,, +US-TX-78067,US,TX,78067,6.25,,,, +US-TX-78069,US,TX,78069,6.75,,,, +US-TX-78070,US,TX,78070,8.25,,,, +US-TX-78071,US,TX,78071,6.75,,,, +US-TX-78072,US,TX,78072,6.25,,,, +US-TX-78073,US,TX,78073,6.75,,,, +US-TX-78074,US,TX,78074,6.75,,,, +US-TX-78075,US,TX,78075,6.75,,,, +US-TX-78076,US,TX,78076,6.25,,,, +US-TX-78101,US,TX,78101,6.75,,,, +US-TX-78102,US,TX,78102,8.25,,,, +US-TX-78104,US,TX,78104,8.25,,,, +US-TX-78107,US,TX,78107,6.25,,,, +US-TX-78108,US,TX,78108,8.25,,,, +US-TX-78109,US,TX,78109,8.25,,,, +US-TX-78111,US,TX,78111,6.75,,,, +US-TX-78112,US,TX,78112,6.75,,,, +US-TX-78113,US,TX,78113,6.75,,,, +US-TX-78114,US,TX,78114,6.25,,,, +US-TX-78115,US,TX,78115,8.25,,,, +US-TX-78116,US,TX,78116,6.75,,,, +US-TX-78117,US,TX,78117,6.75,,,, +US-TX-78118,US,TX,78118,8.25,,,, +US-TX-78119,US,TX,78119,8.25,,,, +US-TX-78121,US,TX,78121,6.25,,,, +US-TX-78122,US,TX,78122,6.75,,,, +US-TX-78123,US,TX,78123,6.75,,,, +US-TX-78124,US,TX,78124,6.75,,,, +US-TX-78125,US,TX,78125,6.75,,,, +US-TX-78130,US,TX,78130,8.25,,,, +US-TX-78131,US,TX,78131,8.25,,,, +US-TX-78132,US,TX,78132,6.75,,,, +US-TX-78133,US,TX,78133,8.25,,,, +US-TX-78135,US,TX,78135,8.25,,,, +US-TX-78140,US,TX,78140,8.25,,,, +US-TX-78141,US,TX,78141,6.25,,,, +US-TX-78142,US,TX,78142,6.75,,,, +US-TX-78143,US,TX,78143,6.25,,,, +US-TX-78144,US,TX,78144,6.75,,,, +US-TX-78145,US,TX,78145,6.75,,,, +US-TX-78146,US,TX,78146,6.75,,,, +US-TX-78147,US,TX,78147,8,,,, +US-TX-78148,US,TX,78148,8.25,,,, +US-TX-78150,US,TX,78150,6.75,,,, +US-TX-78151,US,TX,78151,6.75,,,, +US-TX-78152,US,TX,78152,7.75,,,, +US-TX-78154,US,TX,78154,8.25,,,, +US-TX-78155,US,TX,78155,8.25,,,, +US-TX-78156,US,TX,78156,8.25,,,, +US-TX-78159,US,TX,78159,6.75,,,, +US-TX-78160,US,TX,78160,6.25,,,, +US-TX-78161,US,TX,78161,6.25,,,, +US-TX-78162,US,TX,78162,6.75,,,, +US-TX-78163,US,TX,78163,8.25,,,, +US-TX-78164,US,TX,78164,6.25,,,, +US-TX-78201,US,TX,78201,8.25,,,, +US-TX-78202,US,TX,78202,8.25,,,, +US-TX-78203,US,TX,78203,8.25,,,, +US-TX-78204,US,TX,78204,8.25,,,, +US-TX-78205,US,TX,78205,8.25,,,, +US-TX-78206,US,TX,78206,8.25,,,, +US-TX-78207,US,TX,78207,8.25,,,, +US-TX-78208,US,TX,78208,8.25,,,, +US-TX-78209,US,TX,78209,8.25,,,, +US-TX-78210,US,TX,78210,8.25,,,, +US-TX-78211,US,TX,78211,8.25,,,, +US-TX-78212,US,TX,78212,8.25,,,, +US-TX-78213,US,TX,78213,8.25,,,, +US-TX-78214,US,TX,78214,8.25,,,, +US-TX-78215,US,TX,78215,8.25,,,, +US-TX-78216,US,TX,78216,8.25,,,, +US-TX-78217,US,TX,78217,8.25,,,, +US-TX-78218,US,TX,78218,8.25,,,, +US-TX-78219,US,TX,78219,8.25,,,, +US-TX-78220,US,TX,78220,8.25,,,, +US-TX-78221,US,TX,78221,8.25,,,, +US-TX-78222,US,TX,78222,8.25,,,, +US-TX-78223,US,TX,78223,8.25,,,, +US-TX-78224,US,TX,78224,8.25,,,, +US-TX-78225,US,TX,78225,8.25,,,, +US-TX-78226,US,TX,78226,8.25,,,, +US-TX-78227,US,TX,78227,8.25,,,, +US-TX-78228,US,TX,78228,8.25,,,, +US-TX-78229,US,TX,78229,8.25,,,, +US-TX-78230,US,TX,78230,8.25,,,, +US-TX-78231,US,TX,78231,8.25,,,, +US-TX-78232,US,TX,78232,8.25,,,, +US-TX-78233,US,TX,78233,8.25,,,, +US-TX-78234,US,TX,78234,8.25,,,, +US-TX-78235,US,TX,78235,8.25,,,, +US-TX-78236,US,TX,78236,6.75,,,, +US-TX-78237,US,TX,78237,8.25,,,, +US-TX-78238,US,TX,78238,8.25,,,, +US-TX-78239,US,TX,78239,6.75,,,, +US-TX-78240,US,TX,78240,8.25,,,, +US-TX-78241,US,TX,78241,8.25,,,, +US-TX-78242,US,TX,78242,8.25,,,, +US-TX-78243,US,TX,78243,6.75,,,, +US-TX-78244,US,TX,78244,6.75,,,, +US-TX-78245,US,TX,78245,8.25,,,, +US-TX-78246,US,TX,78246,8.25,,,, +US-TX-78247,US,TX,78247,8.25,,,, +US-TX-78248,US,TX,78248,8.25,,,, +US-TX-78249,US,TX,78249,8.25,,,, +US-TX-78250,US,TX,78250,8.25,,,, +US-TX-78251,US,TX,78251,8.25,,,, +US-TX-78252,US,TX,78252,6.75,,,, +US-TX-78253,US,TX,78253,6.75,,,, +US-TX-78254,US,TX,78254,8.25,,,, +US-TX-78255,US,TX,78255,6.75,,,, +US-TX-78256,US,TX,78256,8.25,,,, +US-TX-78257,US,TX,78257,8.25,,,, +US-TX-78258,US,TX,78258,8.25,,,, +US-TX-78259,US,TX,78259,8.25,,,, +US-TX-78260,US,TX,78260,8.25,,,, +US-TX-78261,US,TX,78261,6.75,,,, +US-TX-78263,US,TX,78263,6.75,,,, +US-TX-78264,US,TX,78264,6.75,,,, +US-TX-78265,US,TX,78265,8.25,,,, +US-TX-78266,US,TX,78266,7.25,,,, +US-TX-78268,US,TX,78268,8.125,,,, +US-TX-78269,US,TX,78269,8.25,,,, +US-TX-78270,US,TX,78270,8.25,,,, +US-TX-78278,US,TX,78278,8.25,,,, +US-TX-78279,US,TX,78279,8.25,,,, +US-TX-78280,US,TX,78280,8.25,,,, +US-TX-78283,US,TX,78283,8.25,,,, +US-TX-78284,US,TX,78284,8.25,,,, +US-TX-78285,US,TX,78285,8.25,,,, +US-TX-78288,US,TX,78288,8.25,,,, +US-TX-78289,US,TX,78289,8.25,,,, +US-TX-78291,US,TX,78291,8.25,,,, +US-TX-78292,US,TX,78292,8.25,,,, +US-TX-78293,US,TX,78293,8.25,,,, +US-TX-78294,US,TX,78294,8.25,,,, +US-TX-78295,US,TX,78295,8.25,,,, +US-TX-78296,US,TX,78296,8.25,,,, +US-TX-78297,US,TX,78297,8.25,,,, +US-TX-78298,US,TX,78298,8.25,,,, +US-TX-78299,US,TX,78299,8.25,,,, +US-TX-78330,US,TX,78330,7.75,,,, +US-TX-78332,US,TX,78332,8.25,,,, +US-TX-78333,US,TX,78333,8.25,,,, +US-TX-78335,US,TX,78335,8.25,,,, +US-TX-78336,US,TX,78336,8.25,,,, +US-TX-78338,US,TX,78338,6.25,,,, +US-TX-78339,US,TX,78339,6.75,,,, +US-TX-78340,US,TX,78340,7.25,,,, +US-TX-78341,US,TX,78341,7.25,,,, +US-TX-78342,US,TX,78342,8.25,,,, +US-TX-78343,US,TX,78343,8.25,,,, +US-TX-78344,US,TX,78344,6.75,,,, +US-TX-78347,US,TX,78347,6.75,,,, +US-TX-78349,US,TX,78349,6.25,,,, +US-TX-78350,US,TX,78350,8.25,,,, +US-TX-78351,US,TX,78351,8.25,,,, +US-TX-78352,US,TX,78352,6.25,,,, +US-TX-78353,US,TX,78353,6.75,,,, +US-TX-78355,US,TX,78355,8.25,,,, +US-TX-78357,US,TX,78357,8.25,,,, +US-TX-78358,US,TX,78358,8.25,,,, +US-TX-78359,US,TX,78359,8.25,,,, +US-TX-78360,US,TX,78360,8.25,,,, +US-TX-78361,US,TX,78361,8.25,,,, +US-TX-78362,US,TX,78362,8.25,,,, +US-TX-78363,US,TX,78363,8.25,,,, +US-TX-78364,US,TX,78364,8.25,,,, +US-TX-78368,US,TX,78368,8.25,,,, +US-TX-78369,US,TX,78369,6.75,,,, +US-TX-78370,US,TX,78370,6.25,,,, +US-TX-78371,US,TX,78371,6.75,,,, +US-TX-78372,US,TX,78372,6.75,,,, +US-TX-78373,US,TX,78373,8.25,,,, +US-TX-78374,US,TX,78374,8.25,,,, +US-TX-78375,US,TX,78375,6.75,,,, +US-TX-78376,US,TX,78376,6.25,,,, +US-TX-78377,US,TX,78377,8.25,,,, +US-TX-78379,US,TX,78379,6.75,,,, +US-TX-78380,US,TX,78380,6.75,,,, +US-TX-78381,US,TX,78381,8.25,,,, +US-TX-78382,US,TX,78382,8.25,,,, +US-TX-78383,US,TX,78383,6.75,,,, +US-TX-78384,US,TX,78384,8.25,,,, +US-TX-78385,US,TX,78385,6.25,,,, +US-TX-78387,US,TX,78387,8.25,,,, +US-TX-78389,US,TX,78389,6.75,,,, +US-TX-78390,US,TX,78390,8,,,, +US-TX-78391,US,TX,78391,6.75,,,, +US-TX-78393,US,TX,78393,6.25,,,, +US-TX-78401,US,TX,78401,8.25,,,, +US-TX-78402,US,TX,78402,8.25,,,, +US-TX-78403,US,TX,78403,8.25,,,, +US-TX-78404,US,TX,78404,8.25,,,, +US-TX-78405,US,TX,78405,8.25,,,, +US-TX-78406,US,TX,78406,8.25,,,, +US-TX-78407,US,TX,78407,8.25,,,, +US-TX-78408,US,TX,78408,8.25,,,, +US-TX-78409,US,TX,78409,8.25,,,, +US-TX-78410,US,TX,78410,8.25,,,, +US-TX-78411,US,TX,78411,8.25,,,, +US-TX-78412,US,TX,78412,8.25,,,, +US-TX-78413,US,TX,78413,8.25,,,, +US-TX-78414,US,TX,78414,8.25,,,, +US-TX-78415,US,TX,78415,8.25,,,, +US-TX-78416,US,TX,78416,8.25,,,, +US-TX-78417,US,TX,78417,8.25,,,, +US-TX-78418,US,TX,78418,8.25,,,, +US-TX-78419,US,TX,78419,8.25,,,, +US-TX-78426,US,TX,78426,8.25,,,, +US-TX-78427,US,TX,78427,8.25,,,, +US-TX-78460,US,TX,78460,8.25,,,, +US-TX-78463,US,TX,78463,8.25,,,, +US-TX-78465,US,TX,78465,8.25,,,, +US-TX-78466,US,TX,78466,8.25,,,, +US-TX-78467,US,TX,78467,8.25,,,, +US-TX-78468,US,TX,78468,8.25,,,, +US-TX-78469,US,TX,78469,8.25,,,, +US-TX-78472,US,TX,78472,8.25,,,, +US-TX-78480,US,TX,78480,8.25,,,, +US-TX-78501,US,TX,78501,8.25,,,, +US-TX-78502,US,TX,78502,8.25,,,, +US-TX-78503,US,TX,78503,8.25,,,, +US-TX-78504,US,TX,78504,8.25,,,, +US-TX-78505,US,TX,78505,8.25,,,, +US-TX-78516,US,TX,78516,8.25,,,, +US-TX-78520,US,TX,78520,8.25,,,, +US-TX-78521,US,TX,78521,8.25,,,, +US-TX-78522,US,TX,78522,8.25,,,, +US-TX-78523,US,TX,78523,8.25,,,, +US-TX-78526,US,TX,78526,8.25,,,, +US-TX-78535,US,TX,78535,7.5,,,, +US-TX-78536,US,TX,78536,6.25,,,, +US-TX-78537,US,TX,78537,6.25,,,, +US-TX-78538,US,TX,78538,6.25,,,, +US-TX-78539,US,TX,78539,8.25,,,, +US-TX-78540,US,TX,78540,8.25,,,, +US-TX-78541,US,TX,78541,8.25,,,, +US-TX-78542,US,TX,78542,6.25,,,, +US-TX-78543,US,TX,78543,6.25,,,, +US-TX-78545,US,TX,78545,6.25,,,, +US-TX-78547,US,TX,78547,6.25,,,, +US-TX-78548,US,TX,78548,7.25,,,, +US-TX-78549,US,TX,78549,6.25,,,, +US-TX-78550,US,TX,78550,8.25,,,, +US-TX-78551,US,TX,78551,8.25,,,, +US-TX-78552,US,TX,78552,8.25,,,, +US-TX-78553,US,TX,78553,8.25,,,, +US-TX-78557,US,TX,78557,8.25,,,, +US-TX-78558,US,TX,78558,6.25,,,, +US-TX-78559,US,TX,78559,8.25,,,, +US-TX-78560,US,TX,78560,8.25,,,, +US-TX-78561,US,TX,78561,6.25,,,, +US-TX-78562,US,TX,78562,7.25,,,, +US-TX-78563,US,TX,78563,6.25,,,, +US-TX-78564,US,TX,78564,6.25,,,, +US-TX-78565,US,TX,78565,6.25,,,, +US-TX-78566,US,TX,78566,6.25,,,, +US-TX-78567,US,TX,78567,7.25,,,, +US-TX-78568,US,TX,78568,6.25,,,, +US-TX-78569,US,TX,78569,6.25,,,, +US-TX-78570,US,TX,78570,8.25,,,, +US-TX-78572,US,TX,78572,8.25,,,, +US-TX-78573,US,TX,78573,8.25,,,, +US-TX-78574,US,TX,78574,6.25,,,, +US-TX-78575,US,TX,78575,7.25,,,, +US-TX-78576,US,TX,78576,6.25,,,, +US-TX-78577,US,TX,78577,8.25,,,, +US-TX-78578,US,TX,78578,8.25,,,, +US-TX-78579,US,TX,78579,8,,,, +US-TX-78580,US,TX,78580,8.25,,,, +US-TX-78582,US,TX,78582,8.25,,,, +US-TX-78583,US,TX,78583,6.25,,,, +US-TX-78584,US,TX,78584,8.25,,,, +US-TX-78585,US,TX,78585,6.25,,,, +US-TX-78586,US,TX,78586,8.25,,,, +US-TX-78588,US,TX,78588,6.25,,,, +US-TX-78589,US,TX,78589,8.25,,,, +US-TX-78590,US,TX,78590,6.25,,,, +US-TX-78591,US,TX,78591,6.25,,,, +US-TX-78592,US,TX,78592,6.25,,,, +US-TX-78593,US,TX,78593,6.25,,,, +US-TX-78594,US,TX,78594,6.25,,,, +US-TX-78595,US,TX,78595,6.25,,,, +US-TX-78596,US,TX,78596,8.25,,,, +US-TX-78597,US,TX,78597,8.25,,,, +US-TX-78598,US,TX,78598,6.25,,,, +US-TX-78599,US,TX,78599,8.25,,,, +US-TX-78602,US,TX,78602,6.75,,,, +US-TX-78604,US,TX,78604,8.25,,,, +US-TX-78605,US,TX,78605,6.25,,,, +US-TX-78606,US,TX,78606,7.25,,,, +US-TX-78607,US,TX,78607,6.25,,,, +US-TX-78608,US,TX,78608,6.25,,,, +US-TX-78609,US,TX,78609,6.25,,,, +US-TX-78610,US,TX,78610,8.25,,,, +US-TX-78611,US,TX,78611,6.25,,,, +US-TX-78612,US,TX,78612,6.75,,,, +US-TX-78613,US,TX,78613,8.25,,,, +US-TX-78614,US,TX,78614,6.75,,,, +US-TX-78615,US,TX,78615,6.25,,,, +US-TX-78616,US,TX,78616,6.75,,,, +US-TX-78617,US,TX,78617,8.25,,,, +US-TX-78618,US,TX,78618,6.75,,,, +US-TX-78619,US,TX,78619,7,,,, +US-TX-78620,US,TX,78620,7,,,, +US-TX-78621,US,TX,78621,6.75,,,, +US-TX-78622,US,TX,78622,6.75,,,, +US-TX-78623,US,TX,78623,8.25,,,, +US-TX-78624,US,TX,78624,6.75,,,, +US-TX-78626,US,TX,78626,8.25,,,, +US-TX-78627,US,TX,78627,8.25,,,, +US-TX-78628,US,TX,78628,8.25,,,, +US-TX-78629,US,TX,78629,8.25,,,, +US-TX-78630,US,TX,78630,8.25,,,, +US-TX-78631,US,TX,78631,6.75,,,, +US-TX-78632,US,TX,78632,6.75,,,, +US-TX-78633,US,TX,78633,8.25,,,, +US-TX-78634,US,TX,78634,6.25,,,, +US-TX-78635,US,TX,78635,7.25,,,, +US-TX-78636,US,TX,78636,7.25,,,, +US-TX-78638,US,TX,78638,6.75,,,, +US-TX-78639,US,TX,78639,6.25,,,, +US-TX-78640,US,TX,78640,8.25,,,, +US-TX-78641,US,TX,78641,8.25,,,, +US-TX-78642,US,TX,78642,6.5,,,, +US-TX-78643,US,TX,78643,8.25,,,, +US-TX-78644,US,TX,78644,8.25,,,, +US-TX-78645,US,TX,78645,8.25,,,, +US-TX-78646,US,TX,78646,8.25,,,, +US-TX-78648,US,TX,78648,8.25,,,, +US-TX-78650,US,TX,78650,6.75,,,, +US-TX-78651,US,TX,78651,8.25,,,, +US-TX-78652,US,TX,78652,8.25,,,, +US-TX-78653,US,TX,78653,8.25,,,, +US-TX-78654,US,TX,78654,8.25,,,, +US-TX-78655,US,TX,78655,8,,,, +US-TX-78656,US,TX,78656,6.75,,,, +US-TX-78657,US,TX,78657,8,,,, +US-TX-78658,US,TX,78658,8.25,,,, +US-TX-78659,US,TX,78659,6.75,,,, +US-TX-78660,US,TX,78660,8.25,,,, +US-TX-78661,US,TX,78661,6.75,,,, +US-TX-78662,US,TX,78662,6.75,,,, +US-TX-78663,US,TX,78663,7.25,,,, +US-TX-78664,US,TX,78664,8.25,,,, +US-TX-78665,US,TX,78665,8.25,,,, +US-TX-78666,US,TX,78666,8.25,,,, +US-TX-78667,US,TX,78667,8.25,,,, +US-TX-78669,US,TX,78669,8.25,,,, +US-TX-78670,US,TX,78670,6.75,,,, +US-TX-78671,US,TX,78671,6.75,,,, +US-TX-78672,US,TX,78672,6.25,,,, +US-TX-78673,US,TX,78673,6.25,,,, +US-TX-78674,US,TX,78674,7.25,,,, +US-TX-78675,US,TX,78675,6.75,,,, +US-TX-78676,US,TX,78676,7.25,,,, +US-TX-78677,US,TX,78677,6.75,,,, +US-TX-78680,US,TX,78680,8.25,,,, +US-TX-78681,US,TX,78681,8.25,,,, +US-TX-78682,US,TX,78682,8.25,,,, +US-TX-78683,US,TX,78683,8.25,,,, +US-TX-78691,US,TX,78691,8.25,,,, +US-TX-78701,US,TX,78701,8.25,,,, +US-TX-78702,US,TX,78702,8.25,,,, +US-TX-78703,US,TX,78703,8.25,,,, +US-TX-78704,US,TX,78704,8.25,,,, +US-TX-78705,US,TX,78705,8.25,,,, +US-TX-78708,US,TX,78708,8.25,,,, +US-TX-78709,US,TX,78709,8.25,,,, +US-TX-78710,US,TX,78710,8.25,,,, +US-TX-78711,US,TX,78711,8.25,,,, +US-TX-78712,US,TX,78712,8.25,,,, +US-TX-78713,US,TX,78713,8.25,,,, +US-TX-78714,US,TX,78714,8.25,,,, +US-TX-78715,US,TX,78715,8.25,,,, +US-TX-78716,US,TX,78716,6.75,,,, +US-TX-78717,US,TX,78717,8.25,,,, +US-TX-78718,US,TX,78718,8.25,,,, +US-TX-78719,US,TX,78719,8.25,,,, +US-TX-78720,US,TX,78720,8.25,,,, +US-TX-78721,US,TX,78721,8.25,,,, +US-TX-78722,US,TX,78722,8.25,,,, +US-TX-78723,US,TX,78723,8.25,,,, +US-TX-78724,US,TX,78724,8.25,,,, +US-TX-78725,US,TX,78725,7.25,,,, +US-TX-78726,US,TX,78726,8.25,,,, +US-TX-78727,US,TX,78727,8.25,,,, +US-TX-78728,US,TX,78728,8.25,,,, +US-TX-78729,US,TX,78729,8.25,,,, +US-TX-78730,US,TX,78730,8.25,,,, +US-TX-78731,US,TX,78731,8.25,,,, +US-TX-78732,US,TX,78732,8.25,,,, +US-TX-78733,US,TX,78733,6.75,,,, +US-TX-78734,US,TX,78734,8.25,,,, +US-TX-78735,US,TX,78735,8.25,,,, +US-TX-78736,US,TX,78736,8.25,,,, +US-TX-78737,US,TX,78737,7,,,, +US-TX-78738,US,TX,78738,8.25,,,, +US-TX-78739,US,TX,78739,8.25,,,, +US-TX-78741,US,TX,78741,8.25,,,, +US-TX-78742,US,TX,78742,8.25,,,, +US-TX-78744,US,TX,78744,8.25,,,, +US-TX-78745,US,TX,78745,8.25,,,, +US-TX-78746,US,TX,78746,6.75,,,, +US-TX-78747,US,TX,78747,8.25,,,, +US-TX-78748,US,TX,78748,8.25,,,, +US-TX-78749,US,TX,78749,8.25,,,, +US-TX-78750,US,TX,78750,8.25,,,, +US-TX-78751,US,TX,78751,8.25,,,, +US-TX-78752,US,TX,78752,8.25,,,, +US-TX-78753,US,TX,78753,8.25,,,, +US-TX-78754,US,TX,78754,8.25,,,, +US-TX-78755,US,TX,78755,8.25,,,, +US-TX-78756,US,TX,78756,8.25,,,, +US-TX-78757,US,TX,78757,8.25,,,, +US-TX-78758,US,TX,78758,8.25,,,, +US-TX-78759,US,TX,78759,8.25,,,, +US-TX-78760,US,TX,78760,8.25,,,, +US-TX-78761,US,TX,78761,8.25,,,, +US-TX-78762,US,TX,78762,8.25,,,, +US-TX-78763,US,TX,78763,8.25,,,, +US-TX-78764,US,TX,78764,8.25,,,, +US-TX-78765,US,TX,78765,8.25,,,, +US-TX-78766,US,TX,78766,8.25,,,, +US-TX-78767,US,TX,78767,8.25,,,, +US-TX-78768,US,TX,78768,8.25,,,, +US-TX-78769,US,TX,78769,8.25,,,, +US-TX-78772,US,TX,78772,8.25,,,, +US-TX-78773,US,TX,78773,8.25,,,, +US-TX-78774,US,TX,78774,8.25,,,, +US-TX-78778,US,TX,78778,8.25,,,, +US-TX-78779,US,TX,78779,8.25,,,, +US-TX-78783,US,TX,78783,8.25,,,, +US-TX-78799,US,TX,78799,8.25,,,, +US-TX-78801,US,TX,78801,8.25,,,, +US-TX-78802,US,TX,78802,8.25,,,, +US-TX-78827,US,TX,78827,6.75,,,, +US-TX-78828,US,TX,78828,6.75,,,, +US-TX-78829,US,TX,78829,6.25,,,, +US-TX-78830,US,TX,78830,7.75,,,, +US-TX-78832,US,TX,78832,8.25,,,, +US-TX-78833,US,TX,78833,6.75,,,, +US-TX-78834,US,TX,78834,8.25,,,, +US-TX-78836,US,TX,78836,6.75,,,, +US-TX-78837,US,TX,78837,6.75,,,, +US-TX-78838,US,TX,78838,7.25,,,, +US-TX-78839,US,TX,78839,8.25,,,, +US-TX-78840,US,TX,78840,8.25,,,, +US-TX-78841,US,TX,78841,8.25,,,, +US-TX-78842,US,TX,78842,8.25,,,, +US-TX-78843,US,TX,78843,6.75,,,, +US-TX-78847,US,TX,78847,8.25,,,, +US-TX-78850,US,TX,78850,6.75,,,, +US-TX-78851,US,TX,78851,6.75,,,, +US-TX-78852,US,TX,78852,8.25,,,, +US-TX-78853,US,TX,78853,8.25,,,, +US-TX-78860,US,TX,78860,7.25,,,, +US-TX-78861,US,TX,78861,8.25,,,, +US-TX-78870,US,TX,78870,7.25,,,, +US-TX-78871,US,TX,78871,6.75,,,, +US-TX-78872,US,TX,78872,6.25,,,, +US-TX-78873,US,TX,78873,6.75,,,, +US-TX-78877,US,TX,78877,7.25,,,, +US-TX-78879,US,TX,78879,6.75,,,, +US-TX-78880,US,TX,78880,6.25,,,, +US-TX-78881,US,TX,78881,7.25,,,, +US-TX-78883,US,TX,78883,6.75,,,, +US-TX-78884,US,TX,78884,7.25,,,, +US-TX-78885,US,TX,78885,6.75,,,, +US-TX-78886,US,TX,78886,6.75,,,, +US-TX-78931,US,TX,78931,6.75,,,, +US-TX-78932,US,TX,78932,6.75,,,, +US-TX-78933,US,TX,78933,6.75,,,, +US-TX-78934,US,TX,78934,8.25,,,, +US-TX-78935,US,TX,78935,6.75,,,, +US-TX-78938,US,TX,78938,6.75,,,, +US-TX-78940,US,TX,78940,6.75,,,, +US-TX-78941,US,TX,78941,6.75,,,, +US-TX-78942,US,TX,78942,8.25,,,, +US-TX-78943,US,TX,78943,6.75,,,, +US-TX-78944,US,TX,78944,6.75,,,, +US-TX-78945,US,TX,78945,6.75,,,, +US-TX-78946,US,TX,78946,6.75,,,, +US-TX-78947,US,TX,78947,6.75,,,, +US-TX-78948,US,TX,78948,6.75,,,, +US-TX-78949,US,TX,78949,6.75,,,, +US-TX-78950,US,TX,78950,6.75,,,, +US-TX-78951,US,TX,78951,6.75,,,, +US-TX-78952,US,TX,78952,6.75,,,, +US-TX-78953,US,TX,78953,6.75,,,, +US-TX-78954,US,TX,78954,6.75,,,, +US-TX-78956,US,TX,78956,6.75,,,, +US-TX-78957,US,TX,78957,8.25,,,, +US-TX-78959,US,TX,78959,6.75,,,, +US-TX-78960,US,TX,78960,6.75,,,, +US-TX-78961,US,TX,78961,8.25,,,, +US-TX-78962,US,TX,78962,8.25,,,, +US-TX-78963,US,TX,78963,6.75,,,, +US-TX-79001,US,TX,79001,6.75,,,, +US-TX-79002,US,TX,79002,7.75,,,, +US-TX-79003,US,TX,79003,6.25,,,, +US-TX-79005,US,TX,79005,6.25,,,, +US-TX-79007,US,TX,79007,8.25,,,, +US-TX-79008,US,TX,79008,8.25,,,, +US-TX-79009,US,TX,79009,6.25,,,, +US-TX-79010,US,TX,79010,7.75,,,, +US-TX-79011,US,TX,79011,6.25,,,, +US-TX-79012,US,TX,79012,6.25,,,, +US-TX-79013,US,TX,79013,7.25,,,, +US-TX-79014,US,TX,79014,8.25,,,, +US-TX-79015,US,TX,79015,8.25,,,, +US-TX-79016,US,TX,79016,8.25,,,, +US-TX-79018,US,TX,79018,6.25,,,, +US-TX-79019,US,TX,79019,6.25,,,, +US-TX-79021,US,TX,79021,6.75,,,, +US-TX-79022,US,TX,79022,8.25,,,, +US-TX-79024,US,TX,79024,7.25,,,, +US-TX-79025,US,TX,79025,6.75,,,, +US-TX-79027,US,TX,79027,8.25,,,, +US-TX-79029,US,TX,79029,8.25,,,, +US-TX-79031,US,TX,79031,7.75,,,, +US-TX-79032,US,TX,79032,7.75,,,, +US-TX-79033,US,TX,79033,6.25,,,, +US-TX-79034,US,TX,79034,6.25,,,, +US-TX-79035,US,TX,79035,8.25,,,, +US-TX-79036,US,TX,79036,6.25,,,, +US-TX-79039,US,TX,79039,6.25,,,, +US-TX-79040,US,TX,79040,6.25,,,, +US-TX-79041,US,TX,79041,8.25,,,, +US-TX-79042,US,TX,79042,6.75,,,, +US-TX-79043,US,TX,79043,6.75,,,, +US-TX-79044,US,TX,79044,6.25,,,, +US-TX-79045,US,TX,79045,8.25,,,, +US-TX-79046,US,TX,79046,6.25,,,, +US-TX-79051,US,TX,79051,8.25,,,, +US-TX-79052,US,TX,79052,6.75,,,, +US-TX-79053,US,TX,79053,6.25,,,, +US-TX-79054,US,TX,79054,7.25,,,, +US-TX-79056,US,TX,79056,6.25,,,, +US-TX-79057,US,TX,79057,6.25,,,, +US-TX-79058,US,TX,79058,6.25,,,, +US-TX-79059,US,TX,79059,8.25,,,, +US-TX-79061,US,TX,79061,6.25,,,, +US-TX-79062,US,TX,79062,6.25,,,, +US-TX-79063,US,TX,79063,6.75,,,, +US-TX-79064,US,TX,79064,6.25,,,, +US-TX-79065,US,TX,79065,8.25,,,, +US-TX-79066,US,TX,79066,8.25,,,, +US-TX-79068,US,TX,79068,6.25,,,, +US-TX-79070,US,TX,79070,8.25,,,, +US-TX-79072,US,TX,79072,8.25,,,, +US-TX-79073,US,TX,79073,8.25,,,, +US-TX-79077,US,TX,79077,8,,,, +US-TX-79078,US,TX,79078,7.25,,,, +US-TX-79079,US,TX,79079,8,,,, +US-TX-79080,US,TX,79080,6.25,,,, +US-TX-79081,US,TX,79081,8.25,,,, +US-TX-79082,US,TX,79082,6.25,,,, +US-TX-79083,US,TX,79083,6.25,,,, +US-TX-79084,US,TX,79084,6.25,,,, +US-TX-79085,US,TX,79085,6.75,,,, +US-TX-79086,US,TX,79086,6.25,,,, +US-TX-79087,US,TX,79087,6.25,,,, +US-TX-79088,US,TX,79088,8.25,,,, +US-TX-79091,US,TX,79091,6.75,,,, +US-TX-79092,US,TX,79092,7.75,,,, +US-TX-79093,US,TX,79093,8.25,,,, +US-TX-79094,US,TX,79094,6.25,,,, +US-TX-79095,US,TX,79095,8.25,,,, +US-TX-79096,US,TX,79096,8,,,, +US-TX-79097,US,TX,79097,8,,,, +US-TX-79098,US,TX,79098,6.75,,,, +US-TX-79101,US,TX,79101,8.25,,,, +US-TX-79102,US,TX,79102,8.25,,,, +US-TX-79103,US,TX,79103,8.25,,,, +US-TX-79104,US,TX,79104,8.25,,,, +US-TX-79105,US,TX,79105,8.25,,,, +US-TX-79106,US,TX,79106,8.25,,,, +US-TX-79107,US,TX,79107,8.25,,,, +US-TX-79108,US,TX,79108,6.25,,,, +US-TX-79109,US,TX,79109,8.25,,,, +US-TX-79110,US,TX,79110,8.25,,,, +US-TX-79111,US,TX,79111,8.25,,,, +US-TX-79114,US,TX,79114,8.25,,,, +US-TX-79116,US,TX,79116,8.25,,,, +US-TX-79117,US,TX,79117,8.25,,,, +US-TX-79118,US,TX,79118,6.75,,,, +US-TX-79119,US,TX,79119,6.75,,,, +US-TX-79120,US,TX,79120,8.25,,,, +US-TX-79121,US,TX,79121,8.25,,,, +US-TX-79124,US,TX,79124,6.25,,,, +US-TX-79159,US,TX,79159,8.25,,,, +US-TX-79166,US,TX,79166,8.25,,,, +US-TX-79168,US,TX,79168,8.25,,,, +US-TX-79172,US,TX,79172,8.25,,,, +US-TX-79174,US,TX,79174,8.25,,,, +US-TX-79178,US,TX,79178,8.25,,,, +US-TX-79185,US,TX,79185,8.25,,,, +US-TX-79189,US,TX,79189,8.25,,,, +US-TX-79201,US,TX,79201,8.25,,,, +US-TX-79220,US,TX,79220,6.75,,,, +US-TX-79221,US,TX,79221,7.75,,,, +US-TX-79223,US,TX,79223,6.25,,,, +US-TX-79225,US,TX,79225,8,,,, +US-TX-79226,US,TX,79226,8.25,,,, +US-TX-79227,US,TX,79227,6.25,,,, +US-TX-79229,US,TX,79229,8.25,,,, +US-TX-79230,US,TX,79230,6.25,,,, +US-TX-79231,US,TX,79231,6.25,,,, +US-TX-79233,US,TX,79233,7.5,,,, +US-TX-79234,US,TX,79234,6.25,,,, +US-TX-79235,US,TX,79235,8,,,, +US-TX-79236,US,TX,79236,6.25,,,, +US-TX-79237,US,TX,79237,7.25,,,, +US-TX-79239,US,TX,79239,7.25,,,, +US-TX-79240,US,TX,79240,6.25,,,, +US-TX-79241,US,TX,79241,7.75,,,, +US-TX-79243,US,TX,79243,6.75,,,, +US-TX-79244,US,TX,79244,6.25,,,, +US-TX-79245,US,TX,79245,8.25,,,, +US-TX-79247,US,TX,79247,6.75,,,, +US-TX-79248,US,TX,79248,6.25,,,, +US-TX-79250,US,TX,79250,8.25,,,, +US-TX-79251,US,TX,79251,6.25,,,, +US-TX-79252,US,TX,79252,8.25,,,, +US-TX-79255,US,TX,79255,8.25,,,, +US-TX-79256,US,TX,79256,8.25,,,, +US-TX-79257,US,TX,79257,8,,,, +US-TX-79258,US,TX,79258,6.25,,,, +US-TX-79259,US,TX,79259,6.75,,,, +US-TX-79261,US,TX,79261,8.25,,,, +US-TX-79311,US,TX,79311,8.25,,,, +US-TX-79312,US,TX,79312,7.5,,,, +US-TX-79313,US,TX,79313,7.25,,,, +US-TX-79314,US,TX,79314,6.25,,,, +US-TX-79316,US,TX,79316,8.25,,,, +US-TX-79322,US,TX,79322,8.25,,,, +US-TX-79323,US,TX,79323,7.75,,,, +US-TX-79324,US,TX,79324,6.75,,,, +US-TX-79325,US,TX,79325,6.25,,,, +US-TX-79326,US,TX,79326,6.25,,,, +US-TX-79329,US,TX,79329,6.75,,,, +US-TX-79330,US,TX,79330,6.25,,,, +US-TX-79331,US,TX,79331,8.25,,,, +US-TX-79336,US,TX,79336,8.25,,,, +US-TX-79338,US,TX,79338,8.25,,,, +US-TX-79339,US,TX,79339,8.25,,,, +US-TX-79342,US,TX,79342,6.25,,,, +US-TX-79343,US,TX,79343,7.75,,,, +US-TX-79344,US,TX,79344,6.75,,,, +US-TX-79345,US,TX,79345,7.75,,,, +US-TX-79346,US,TX,79346,7.75,,,, +US-TX-79347,US,TX,79347,8.25,,,, +US-TX-79350,US,TX,79350,8.25,,,, +US-TX-79351,US,TX,79351,7.75,,,, +US-TX-79353,US,TX,79353,6.25,,,, +US-TX-79355,US,TX,79355,6.25,,,, +US-TX-79356,US,TX,79356,8.25,,,, +US-TX-79357,US,TX,79357,8.25,,,, +US-TX-79358,US,TX,79358,6.25,,,, +US-TX-79359,US,TX,79359,8.25,,,, +US-TX-79360,US,TX,79360,7.75,,,, +US-TX-79363,US,TX,79363,6.75,,,, +US-TX-79364,US,TX,79364,8.25,,,, +US-TX-79366,US,TX,79366,7.25,,,, +US-TX-79367,US,TX,79367,7.25,,,, +US-TX-79369,US,TX,79369,6.25,,,, +US-TX-79370,US,TX,79370,8.25,,,, +US-TX-79371,US,TX,79371,7.75,,,, +US-TX-79372,US,TX,79372,8.25,,,, +US-TX-79373,US,TX,79373,8.25,,,, +US-TX-79376,US,TX,79376,6.75,,,, +US-TX-79377,US,TX,79377,6.75,,,, +US-TX-79378,US,TX,79378,6.75,,,, +US-TX-79379,US,TX,79379,7.75,,,, +US-TX-79380,US,TX,79380,6.25,,,, +US-TX-79381,US,TX,79381,6.75,,,, +US-TX-79382,US,TX,79382,8.25,,,, +US-TX-79383,US,TX,79383,7.75,,,, +US-TX-79401,US,TX,79401,8.25,,,, +US-TX-79402,US,TX,79402,8.25,,,, +US-TX-79403,US,TX,79403,8.25,,,, +US-TX-79404,US,TX,79404,8.25,,,, +US-TX-79406,US,TX,79406,8.25,,,, +US-TX-79407,US,TX,79407,8.25,,,, +US-TX-79408,US,TX,79408,8.25,,,, +US-TX-79409,US,TX,79409,8.25,,,, +US-TX-79410,US,TX,79410,8.25,,,, +US-TX-79411,US,TX,79411,8.25,,,, +US-TX-79412,US,TX,79412,8.25,,,, +US-TX-79413,US,TX,79413,8.25,,,, +US-TX-79414,US,TX,79414,8.25,,,, +US-TX-79415,US,TX,79415,8.25,,,, +US-TX-79416,US,TX,79416,8.25,,,, +US-TX-79423,US,TX,79423,8.25,,,, +US-TX-79424,US,TX,79424,8.25,,,, +US-TX-79430,US,TX,79430,8.25,,,, +US-TX-79452,US,TX,79452,8.25,,,, +US-TX-79453,US,TX,79453,8.25,,,, +US-TX-79457,US,TX,79457,8.25,,,, +US-TX-79464,US,TX,79464,8.25,,,, +US-TX-79490,US,TX,79490,8.25,,,, +US-TX-79491,US,TX,79491,8.25,,,, +US-TX-79493,US,TX,79493,8.25,,,, +US-TX-79499,US,TX,79499,8.25,,,, +US-TX-79501,US,TX,79501,8.25,,,, +US-TX-79502,US,TX,79502,8.25,,,, +US-TX-79503,US,TX,79503,6.25,,,, +US-TX-79504,US,TX,79504,6.25,,,, +US-TX-79505,US,TX,79505,7.75,,,, +US-TX-79506,US,TX,79506,6.25,,,, +US-TX-79508,US,TX,79508,8.25,,,, +US-TX-79510,US,TX,79510,6.25,,,, +US-TX-79511,US,TX,79511,6.25,,,, +US-TX-79512,US,TX,79512,8.25,,,, +US-TX-79516,US,TX,79516,8.25,,,, +US-TX-79517,US,TX,79517,6.75,,,, +US-TX-79518,US,TX,79518,6.25,,,, +US-TX-79519,US,TX,79519,6.25,,,, +US-TX-79520,US,TX,79520,8.25,,,, +US-TX-79521,US,TX,79521,8.25,,,, +US-TX-79525,US,TX,79525,6.25,,,, +US-TX-79526,US,TX,79526,6.75,,,, +US-TX-79527,US,TX,79527,6.75,,,, +US-TX-79528,US,TX,79528,7.25,,,, +US-TX-79529,US,TX,79529,8.25,,,, +US-TX-79530,US,TX,79530,6.25,,,, +US-TX-79532,US,TX,79532,6.75,,,, +US-TX-79533,US,TX,79533,6.25,,,, +US-TX-79534,US,TX,79534,6.25,,,, +US-TX-79535,US,TX,79535,6.25,,,, +US-TX-79536,US,TX,79536,6.25,,,, +US-TX-79537,US,TX,79537,6.25,,,, +US-TX-79538,US,TX,79538,6.25,,,, +US-TX-79539,US,TX,79539,6.25,,,, +US-TX-79540,US,TX,79540,6.25,,,, +US-TX-79541,US,TX,79541,6.25,,,, +US-TX-79543,US,TX,79543,7.25,,,, +US-TX-79544,US,TX,79544,6.25,,,, +US-TX-79545,US,TX,79545,6.25,,,, +US-TX-79546,US,TX,79546,8.25,,,, +US-TX-79547,US,TX,79547,7.25,,,, +US-TX-79548,US,TX,79548,6.25,,,, +US-TX-79549,US,TX,79549,8.25,,,, +US-TX-79550,US,TX,79550,8.25,,,, +US-TX-79553,US,TX,79553,8.25,,,, +US-TX-79556,US,TX,79556,8.25,,,, +US-TX-79560,US,TX,79560,6.25,,,, +US-TX-79561,US,TX,79561,6.25,,,, +US-TX-79562,US,TX,79562,6.25,,,, +US-TX-79563,US,TX,79563,8.25,,,, +US-TX-79565,US,TX,79565,6.75,,,, +US-TX-79566,US,TX,79566,6.25,,,, +US-TX-79567,US,TX,79567,8.25,,,, +US-TX-79601,US,TX,79601,8.25,,,, +US-TX-79602,US,TX,79602,8.25,,,, +US-TX-79603,US,TX,79603,8.25,,,, +US-TX-79604,US,TX,79604,8.25,,,, +US-TX-79605,US,TX,79605,8.25,,,, +US-TX-79606,US,TX,79606,8.25,,,, +US-TX-79607,US,TX,79607,8.25,,,, +US-TX-79608,US,TX,79608,8.25,,,, +US-TX-79697,US,TX,79697,8.25,,,, +US-TX-79698,US,TX,79698,8.25,,,, +US-TX-79699,US,TX,79699,8.25,,,, +US-TX-79701,US,TX,79701,8.25,,,, +US-TX-79702,US,TX,79702,8.25,,,, +US-TX-79703,US,TX,79703,8.25,,,, +US-TX-79704,US,TX,79704,8.25,,,, +US-TX-79705,US,TX,79705,8.25,,,, +US-TX-79706,US,TX,79706,6.75,,,, +US-TX-79707,US,TX,79707,8.25,,,, +US-TX-79708,US,TX,79708,8.25,,,, +US-TX-79710,US,TX,79710,8.25,,,, +US-TX-79711,US,TX,79711,8.25,,,, +US-TX-79712,US,TX,79712,8.25,,,, +US-TX-79713,US,TX,79713,6.25,,,, +US-TX-79714,US,TX,79714,8.25,,,, +US-TX-79718,US,TX,79718,6.75,,,, +US-TX-79719,US,TX,79719,6.25,,,, +US-TX-79720,US,TX,79720,8.25,,,, +US-TX-79721,US,TX,79721,8.25,,,, +US-TX-79730,US,TX,79730,6.25,,,, +US-TX-79731,US,TX,79731,7.75,,,, +US-TX-79733,US,TX,79733,7.25,,,, +US-TX-79734,US,TX,79734,8.25,,,, +US-TX-79735,US,TX,79735,8.25,,,, +US-TX-79738,US,TX,79738,6.25,,,, +US-TX-79739,US,TX,79739,6.25,,,, +US-TX-79740,US,TX,79740,6.25,,,, +US-TX-79741,US,TX,79741,8,,,, +US-TX-79742,US,TX,79742,7.75,,,, +US-TX-79743,US,TX,79743,6.25,,,, +US-TX-79744,US,TX,79744,8.25,,,, +US-TX-79745,US,TX,79745,8.25,,,, +US-TX-79748,US,TX,79748,6.25,,,, +US-TX-79749,US,TX,79749,6.25,,,, +US-TX-79752,US,TX,79752,7.75,,,, +US-TX-79754,US,TX,79754,6.25,,,, +US-TX-79755,US,TX,79755,6.25,,,, +US-TX-79756,US,TX,79756,8.25,,,, +US-TX-79758,US,TX,79758,7,,,, +US-TX-79759,US,TX,79759,8,,,, +US-TX-79760,US,TX,79760,8.25,,,, +US-TX-79761,US,TX,79761,8.25,,,, +US-TX-79762,US,TX,79762,8.25,,,, +US-TX-79763,US,TX,79763,8.25,,,, +US-TX-79764,US,TX,79764,7,,,, +US-TX-79765,US,TX,79765,8.25,,,, +US-TX-79766,US,TX,79766,7,,,, +US-TX-79768,US,TX,79768,8.25,,,, +US-TX-79769,US,TX,79769,8.25,,,, +US-TX-79770,US,TX,79770,6.75,,,, +US-TX-79772,US,TX,79772,8.25,,,, +US-TX-79776,US,TX,79776,7,,,, +US-TX-79777,US,TX,79777,7.25,,,, +US-TX-79778,US,TX,79778,7.75,,,, +US-TX-79780,US,TX,79780,6.75,,,, +US-TX-79781,US,TX,79781,6.25,,,, +US-TX-79782,US,TX,79782,6.25,,,, +US-TX-79783,US,TX,79783,6.25,,,, +US-TX-79785,US,TX,79785,8.25,,,, +US-TX-79786,US,TX,79786,6.75,,,, +US-TX-79788,US,TX,79788,7.25,,,, +US-TX-79789,US,TX,79789,8.25,,,, +US-TX-79821,US,TX,79821,8.25,,,, +US-TX-79830,US,TX,79830,8.25,,,, +US-TX-79831,US,TX,79831,8.25,,,, +US-TX-79832,US,TX,79832,8.25,,,, +US-TX-79834,US,TX,79834,7.75,,,, +US-TX-79835,US,TX,79835,7.25,,,, +US-TX-79836,US,TX,79836,7.25,,,, +US-TX-79837,US,TX,79837,7.25,,,, +US-TX-79838,US,TX,79838,7.25,,,, +US-TX-79839,US,TX,79839,6.25,,,, +US-TX-79842,US,TX,79842,6.75,,,, +US-TX-79843,US,TX,79843,8,,,, +US-TX-79845,US,TX,79845,8.25,,,, +US-TX-79846,US,TX,79846,8.25,,,, +US-TX-79847,US,TX,79847,6.25,,,, +US-TX-79848,US,TX,79848,7.75,,,, +US-TX-79849,US,TX,79849,7.25,,,, +US-TX-79851,US,TX,79851,6.25,,,, +US-TX-79852,US,TX,79852,6.75,,,, +US-TX-79853,US,TX,79853,7.25,,,, +US-TX-79854,US,TX,79854,8.25,,,, +US-TX-79855,US,TX,79855,8,,,, +US-TX-79901,US,TX,79901,8.25,,,, +US-TX-79902,US,TX,79902,8.25,,,, +US-TX-79903,US,TX,79903,8.25,,,, +US-TX-79904,US,TX,79904,8.25,,,, +US-TX-79905,US,TX,79905,8.25,,,, +US-TX-79906,US,TX,79906,7.25,,,, +US-TX-79907,US,TX,79907,8.25,,,, +US-TX-79908,US,TX,79908,7.25,,,, +US-TX-79910,US,TX,79910,8.25,,,, +US-TX-79911,US,TX,79911,8.25,,,, +US-TX-79912,US,TX,79912,8.25,,,, +US-TX-79913,US,TX,79913,8.25,,,, +US-TX-79914,US,TX,79914,8.25,,,, +US-TX-79915,US,TX,79915,8.25,,,, +US-TX-79916,US,TX,79916,7.25,,,, +US-TX-79917,US,TX,79917,8.25,,,, +US-TX-79918,US,TX,79918,7.25,,,, +US-TX-79920,US,TX,79920,8.25,,,, +US-TX-79922,US,TX,79922,8.25,,,, +US-TX-79923,US,TX,79923,8.25,,,, +US-TX-79924,US,TX,79924,8.25,,,, +US-TX-79925,US,TX,79925,8.25,,,, +US-TX-79926,US,TX,79926,8.25,,,, +US-TX-79927,US,TX,79927,8.25,,,, +US-TX-79928,US,TX,79928,7.25,,,, +US-TX-79929,US,TX,79929,8.25,,,, +US-TX-79930,US,TX,79930,8.25,,,, +US-TX-79931,US,TX,79931,8.25,,,, +US-TX-79932,US,TX,79932,8.25,,,, +US-TX-79934,US,TX,79934,8.25,,,, +US-TX-79935,US,TX,79935,8.25,,,, +US-TX-79936,US,TX,79936,8.25,,,, +US-TX-79937,US,TX,79937,8.25,,,, +US-TX-79938,US,TX,79938,7.25,,,, +US-TX-79940,US,TX,79940,8.25,,,, +US-TX-79941,US,TX,79941,8.25,,,, +US-TX-79942,US,TX,79942,8.25,,,, +US-TX-79943,US,TX,79943,8.25,,,, +US-TX-79944,US,TX,79944,8.25,,,, +US-TX-79945,US,TX,79945,8.25,,,, +US-TX-79946,US,TX,79946,8.25,,,, +US-TX-79947,US,TX,79947,8.25,,,, +US-TX-79948,US,TX,79948,8.25,,,, +US-TX-79949,US,TX,79949,8.25,,,, +US-TX-79950,US,TX,79950,8.25,,,, +US-TX-79951,US,TX,79951,8.25,,,, +US-TX-79952,US,TX,79952,8.25,,,, +US-TX-79953,US,TX,79953,8.25,,,, +US-TX-79954,US,TX,79954,8.25,,,, +US-TX-79955,US,TX,79955,8.25,,,, +US-TX-79958,US,TX,79958,8.25,,,, +US-TX-79960,US,TX,79960,8.25,,,, +US-TX-79961,US,TX,79961,8.25,,,, +US-TX-79968,US,TX,79968,8.25,,,, +US-TX-79976,US,TX,79976,8.25,,,, +US-TX-79978,US,TX,79978,8.25,,,, +US-TX-79980,US,TX,79980,8.25,,,, +US-TX-79990,US,TX,79990,8.25,,,, +US-TX-79995,US,TX,79995,8.25,,,, +US-TX-79996,US,TX,79996,8.25,,,, +US-TX-79997,US,TX,79997,8.25,,,, +US-TX-79998,US,TX,79998,8.25,,,, +US-TX-79999,US,TX,79999,8.25,,,, +US-TX-88510,US,TX,88510,8.25,,,, +US-TX-88511,US,TX,88511,8.25,,,, +US-TX-88512,US,TX,88512,8.25,,,, +US-TX-88513,US,TX,88513,8.25,,,, +US-TX-88514,US,TX,88514,8.25,,,, +US-TX-88515,US,TX,88515,8.25,,,, +US-TX-88517,US,TX,88517,8.25,,,, +US-TX-88518,US,TX,88518,8.25,,,, +US-TX-88519,US,TX,88519,8.25,,,, +US-TX-88520,US,TX,88520,8.25,,,, +US-TX-88521,US,TX,88521,8.25,,,, +US-TX-88523,US,TX,88523,8.25,,,, +US-TX-88524,US,TX,88524,8.25,,,, +US-TX-88525,US,TX,88525,8.25,,,, +US-TX-88526,US,TX,88526,8.25,,,, +US-TX-88527,US,TX,88527,8.25,,,, +US-TX-88528,US,TX,88528,8.25,,,, +US-TX-88529,US,TX,88529,8.25,,,, +US-TX-88530,US,TX,88530,8.25,,,, +US-TX-88531,US,TX,88531,8.25,,,, +US-TX-88532,US,TX,88532,8.25,,,, +US-TX-88533,US,TX,88533,8.25,,,, +US-TX-88534,US,TX,88534,8.25,,,, +US-TX-88535,US,TX,88535,8.25,,,, +US-TX-88536,US,TX,88536,8.25,,,, +US-TX-88538,US,TX,88538,8.25,,,, +US-TX-88539,US,TX,88539,8.25,,,, +US-TX-88540,US,TX,88540,8.25,,,, +US-TX-88541,US,TX,88541,8.25,,,, +US-TX-88542,US,TX,88542,8.25,,,, +US-TX-88543,US,TX,88543,8.25,,,, +US-TX-88544,US,TX,88544,8.25,,,, +US-TX-88545,US,TX,88545,8.25,,,, +US-TX-88546,US,TX,88546,8.25,,,, +US-TX-88547,US,TX,88547,8.25,,,, +US-TX-88548,US,TX,88548,8.25,,,, +US-TX-88549,US,TX,88549,8.25,,,, +US-TX-88550,US,TX,88550,8.25,,,, +US-TX-88553,US,TX,88553,8.25,,,, +US-TX-88554,US,TX,88554,8.25,,,, +US-TX-88555,US,TX,88555,8.25,,,, +US-TX-88556,US,TX,88556,8.25,,,, +US-TX-88557,US,TX,88557,8.25,,,, +US-TX-88558,US,TX,88558,8.25,,,, +US-TX-88559,US,TX,88559,8.25,,,, +US-TX-88560,US,TX,88560,8.25,,,, +US-TX-88561,US,TX,88561,8.25,,,, +US-TX-88562,US,TX,88562,8.25,,,, +US-TX-88563,US,TX,88563,8.25,,,, +US-TX-88565,US,TX,88565,8.25,,,, +US-TX-88566,US,TX,88566,8.25,,,, +US-TX-88567,US,TX,88567,8.25,,,, +US-TX-88568,US,TX,88568,8.25,,,, +US-TX-88569,US,TX,88569,8.25,,,, +US-TX-88570,US,TX,88570,8.25,,,, +US-TX-88571,US,TX,88571,8.25,,,, +US-TX-88572,US,TX,88572,8.25,,,, +US-TX-88573,US,TX,88573,8.25,,,, +US-TX-88574,US,TX,88574,8.25,,,, +US-TX-88575,US,TX,88575,8.25,,,, +US-TX-88576,US,TX,88576,8.25,,,, +US-TX-88577,US,TX,88577,8.25,,,, +US-TX-88578,US,TX,88578,8.25,,,, +US-TX-88579,US,TX,88579,8.25,,,, +US-TX-88580,US,TX,88580,8.25,,,, +US-TX-88581,US,TX,88581,8.25,,,, +US-TX-88582,US,TX,88582,8.25,,,, +US-TX-88583,US,TX,88583,8.25,,,, +US-TX-88584,US,TX,88584,8.25,,,, +US-TX-88585,US,TX,88585,8.25,,,, +US-TX-88586,US,TX,88586,8.25,,,, +US-TX-88587,US,TX,88587,8.25,,,, +US-TX-88588,US,TX,88588,8.25,,,, +US-TX-88589,US,TX,88589,8.25,,,, +US-TX-88590,US,TX,88590,8.25,,,, +US-TX-88595,US,TX,88595,8.25,,,, +US-UT-84001,US,UT,84001,5.95,,,, +US-UT-84002,US,UT,84002,5.95,,,, +US-UT-84003,US,UT,84003,6.75,,,, +US-UT-84004,US,UT,84004,6.75,,,, +US-UT-84005,US,UT,84005,6.75,,,, +US-UT-84006,US,UT,84006,6.85,,,, +US-UT-84007,US,UT,84007,5.95,,,, +US-UT-84010,US,UT,84010,6.6,,,, +US-UT-84011,US,UT,84011,6.6,,,, +US-UT-84013,US,UT,84013,6.75,,,, +US-UT-84014,US,UT,84014,6.6,,,, +US-UT-84015,US,UT,84015,6.5,,,, +US-UT-84016,US,UT,84016,6.5,,,, +US-UT-84017,US,UT,84017,6.05,,,, +US-UT-84018,US,UT,84018,5.95,,,, +US-UT-84020,US,UT,84020,6.85,,,, +US-UT-84021,US,UT,84021,6.05,,,, +US-UT-84022,US,UT,84022,5.95,,,, +US-UT-84023,US,UT,84023,6.95,,,, +US-UT-84024,US,UT,84024,6.05,,,, +US-UT-84025,US,UT,84025,6.5,,,, +US-UT-84026,US,UT,84026,6.05,,,, +US-UT-84027,US,UT,84027,6.05,,,, +US-UT-84028,US,UT,84028,7.55,,,, +US-UT-84029,US,UT,84029,6.25,,,, +US-UT-84031,US,UT,84031,5.95,,,, +US-UT-84032,US,UT,84032,6.25,,,, +US-UT-84033,US,UT,84033,6.05,,,, +US-UT-84035,US,UT,84035,6.05,,,, +US-UT-84036,US,UT,84036,6.05,,,, +US-UT-84037,US,UT,84037,6.5,,,, +US-UT-84038,US,UT,84038,5.95,,,, +US-UT-84039,US,UT,84039,6.05,,,, +US-UT-84040,US,UT,84040,6.5,,,, +US-UT-84041,US,UT,84041,6.5,,,, +US-UT-84042,US,UT,84042,6.75,,,, +US-UT-84043,US,UT,84043,6.75,,,, +US-UT-84044,US,UT,84044,6.85,,,, +US-UT-84045,US,UT,84045,6.75,,,, +US-UT-84046,US,UT,84046,6.95,,,, +US-UT-84047,US,UT,84047,6.85,,,, +US-UT-84049,US,UT,84049,7.35,,,, +US-UT-84050,US,UT,84050,5.95,,,, +US-UT-84051,US,UT,84051,5.95,,,, +US-UT-84052,US,UT,84052,5.95,,,, +US-UT-84053,US,UT,84053,5.95,,,, +US-UT-84054,US,UT,84054,6.6,,,, +US-UT-84055,US,UT,84055,6.05,,,, +US-UT-84056,US,UT,84056,6.5,,,, +US-UT-84057,US,UT,84057,6.85,,,, +US-UT-84058,US,UT,84058,6.85,,,, +US-UT-84059,US,UT,84059,6.85,,,, +US-UT-84060,US,UT,84060,7.95,,,, +US-UT-84061,US,UT,84061,6.05,,,, +US-UT-84062,US,UT,84062,6.75,,,, +US-UT-84063,US,UT,84063,6.05,,,, +US-UT-84064,US,UT,84064,5.95,,,, +US-UT-84065,US,UT,84065,6.85,,,, +US-UT-84066,US,UT,84066,6.35,,,, +US-UT-84067,US,UT,84067,6.85,,,, +US-UT-84068,US,UT,84068,7.95,,,, +US-UT-84069,US,UT,84069,5.95,,,, +US-UT-84070,US,UT,84070,6.85,,,, +US-UT-84071,US,UT,84071,5.95,,,, +US-UT-84072,US,UT,84072,5.95,,,, +US-UT-84073,US,UT,84073,5.95,,,, +US-UT-84074,US,UT,84074,6.35,,,, +US-UT-84075,US,UT,84075,6.5,,,, +US-UT-84076,US,UT,84076,6.05,,,, +US-UT-84078,US,UT,84078,6.05,,,, +US-UT-84079,US,UT,84079,6.35,,,, +US-UT-84080,US,UT,84080,5.95,,,, +US-UT-84081,US,UT,84081,6.85,,,, +US-UT-84082,US,UT,84082,5.95,,,, +US-UT-84083,US,UT,84083,5.95,,,, +US-UT-84084,US,UT,84084,6.85,,,, +US-UT-84085,US,UT,84085,6.05,,,, +US-UT-84086,US,UT,84086,5.95,,,, +US-UT-84087,US,UT,84087,6.6,,,, +US-UT-84088,US,UT,84088,6.85,,,, +US-UT-84089,US,UT,84089,6.5,,,, +US-UT-84090,US,UT,84090,6.85,,,, +US-UT-84091,US,UT,84091,6.85,,,, +US-UT-84092,US,UT,84092,6.85,,,, +US-UT-84093,US,UT,84093,6.85,,,, +US-UT-84094,US,UT,84094,6.85,,,, +US-UT-84095,US,UT,84095,6.85,,,, +US-UT-84096,US,UT,84096,6.85,,,, +US-UT-84097,US,UT,84097,6.85,,,, +US-UT-84098,US,UT,84098,6.35,,,, +US-UT-84101,US,UT,84101,6.85,,,, +US-UT-84102,US,UT,84102,6.85,,,, +US-UT-84103,US,UT,84103,6.85,,,, +US-UT-84104,US,UT,84104,6.85,,,, +US-UT-84105,US,UT,84105,6.85,,,, +US-UT-84106,US,UT,84106,6.85,,,, +US-UT-84107,US,UT,84107,6.85,,,, +US-UT-84108,US,UT,84108,6.85,,,, +US-UT-84109,US,UT,84109,6.85,,,, +US-UT-84110,US,UT,84110,6.85,,,, +US-UT-84111,US,UT,84111,6.85,,,, +US-UT-84112,US,UT,84112,6.85,,,, +US-UT-84113,US,UT,84113,6.85,,,, +US-UT-84114,US,UT,84114,6.85,,,, +US-UT-84115,US,UT,84115,7.05,,,, +US-UT-84116,US,UT,84116,6.85,,,, +US-UT-84117,US,UT,84117,6.85,,,, +US-UT-84118,US,UT,84118,6.85,,,, +US-UT-84119,US,UT,84119,6.85,,,, +US-UT-84120,US,UT,84120,6.85,,,, +US-UT-84121,US,UT,84121,6.85,,,, +US-UT-84122,US,UT,84122,7.05,,,, +US-UT-84123,US,UT,84123,6.85,,,, +US-UT-84124,US,UT,84124,6.85,,,, +US-UT-84125,US,UT,84125,6.85,,,, +US-UT-84126,US,UT,84126,6.85,,,, +US-UT-84127,US,UT,84127,6.85,,,, +US-UT-84128,US,UT,84128,6.85,,,, +US-UT-84129,US,UT,84129,6.85,,,, +US-UT-84130,US,UT,84130,6.85,,,, +US-UT-84131,US,UT,84131,6.85,,,, +US-UT-84132,US,UT,84132,6.85,,,, +US-UT-84133,US,UT,84133,6.85,,,, +US-UT-84134,US,UT,84134,6.85,,,, +US-UT-84136,US,UT,84136,6.85,,,, +US-UT-84138,US,UT,84138,6.85,,,, +US-UT-84139,US,UT,84139,6.85,,,, +US-UT-84141,US,UT,84141,6.85,,,, +US-UT-84143,US,UT,84143,6.85,,,, +US-UT-84145,US,UT,84145,6.85,,,, +US-UT-84147,US,UT,84147,6.85,,,, +US-UT-84148,US,UT,84148,6.85,,,, +US-UT-84150,US,UT,84150,6.85,,,, +US-UT-84151,US,UT,84151,6.85,,,, +US-UT-84152,US,UT,84152,6.85,,,, +US-UT-84157,US,UT,84157,6.85,,,, +US-UT-84158,US,UT,84158,6.85,,,, +US-UT-84165,US,UT,84165,7.05,,,, +US-UT-84170,US,UT,84170,6.85,,,, +US-UT-84171,US,UT,84171,6.85,,,, +US-UT-84180,US,UT,84180,6.85,,,, +US-UT-84184,US,UT,84184,6.85,,,, +US-UT-84189,US,UT,84189,6.85,,,, +US-UT-84190,US,UT,84190,6.85,,,, +US-UT-84199,US,UT,84199,6.85,,,, +US-UT-84201,US,UT,84201,6.85,,,, +US-UT-84244,US,UT,84244,6.85,,,, +US-UT-84301,US,UT,84301,5.95,,,, +US-UT-84302,US,UT,84302,6.5,,,, +US-UT-84304,US,UT,84304,6.3,,,, +US-UT-84305,US,UT,84305,6.3,,,, +US-UT-84306,US,UT,84306,5.95,,,, +US-UT-84307,US,UT,84307,5.95,,,, +US-UT-84308,US,UT,84308,6.3,,,, +US-UT-84309,US,UT,84309,5.95,,,, +US-UT-84310,US,UT,84310,6.85,,,, +US-UT-84311,US,UT,84311,5.95,,,, +US-UT-84312,US,UT,84312,5.95,,,, +US-UT-84313,US,UT,84313,5.95,,,, +US-UT-84314,US,UT,84314,5.95,,,, +US-UT-84315,US,UT,84315,6.85,,,, +US-UT-84316,US,UT,84316,5.95,,,, +US-UT-84317,US,UT,84317,6.85,,,, +US-UT-84318,US,UT,84318,6.55,,,, +US-UT-84319,US,UT,84319,6.6,,,, +US-UT-84320,US,UT,84320,6.55,,,, +US-UT-84321,US,UT,84321,6.6,,,, +US-UT-84322,US,UT,84322,6.6,,,, +US-UT-84323,US,UT,84323,6.6,,,, +US-UT-84324,US,UT,84324,5.95,,,, +US-UT-84325,US,UT,84325,6.3,,,, +US-UT-84326,US,UT,84326,6.55,,,, +US-UT-84327,US,UT,84327,6.3,,,, +US-UT-84328,US,UT,84328,6.3,,,, +US-UT-84329,US,UT,84329,5.95,,,, +US-UT-84330,US,UT,84330,5.95,,,, +US-UT-84331,US,UT,84331,5.95,,,, +US-UT-84332,US,UT,84332,6.6,,,, +US-UT-84333,US,UT,84333,6.6,,,, +US-UT-84334,US,UT,84334,5.95,,,, +US-UT-84335,US,UT,84335,6.6,,,, +US-UT-84336,US,UT,84336,5.95,,,, +US-UT-84337,US,UT,84337,5.95,,,, +US-UT-84338,US,UT,84338,6.3,,,, +US-UT-84339,US,UT,84339,6.3,,,, +US-UT-84340,US,UT,84340,5.95,,,, +US-UT-84341,US,UT,84341,6.6,,,, +US-UT-84401,US,UT,84401,6.85,,,, +US-UT-84402,US,UT,84402,6.85,,,, +US-UT-84403,US,UT,84403,6.85,,,, +US-UT-84404,US,UT,84404,6.85,,,, +US-UT-84405,US,UT,84405,7.05,,,, +US-UT-84407,US,UT,84407,6.85,,,, +US-UT-84408,US,UT,84408,6.85,,,, +US-UT-84409,US,UT,84409,6.85,,,, +US-UT-84412,US,UT,84412,6.85,,,, +US-UT-84414,US,UT,84414,6.85,,,, +US-UT-84415,US,UT,84415,6.85,,,, +US-UT-84501,US,UT,84501,6.35,,,, +US-UT-84510,US,UT,84510,6.35,,,, +US-UT-84511,US,UT,84511,6.35,,,, +US-UT-84512,US,UT,84512,5.95,,,, +US-UT-84513,US,UT,84513,5.95,,,, +US-UT-84516,US,UT,84516,5.95,,,, +US-UT-84518,US,UT,84518,5.95,,,, +US-UT-84520,US,UT,84520,5.95,,,, +US-UT-84521,US,UT,84521,5.95,,,, +US-UT-84522,US,UT,84522,5.95,,,, +US-UT-84523,US,UT,84523,5.95,,,, +US-UT-84525,US,UT,84525,7.75,,,, +US-UT-84526,US,UT,84526,5.95,,,, +US-UT-84528,US,UT,84528,5.95,,,, +US-UT-84529,US,UT,84529,5.95,,,, +US-UT-84530,US,UT,84530,5.95,,,, +US-UT-84531,US,UT,84531,5.95,,,, +US-UT-84532,US,UT,84532,7.85,,,, +US-UT-84533,US,UT,84533,5.95,,,, +US-UT-84534,US,UT,84534,6.35,,,, +US-UT-84535,US,UT,84535,6.35,,,, +US-UT-84536,US,UT,84536,5.95,,,, +US-UT-84537,US,UT,84537,5.95,,,, +US-UT-84539,US,UT,84539,5.95,,,, +US-UT-84540,US,UT,84540,5.95,,,, +US-UT-84542,US,UT,84542,6.25,,,, +US-UT-84601,US,UT,84601,6.75,,,, +US-UT-84602,US,UT,84602,6.75,,,, +US-UT-84603,US,UT,84603,6.75,,,, +US-UT-84604,US,UT,84604,6.75,,,, +US-UT-84605,US,UT,84605,6.75,,,, +US-UT-84606,US,UT,84606,6.75,,,, +US-UT-84620,US,UT,84620,6.05,,,, +US-UT-84621,US,UT,84621,6.35,,,, +US-UT-84622,US,UT,84622,6.35,,,, +US-UT-84623,US,UT,84623,5.95,,,, +US-UT-84624,US,UT,84624,5.95,,,, +US-UT-84626,US,UT,84626,6.75,,,, +US-UT-84627,US,UT,84627,6.25,,,, +US-UT-84628,US,UT,84628,5.95,,,, +US-UT-84629,US,UT,84629,5.95,,,, +US-UT-84630,US,UT,84630,5.95,,,, +US-UT-84631,US,UT,84631,5.95,,,, +US-UT-84632,US,UT,84632,5.95,,,, +US-UT-84633,US,UT,84633,6.75,,,, +US-UT-84634,US,UT,84634,6.35,,,, +US-UT-84635,US,UT,84635,5.95,,,, +US-UT-84636,US,UT,84636,5.95,,,, +US-UT-84637,US,UT,84637,5.95,,,, +US-UT-84638,US,UT,84638,5.95,,,, +US-UT-84639,US,UT,84639,5.95,,,, +US-UT-84640,US,UT,84640,5.95,,,, +US-UT-84642,US,UT,84642,5.95,,,, +US-UT-84643,US,UT,84643,6.05,,,, +US-UT-84644,US,UT,84644,5.95,,,, +US-UT-84645,US,UT,84645,5.95,,,, +US-UT-84646,US,UT,84646,5.95,,,, +US-UT-84647,US,UT,84647,6.25,,,, +US-UT-84648,US,UT,84648,6.25,,,, +US-UT-84649,US,UT,84649,5.95,,,, +US-UT-84651,US,UT,84651,6.75,,,, +US-UT-84652,US,UT,84652,6.05,,,, +US-UT-84653,US,UT,84653,6.75,,,, +US-UT-84654,US,UT,84654,6.35,,,, +US-UT-84655,US,UT,84655,6.75,,,, +US-UT-84656,US,UT,84656,5.95,,,, +US-UT-84657,US,UT,84657,5.95,,,, +US-UT-84660,US,UT,84660,6.75,,,, +US-UT-84662,US,UT,84662,5.95,,,, +US-UT-84663,US,UT,84663,6.75,,,, +US-UT-84664,US,UT,84664,6.75,,,, +US-UT-84665,US,UT,84665,5.95,,,, +US-UT-84667,US,UT,84667,5.95,,,, +US-UT-84701,US,UT,84701,6.35,,,, +US-UT-84710,US,UT,84710,6.95,,,, +US-UT-84711,US,UT,84711,5.95,,,, +US-UT-84712,US,UT,84712,5.95,,,, +US-UT-84713,US,UT,84713,6.95,,,, +US-UT-84714,US,UT,84714,5.95,,,, +US-UT-84715,US,UT,84715,5.95,,,, +US-UT-84716,US,UT,84716,6.95,,,, +US-UT-84718,US,UT,84718,7.95,,,, +US-UT-84719,US,UT,84719,5.95,,,, +US-UT-84720,US,UT,84720,6.05,,,, +US-UT-84721,US,UT,84721,6.05,,,, +US-UT-84722,US,UT,84722,5.95,,,, +US-UT-84723,US,UT,84723,5.95,,,, +US-UT-84724,US,UT,84724,5.95,,,, +US-UT-84725,US,UT,84725,5.95,,,, +US-UT-84726,US,UT,84726,6.95,,,, +US-UT-84728,US,UT,84728,5.95,,,, +US-UT-84729,US,UT,84729,6.95,,,, +US-UT-84730,US,UT,84730,5.95,,,, +US-UT-84733,US,UT,84733,5.95,,,, +US-UT-84734,US,UT,84734,5.95,,,, +US-UT-84735,US,UT,84735,6.95,,,, +US-UT-84736,US,UT,84736,6.95,,,, +US-UT-84737,US,UT,84737,6.25,,,, +US-UT-84738,US,UT,84738,6.25,,,, +US-UT-84739,US,UT,84739,5.95,,,, +US-UT-84740,US,UT,84740,5.95,,,, +US-UT-84741,US,UT,84741,7.95,,,, +US-UT-84742,US,UT,84742,5.95,,,, +US-UT-84743,US,UT,84743,5.95,,,, +US-UT-84744,US,UT,84744,5.95,,,, +US-UT-84745,US,UT,84745,6.25,,,, +US-UT-84746,US,UT,84746,6.25,,,, +US-UT-84747,US,UT,84747,5.95,,,, +US-UT-84749,US,UT,84749,5.95,,,, +US-UT-84750,US,UT,84750,5.95,,,, +US-UT-84751,US,UT,84751,5.95,,,, +US-UT-84752,US,UT,84752,5.95,,,, +US-UT-84753,US,UT,84753,5.95,,,, +US-UT-84754,US,UT,84754,5.95,,,, +US-UT-84755,US,UT,84755,7.95,,,, +US-UT-84756,US,UT,84756,5.95,,,, +US-UT-84757,US,UT,84757,5.95,,,, +US-UT-84758,US,UT,84758,7.95,,,, +US-UT-84759,US,UT,84759,7.95,,,, +US-UT-84760,US,UT,84760,5.95,,,, +US-UT-84761,US,UT,84761,5.95,,,, +US-UT-84762,US,UT,84762,6.95,,,, +US-UT-84763,US,UT,84763,7.55,,,, +US-UT-84764,US,UT,84764,7.95,,,, +US-UT-84765,US,UT,84765,6.25,,,, +US-UT-84766,US,UT,84766,5.95,,,, +US-UT-84767,US,UT,84767,7.55,,,, +US-UT-84770,US,UT,84770,6.25,,,, +US-UT-84771,US,UT,84771,6.25,,,, +US-UT-84772,US,UT,84772,5.95,,,, +US-UT-84773,US,UT,84773,5.95,,,, +US-UT-84774,US,UT,84774,5.95,,,, +US-UT-84775,US,UT,84775,5.95,,,, +US-UT-84776,US,UT,84776,7.95,,,, +US-UT-84779,US,UT,84779,5.95,,,, +US-UT-84780,US,UT,84780,6.25,,,, +US-UT-84781,US,UT,84781,5.95,,,, +US-UT-84782,US,UT,84782,5.95,,,, +US-UT-84783,US,UT,84783,5.95,,,, +US-UT-84790,US,UT,84790,6.25,,,, +US-UT-84791,US,UT,84791,6.25,,,, +US-VA-20101,US,VA,20101,6,,,, +US-VA-20102,US,VA,20102,6,,,, +US-VA-20103,US,VA,20103,6,,,, +US-VA-20104,US,VA,20104,6,,,, +US-VA-20105,US,VA,20105,6,,,, +US-VA-20106,US,VA,20106,5.3,,,, +US-VA-20108,US,VA,20108,6,,,, +US-VA-20109,US,VA,20109,6,,,, +US-VA-20110,US,VA,20110,6,,,, +US-VA-20111,US,VA,20111,6,,,, +US-VA-20112,US,VA,20112,6,,,, +US-VA-20113,US,VA,20113,6,,,, +US-VA-20115,US,VA,20115,5.3,,,, +US-VA-20116,US,VA,20116,5.3,,,, +US-VA-20117,US,VA,20117,6,,,, +US-VA-20118,US,VA,20118,6,,,, +US-VA-20119,US,VA,20119,5.3,,,, +US-VA-20120,US,VA,20120,6,,,, +US-VA-20121,US,VA,20121,6,,,, +US-VA-20122,US,VA,20122,6,,,, +US-VA-20124,US,VA,20124,6,,,, +US-VA-20128,US,VA,20128,5.3,,,, +US-VA-20129,US,VA,20129,6,,,, +US-VA-20130,US,VA,20130,5.3,,,, +US-VA-20131,US,VA,20131,6,,,, +US-VA-20132,US,VA,20132,6,,,, +US-VA-20134,US,VA,20134,6,,,, +US-VA-20135,US,VA,20135,5.3,,,, +US-VA-20136,US,VA,20136,6,,,, +US-VA-20137,US,VA,20137,5.3,,,, +US-VA-20138,US,VA,20138,5.3,,,, +US-VA-20139,US,VA,20139,5.3,,,, +US-VA-20140,US,VA,20140,5.3,,,, +US-VA-20141,US,VA,20141,6,,,, +US-VA-20142,US,VA,20142,6,,,, +US-VA-20143,US,VA,20143,6,,,, +US-VA-20144,US,VA,20144,5.3,,,, +US-VA-20146,US,VA,20146,6,,,, +US-VA-20147,US,VA,20147,6,,,, +US-VA-20148,US,VA,20148,6,,,, +US-VA-20149,US,VA,20149,6,,,, +US-VA-20151,US,VA,20151,6,,,, +US-VA-20152,US,VA,20152,6,,,, +US-VA-20153,US,VA,20153,6,,,, +US-VA-20155,US,VA,20155,6,,,, +US-VA-20156,US,VA,20156,6,,,, +US-VA-20158,US,VA,20158,6,,,, +US-VA-20159,US,VA,20159,6,,,, +US-VA-20160,US,VA,20160,6,,,, +US-VA-20163,US,VA,20163,6,,,, +US-VA-20164,US,VA,20164,6,,,, +US-VA-20165,US,VA,20165,6,,,, +US-VA-20166,US,VA,20166,6,,,, +US-VA-20167,US,VA,20167,6,,,, +US-VA-20168,US,VA,20168,6,,,, +US-VA-20169,US,VA,20169,6,,,, +US-VA-20170,US,VA,20170,6,,,, +US-VA-20171,US,VA,20171,6,,,, +US-VA-20172,US,VA,20172,6,,,, +US-VA-20175,US,VA,20175,6,,,, +US-VA-20176,US,VA,20176,6,,,, +US-VA-20177,US,VA,20177,6,,,, +US-VA-20178,US,VA,20178,6,,,, +US-VA-20180,US,VA,20180,6,,,, +US-VA-20181,US,VA,20181,6,,,, +US-VA-20182,US,VA,20182,6,,,, +US-VA-20184,US,VA,20184,5.3,,,, +US-VA-20185,US,VA,20185,5.3,,,, +US-VA-20186,US,VA,20186,5.3,,,, +US-VA-20187,US,VA,20187,5.3,,,, +US-VA-20188,US,VA,20188,5.3,,,, +US-VA-20189,US,VA,20189,6,,,, +US-VA-20190,US,VA,20190,6,,,, +US-VA-20191,US,VA,20191,6,,,, +US-VA-20192,US,VA,20192,6,,,, +US-VA-20194,US,VA,20194,6,,,, +US-VA-20195,US,VA,20195,6,,,, +US-VA-20196,US,VA,20196,6,,,, +US-VA-20197,US,VA,20197,6,,,, +US-VA-20198,US,VA,20198,5.3,,,, +US-VA-22003,US,VA,22003,6,,,, +US-VA-22009,US,VA,22009,6,,,, +US-VA-22015,US,VA,22015,6,,,, +US-VA-22025,US,VA,22025,6,,,, +US-VA-22026,US,VA,22026,6,,,, +US-VA-22027,US,VA,22027,6,,,, +US-VA-22030,US,VA,22030,6,,,, +US-VA-22031,US,VA,22031,6,,,, +US-VA-22032,US,VA,22032,6,,,, +US-VA-22033,US,VA,22033,6,,,, +US-VA-22034,US,VA,22034,6,,,, +US-VA-22035,US,VA,22035,6,,,, +US-VA-22036,US,VA,22036,6,,,, +US-VA-22037,US,VA,22037,6,,,, +US-VA-22038,US,VA,22038,6,,,, +US-VA-22039,US,VA,22039,6,,,, +US-VA-22040,US,VA,22040,6,,,, +US-VA-22041,US,VA,22041,6,,,, +US-VA-22042,US,VA,22042,6,,,, +US-VA-22043,US,VA,22043,6,,,, +US-VA-22044,US,VA,22044,6,,,, +US-VA-22046,US,VA,22046,6,,,, +US-VA-22060,US,VA,22060,6,,,, +US-VA-22066,US,VA,22066,6,,,, +US-VA-22067,US,VA,22067,6,,,, +US-VA-22079,US,VA,22079,6,,,, +US-VA-22081,US,VA,22081,6,,,, +US-VA-22082,US,VA,22082,6,,,, +US-VA-22095,US,VA,22095,6,,,, +US-VA-22096,US,VA,22096,6,,,, +US-VA-22101,US,VA,22101,6,,,, +US-VA-22102,US,VA,22102,6,,,, +US-VA-22103,US,VA,22103,6,,,, +US-VA-22106,US,VA,22106,6,,,, +US-VA-22107,US,VA,22107,6,,,, +US-VA-22108,US,VA,22108,6,,,, +US-VA-22109,US,VA,22109,6,,,, +US-VA-22116,US,VA,22116,6,,,, +US-VA-22118,US,VA,22118,6,,,, +US-VA-22119,US,VA,22119,6,,,, +US-VA-22121,US,VA,22121,6,,,, +US-VA-22122,US,VA,22122,6,,,, +US-VA-22124,US,VA,22124,6,,,, +US-VA-22125,US,VA,22125,6,,,, +US-VA-22134,US,VA,22134,6,,,, +US-VA-22135,US,VA,22135,6,,,, +US-VA-22150,US,VA,22150,6,,,, +US-VA-22151,US,VA,22151,6,,,, +US-VA-22152,US,VA,22152,6,,,, +US-VA-22153,US,VA,22153,6,,,, +US-VA-22156,US,VA,22156,6,,,, +US-VA-22158,US,VA,22158,6,,,, +US-VA-22159,US,VA,22159,6,,,, +US-VA-22160,US,VA,22160,6,,,, +US-VA-22161,US,VA,22161,6,,,, +US-VA-22172,US,VA,22172,6,,,, +US-VA-22180,US,VA,22180,6,,,, +US-VA-22181,US,VA,22181,6,,,, +US-VA-22182,US,VA,22182,6,,,, +US-VA-22183,US,VA,22183,6,,,, +US-VA-22185,US,VA,22185,6,,,, +US-VA-22191,US,VA,22191,6,,,, +US-VA-22192,US,VA,22192,6,,,, +US-VA-22193,US,VA,22193,6,,,, +US-VA-22194,US,VA,22194,6,,,, +US-VA-22195,US,VA,22195,6,,,, +US-VA-22199,US,VA,22199,6,,,, +US-VA-22201,US,VA,22201,6,,,, +US-VA-22202,US,VA,22202,6,,,, +US-VA-22203,US,VA,22203,6,,,, +US-VA-22204,US,VA,22204,6,,,, +US-VA-22205,US,VA,22205,6,,,, +US-VA-22206,US,VA,22206,6,,,, +US-VA-22207,US,VA,22207,6,,,, +US-VA-22209,US,VA,22209,6,,,, +US-VA-22210,US,VA,22210,6,,,, +US-VA-22211,US,VA,22211,6,,,, +US-VA-22212,US,VA,22212,6,,,, +US-VA-22213,US,VA,22213,6,,,, +US-VA-22214,US,VA,22214,6,,,, +US-VA-22215,US,VA,22215,6,,,, +US-VA-22216,US,VA,22216,6,,,, +US-VA-22217,US,VA,22217,6,,,, +US-VA-22219,US,VA,22219,6,,,, +US-VA-22225,US,VA,22225,6,,,, +US-VA-22226,US,VA,22226,6,,,, +US-VA-22227,US,VA,22227,6,,,, +US-VA-22230,US,VA,22230,6,,,, +US-VA-22240,US,VA,22240,6,,,, +US-VA-22241,US,VA,22241,6,,,, +US-VA-22242,US,VA,22242,6,,,, +US-VA-22243,US,VA,22243,6,,,, +US-VA-22244,US,VA,22244,6,,,, +US-VA-22245,US,VA,22245,6,,,, +US-VA-22246,US,VA,22246,6,,,, +US-VA-22301,US,VA,22301,6,,,, +US-VA-22302,US,VA,22302,6,,,, +US-VA-22303,US,VA,22303,6,,,, +US-VA-22304,US,VA,22304,6,,,, +US-VA-22305,US,VA,22305,6,,,, +US-VA-22306,US,VA,22306,6,,,, +US-VA-22307,US,VA,22307,6,,,, +US-VA-22308,US,VA,22308,6,,,, +US-VA-22309,US,VA,22309,6,,,, +US-VA-22310,US,VA,22310,6,,,, +US-VA-22311,US,VA,22311,6,,,, +US-VA-22312,US,VA,22312,6,,,, +US-VA-22313,US,VA,22313,6,,,, +US-VA-22314,US,VA,22314,6,,,, +US-VA-22315,US,VA,22315,6,,,, +US-VA-22320,US,VA,22320,6,,,, +US-VA-22331,US,VA,22331,6,,,, +US-VA-22332,US,VA,22332,6,,,, +US-VA-22333,US,VA,22333,6,,,, +US-VA-22334,US,VA,22334,6,,,, +US-VA-22350,US,VA,22350,6,,,, +US-VA-22401,US,VA,22401,5.3,,,, +US-VA-22402,US,VA,22402,5.3,,,, +US-VA-22403,US,VA,22403,5.3,,,, +US-VA-22404,US,VA,22404,5.3,,,, +US-VA-22405,US,VA,22405,5.3,,,, +US-VA-22406,US,VA,22406,5.3,,,, +US-VA-22407,US,VA,22407,5.3,,,, +US-VA-22408,US,VA,22408,5.3,,,, +US-VA-22412,US,VA,22412,5.3,,,, +US-VA-22427,US,VA,22427,5.3,,,, +US-VA-22428,US,VA,22428,5.3,,,, +US-VA-22430,US,VA,22430,5.3,,,, +US-VA-22432,US,VA,22432,5.3,,,, +US-VA-22433,US,VA,22433,5.3,,,, +US-VA-22435,US,VA,22435,5.3,,,, +US-VA-22436,US,VA,22436,5.3,,,, +US-VA-22437,US,VA,22437,5.3,,,, +US-VA-22438,US,VA,22438,5.3,,,, +US-VA-22442,US,VA,22442,5.3,,,, +US-VA-22443,US,VA,22443,5.3,,,, +US-VA-22446,US,VA,22446,5.3,,,, +US-VA-22448,US,VA,22448,5.3,,,, +US-VA-22451,US,VA,22451,5.3,,,, +US-VA-22454,US,VA,22454,5.3,,,, +US-VA-22456,US,VA,22456,5.3,,,, +US-VA-22460,US,VA,22460,5.3,,,, +US-VA-22463,US,VA,22463,5.3,,,, +US-VA-22469,US,VA,22469,5.3,,,, +US-VA-22471,US,VA,22471,5.3,,,, +US-VA-22472,US,VA,22472,5.3,,,, +US-VA-22473,US,VA,22473,5.3,,,, +US-VA-22476,US,VA,22476,5.3,,,, +US-VA-22480,US,VA,22480,5.3,,,, +US-VA-22481,US,VA,22481,5.3,,,, +US-VA-22482,US,VA,22482,5.3,,,, +US-VA-22485,US,VA,22485,5.3,,,, +US-VA-22488,US,VA,22488,5.3,,,, +US-VA-22501,US,VA,22501,5.3,,,, +US-VA-22503,US,VA,22503,5.3,,,, +US-VA-22504,US,VA,22504,5.3,,,, +US-VA-22507,US,VA,22507,5.3,,,, +US-VA-22508,US,VA,22508,5.3,,,, +US-VA-22509,US,VA,22509,5.3,,,, +US-VA-22511,US,VA,22511,5.3,,,, +US-VA-22513,US,VA,22513,5.3,,,, +US-VA-22514,US,VA,22514,5.3,,,, +US-VA-22517,US,VA,22517,5.3,,,, +US-VA-22520,US,VA,22520,5.3,,,, +US-VA-22523,US,VA,22523,5.3,,,, +US-VA-22524,US,VA,22524,5.3,,,, +US-VA-22528,US,VA,22528,5.3,,,, +US-VA-22529,US,VA,22529,5.3,,,, +US-VA-22530,US,VA,22530,5.3,,,, +US-VA-22534,US,VA,22534,5.3,,,, +US-VA-22535,US,VA,22535,5.3,,,, +US-VA-22538,US,VA,22538,5.3,,,, +US-VA-22539,US,VA,22539,5.3,,,, +US-VA-22542,US,VA,22542,5.3,,,, +US-VA-22544,US,VA,22544,5.3,,,, +US-VA-22545,US,VA,22545,5.3,,,, +US-VA-22546,US,VA,22546,5.3,,,, +US-VA-22548,US,VA,22548,5.3,,,, +US-VA-22551,US,VA,22551,5.3,,,, +US-VA-22552,US,VA,22552,5.3,,,, +US-VA-22553,US,VA,22553,5.3,,,, +US-VA-22554,US,VA,22554,5.3,,,, +US-VA-22555,US,VA,22555,5.3,,,, +US-VA-22556,US,VA,22556,5.3,,,, +US-VA-22558,US,VA,22558,5.3,,,, +US-VA-22560,US,VA,22560,5.3,,,, +US-VA-22565,US,VA,22565,5.3,,,, +US-VA-22567,US,VA,22567,5.3,,,, +US-VA-22570,US,VA,22570,5.3,,,, +US-VA-22572,US,VA,22572,5.3,,,, +US-VA-22576,US,VA,22576,5.3,,,, +US-VA-22577,US,VA,22577,5.3,,,, +US-VA-22578,US,VA,22578,5.3,,,, +US-VA-22579,US,VA,22579,5.3,,,, +US-VA-22580,US,VA,22580,5.3,,,, +US-VA-22581,US,VA,22581,5.3,,,, +US-VA-22601,US,VA,22601,5.3,,,, +US-VA-22602,US,VA,22602,5.3,,,, +US-VA-22603,US,VA,22603,5.3,,,, +US-VA-22604,US,VA,22604,5.3,,,, +US-VA-22610,US,VA,22610,5.3,,,, +US-VA-22611,US,VA,22611,5.3,,,, +US-VA-22620,US,VA,22620,5.3,,,, +US-VA-22622,US,VA,22622,5.3,,,, +US-VA-22623,US,VA,22623,5.3,,,, +US-VA-22624,US,VA,22624,5.3,,,, +US-VA-22625,US,VA,22625,5.3,,,, +US-VA-22626,US,VA,22626,5.3,,,, +US-VA-22627,US,VA,22627,5.3,,,, +US-VA-22630,US,VA,22630,5.3,,,, +US-VA-22637,US,VA,22637,5.3,,,, +US-VA-22639,US,VA,22639,5.3,,,, +US-VA-22640,US,VA,22640,5.3,,,, +US-VA-22641,US,VA,22641,5.3,,,, +US-VA-22642,US,VA,22642,5.3,,,, +US-VA-22643,US,VA,22643,5.3,,,, +US-VA-22644,US,VA,22644,5.3,,,, +US-VA-22645,US,VA,22645,5.3,,,, +US-VA-22646,US,VA,22646,5.3,,,, +US-VA-22649,US,VA,22649,5.3,,,, +US-VA-22650,US,VA,22650,5.3,,,, +US-VA-22652,US,VA,22652,5.3,,,, +US-VA-22654,US,VA,22654,5.3,,,, +US-VA-22655,US,VA,22655,5.3,,,, +US-VA-22656,US,VA,22656,5.3,,,, +US-VA-22657,US,VA,22657,5.3,,,, +US-VA-22660,US,VA,22660,5.3,,,, +US-VA-22663,US,VA,22663,5.3,,,, +US-VA-22664,US,VA,22664,5.3,,,, +US-VA-22701,US,VA,22701,5.3,,,, +US-VA-22709,US,VA,22709,5.3,,,, +US-VA-22711,US,VA,22711,5.3,,,, +US-VA-22712,US,VA,22712,5.3,,,, +US-VA-22713,US,VA,22713,5.3,,,, +US-VA-22714,US,VA,22714,5.3,,,, +US-VA-22715,US,VA,22715,5.3,,,, +US-VA-22716,US,VA,22716,5.3,,,, +US-VA-22718,US,VA,22718,5.3,,,, +US-VA-22719,US,VA,22719,5.3,,,, +US-VA-22720,US,VA,22720,5.3,,,, +US-VA-22722,US,VA,22722,5.3,,,, +US-VA-22723,US,VA,22723,5.3,,,, +US-VA-22724,US,VA,22724,5.3,,,, +US-VA-22725,US,VA,22725,5.3,,,, +US-VA-22726,US,VA,22726,5.3,,,, +US-VA-22727,US,VA,22727,5.3,,,, +US-VA-22728,US,VA,22728,5.3,,,, +US-VA-22729,US,VA,22729,5.3,,,, +US-VA-22730,US,VA,22730,5.3,,,, +US-VA-22731,US,VA,22731,5.3,,,, +US-VA-22732,US,VA,22732,5.3,,,, +US-VA-22733,US,VA,22733,5.3,,,, +US-VA-22734,US,VA,22734,5.3,,,, +US-VA-22735,US,VA,22735,5.3,,,, +US-VA-22736,US,VA,22736,5.3,,,, +US-VA-22737,US,VA,22737,5.3,,,, +US-VA-22738,US,VA,22738,5.3,,,, +US-VA-22739,US,VA,22739,5.3,,,, +US-VA-22740,US,VA,22740,5.3,,,, +US-VA-22741,US,VA,22741,5.3,,,, +US-VA-22742,US,VA,22742,5.3,,,, +US-VA-22743,US,VA,22743,5.3,,,, +US-VA-22746,US,VA,22746,5.3,,,, +US-VA-22747,US,VA,22747,5.3,,,, +US-VA-22748,US,VA,22748,5.3,,,, +US-VA-22749,US,VA,22749,5.3,,,, +US-VA-22801,US,VA,22801,5.3,,,, +US-VA-22802,US,VA,22802,5.3,,,, +US-VA-22803,US,VA,22803,5.3,,,, +US-VA-22807,US,VA,22807,5.3,,,, +US-VA-22810,US,VA,22810,5.3,,,, +US-VA-22811,US,VA,22811,5.3,,,, +US-VA-22812,US,VA,22812,5.3,,,, +US-VA-22815,US,VA,22815,5.3,,,, +US-VA-22820,US,VA,22820,5.3,,,, +US-VA-22821,US,VA,22821,5.3,,,, +US-VA-22824,US,VA,22824,5.3,,,, +US-VA-22827,US,VA,22827,5.3,,,, +US-VA-22830,US,VA,22830,5.3,,,, +US-VA-22831,US,VA,22831,5.3,,,, +US-VA-22832,US,VA,22832,5.3,,,, +US-VA-22833,US,VA,22833,5.3,,,, +US-VA-22834,US,VA,22834,5.3,,,, +US-VA-22835,US,VA,22835,5.3,,,, +US-VA-22840,US,VA,22840,5.3,,,, +US-VA-22841,US,VA,22841,5.3,,,, +US-VA-22842,US,VA,22842,5.3,,,, +US-VA-22843,US,VA,22843,5.3,,,, +US-VA-22844,US,VA,22844,5.3,,,, +US-VA-22845,US,VA,22845,5.3,,,, +US-VA-22846,US,VA,22846,5.3,,,, +US-VA-22847,US,VA,22847,5.3,,,, +US-VA-22848,US,VA,22848,5.3,,,, +US-VA-22849,US,VA,22849,5.3,,,, +US-VA-22850,US,VA,22850,5.3,,,, +US-VA-22851,US,VA,22851,5.3,,,, +US-VA-22853,US,VA,22853,5.3,,,, +US-VA-22901,US,VA,22901,5.3,,,, +US-VA-22902,US,VA,22902,5.3,,,, +US-VA-22903,US,VA,22903,5.3,,,, +US-VA-22904,US,VA,22904,5.3,,,, +US-VA-22905,US,VA,22905,5.3,,,, +US-VA-22906,US,VA,22906,5.3,,,, +US-VA-22907,US,VA,22907,5.3,,,, +US-VA-22908,US,VA,22908,5.3,,,, +US-VA-22909,US,VA,22909,5.3,,,, +US-VA-22910,US,VA,22910,5.3,,,, +US-VA-22911,US,VA,22911,5.3,,,, +US-VA-22920,US,VA,22920,5.3,,,, +US-VA-22922,US,VA,22922,5.3,,,, +US-VA-22923,US,VA,22923,5.3,,,, +US-VA-22924,US,VA,22924,5.3,,,, +US-VA-22931,US,VA,22931,5.3,,,, +US-VA-22932,US,VA,22932,5.3,,,, +US-VA-22935,US,VA,22935,5.3,,,, +US-VA-22936,US,VA,22936,5.3,,,, +US-VA-22937,US,VA,22937,5.3,,,, +US-VA-22938,US,VA,22938,5.3,,,, +US-VA-22939,US,VA,22939,5.3,,,, +US-VA-22940,US,VA,22940,5.3,,,, +US-VA-22942,US,VA,22942,5.3,,,, +US-VA-22943,US,VA,22943,5.3,,,, +US-VA-22945,US,VA,22945,5.3,,,, +US-VA-22946,US,VA,22946,5.3,,,, +US-VA-22947,US,VA,22947,5.3,,,, +US-VA-22948,US,VA,22948,5.3,,,, +US-VA-22949,US,VA,22949,5.3,,,, +US-VA-22952,US,VA,22952,5.3,,,, +US-VA-22957,US,VA,22957,5.3,,,, +US-VA-22958,US,VA,22958,5.3,,,, +US-VA-22959,US,VA,22959,5.3,,,, +US-VA-22960,US,VA,22960,5.3,,,, +US-VA-22963,US,VA,22963,5.3,,,, +US-VA-22964,US,VA,22964,5.3,,,, +US-VA-22967,US,VA,22967,5.3,,,, +US-VA-22968,US,VA,22968,5.3,,,, +US-VA-22969,US,VA,22969,5.3,,,, +US-VA-22971,US,VA,22971,5.3,,,, +US-VA-22972,US,VA,22972,5.3,,,, +US-VA-22973,US,VA,22973,5.3,,,, +US-VA-22974,US,VA,22974,5.3,,,, +US-VA-22976,US,VA,22976,5.3,,,, +US-VA-22980,US,VA,22980,5.3,,,, +US-VA-22987,US,VA,22987,5.3,,,, +US-VA-22989,US,VA,22989,5.3,,,, +US-VA-23002,US,VA,23002,5.3,,,, +US-VA-23003,US,VA,23003,5.3,,,, +US-VA-23004,US,VA,23004,5.3,,,, +US-VA-23005,US,VA,23005,5.3,,,, +US-VA-23009,US,VA,23009,5.3,,,, +US-VA-23011,US,VA,23011,5.3,,,, +US-VA-23014,US,VA,23014,5.3,,,, +US-VA-23015,US,VA,23015,5.3,,,, +US-VA-23018,US,VA,23018,5.3,,,, +US-VA-23021,US,VA,23021,5.3,,,, +US-VA-23022,US,VA,23022,5.3,,,, +US-VA-23023,US,VA,23023,5.3,,,, +US-VA-23024,US,VA,23024,5.3,,,, +US-VA-23025,US,VA,23025,5.3,,,, +US-VA-23027,US,VA,23027,5.3,,,, +US-VA-23030,US,VA,23030,5.3,,,, +US-VA-23031,US,VA,23031,5.3,,,, +US-VA-23032,US,VA,23032,5.3,,,, +US-VA-23035,US,VA,23035,5.3,,,, +US-VA-23038,US,VA,23038,5.3,,,, +US-VA-23039,US,VA,23039,5.3,,,, +US-VA-23040,US,VA,23040,5.3,,,, +US-VA-23043,US,VA,23043,5.3,,,, +US-VA-23045,US,VA,23045,5.3,,,, +US-VA-23047,US,VA,23047,5.3,,,, +US-VA-23050,US,VA,23050,5.3,,,, +US-VA-23055,US,VA,23055,5.3,,,, +US-VA-23056,US,VA,23056,5.3,,,, +US-VA-23058,US,VA,23058,5.3,,,, +US-VA-23059,US,VA,23059,5.3,,,, +US-VA-23060,US,VA,23060,5.3,,,, +US-VA-23061,US,VA,23061,5.3,,,, +US-VA-23062,US,VA,23062,5.3,,,, +US-VA-23063,US,VA,23063,5.3,,,, +US-VA-23064,US,VA,23064,5.3,,,, +US-VA-23065,US,VA,23065,5.3,,,, +US-VA-23066,US,VA,23066,5.3,,,, +US-VA-23067,US,VA,23067,5.3,,,, +US-VA-23068,US,VA,23068,5.3,,,, +US-VA-23069,US,VA,23069,5.3,,,, +US-VA-23070,US,VA,23070,5.3,,,, +US-VA-23071,US,VA,23071,5.3,,,, +US-VA-23072,US,VA,23072,5.3,,,, +US-VA-23075,US,VA,23075,5.3,,,, +US-VA-23076,US,VA,23076,5.3,,,, +US-VA-23079,US,VA,23079,5.3,,,, +US-VA-23081,US,VA,23081,6,,,, +US-VA-23083,US,VA,23083,5.3,,,, +US-VA-23084,US,VA,23084,5.3,,,, +US-VA-23085,US,VA,23085,5.3,,,, +US-VA-23086,US,VA,23086,5.3,,,, +US-VA-23089,US,VA,23089,5.3,,,, +US-VA-23090,US,VA,23090,6,,,, +US-VA-23091,US,VA,23091,5.3,,,, +US-VA-23092,US,VA,23092,5.3,,,, +US-VA-23093,US,VA,23093,5.3,,,, +US-VA-23102,US,VA,23102,5.3,,,, +US-VA-23103,US,VA,23103,5.3,,,, +US-VA-23105,US,VA,23105,5.3,,,, +US-VA-23106,US,VA,23106,5.3,,,, +US-VA-23107,US,VA,23107,5.3,,,, +US-VA-23108,US,VA,23108,5.3,,,, +US-VA-23109,US,VA,23109,5.3,,,, +US-VA-23110,US,VA,23110,5.3,,,, +US-VA-23111,US,VA,23111,5.3,,,, +US-VA-23112,US,VA,23112,5.3,,,, +US-VA-23113,US,VA,23113,5.3,,,, +US-VA-23114,US,VA,23114,5.3,,,, +US-VA-23115,US,VA,23115,5.3,,,, +US-VA-23116,US,VA,23116,5.3,,,, +US-VA-23117,US,VA,23117,5.3,,,, +US-VA-23119,US,VA,23119,5.3,,,, +US-VA-23120,US,VA,23120,5.3,,,, +US-VA-23123,US,VA,23123,5.3,,,, +US-VA-23124,US,VA,23124,5.3,,,, +US-VA-23125,US,VA,23125,5.3,,,, +US-VA-23126,US,VA,23126,5.3,,,, +US-VA-23128,US,VA,23128,5.3,,,, +US-VA-23129,US,VA,23129,5.3,,,, +US-VA-23130,US,VA,23130,5.3,,,, +US-VA-23131,US,VA,23131,5.3,,,, +US-VA-23138,US,VA,23138,5.3,,,, +US-VA-23139,US,VA,23139,5.3,,,, +US-VA-23140,US,VA,23140,5.3,,,, +US-VA-23141,US,VA,23141,5.3,,,, +US-VA-23146,US,VA,23146,5.3,,,, +US-VA-23147,US,VA,23147,5.3,,,, +US-VA-23148,US,VA,23148,5.3,,,, +US-VA-23149,US,VA,23149,5.3,,,, +US-VA-23150,US,VA,23150,5.3,,,, +US-VA-23153,US,VA,23153,5.3,,,, +US-VA-23154,US,VA,23154,5.3,,,, +US-VA-23156,US,VA,23156,5.3,,,, +US-VA-23160,US,VA,23160,5.3,,,, +US-VA-23161,US,VA,23161,5.3,,,, +US-VA-23162,US,VA,23162,5.3,,,, +US-VA-23163,US,VA,23163,5.3,,,, +US-VA-23168,US,VA,23168,6,,,, +US-VA-23169,US,VA,23169,5.3,,,, +US-VA-23170,US,VA,23170,5.3,,,, +US-VA-23173,US,VA,23173,5.3,,,, +US-VA-23175,US,VA,23175,5.3,,,, +US-VA-23176,US,VA,23176,5.3,,,, +US-VA-23177,US,VA,23177,5.3,,,, +US-VA-23178,US,VA,23178,5.3,,,, +US-VA-23180,US,VA,23180,5.3,,,, +US-VA-23181,US,VA,23181,5.3,,,, +US-VA-23183,US,VA,23183,5.3,,,, +US-VA-23184,US,VA,23184,5.3,,,, +US-VA-23185,US,VA,23185,6,,,, +US-VA-23186,US,VA,23186,6,,,, +US-VA-23187,US,VA,23187,6,,,, +US-VA-23188,US,VA,23188,6,,,, +US-VA-23190,US,VA,23190,5.3,,,, +US-VA-23192,US,VA,23192,5.3,,,, +US-VA-23218,US,VA,23218,5.3,,,, +US-VA-23219,US,VA,23219,5.3,,,, +US-VA-23220,US,VA,23220,5.3,,,, +US-VA-23221,US,VA,23221,5.3,,,, +US-VA-23222,US,VA,23222,5.3,,,, +US-VA-23223,US,VA,23223,5.3,,,, +US-VA-23224,US,VA,23224,5.3,,,, +US-VA-23225,US,VA,23225,5.3,,,, +US-VA-23226,US,VA,23226,5.3,,,, +US-VA-23227,US,VA,23227,5.3,,,, +US-VA-23228,US,VA,23228,5.3,,,, +US-VA-23229,US,VA,23229,5.3,,,, +US-VA-23230,US,VA,23230,5.3,,,, +US-VA-23231,US,VA,23231,5.3,,,, +US-VA-23232,US,VA,23232,5.3,,,, +US-VA-23233,US,VA,23233,5.3,,,, +US-VA-23234,US,VA,23234,5.3,,,, +US-VA-23235,US,VA,23235,5.3,,,, +US-VA-23236,US,VA,23236,5.3,,,, +US-VA-23237,US,VA,23237,5.3,,,, +US-VA-23238,US,VA,23238,5.3,,,, +US-VA-23241,US,VA,23241,5.3,,,, +US-VA-23242,US,VA,23242,5.3,,,, +US-VA-23249,US,VA,23249,5.3,,,, +US-VA-23250,US,VA,23250,5.3,,,, +US-VA-23255,US,VA,23255,5.3,,,, +US-VA-23260,US,VA,23260,5.3,,,, +US-VA-23261,US,VA,23261,5.3,,,, +US-VA-23269,US,VA,23269,5.3,,,, +US-VA-23273,US,VA,23273,5.3,,,, +US-VA-23274,US,VA,23274,5.3,,,, +US-VA-23276,US,VA,23276,5.3,,,, +US-VA-23278,US,VA,23278,5.3,,,, +US-VA-23279,US,VA,23279,5.3,,,, +US-VA-23282,US,VA,23282,5.3,,,, +US-VA-23284,US,VA,23284,5.3,,,, +US-VA-23285,US,VA,23285,5.3,,,, +US-VA-23286,US,VA,23286,5.3,,,, +US-VA-23288,US,VA,23288,5.3,,,, +US-VA-23289,US,VA,23289,5.3,,,, +US-VA-23290,US,VA,23290,5.3,,,, +US-VA-23291,US,VA,23291,5.3,,,, +US-VA-23292,US,VA,23292,5.3,,,, +US-VA-23293,US,VA,23293,5.3,,,, +US-VA-23294,US,VA,23294,5.3,,,, +US-VA-23295,US,VA,23295,5.3,,,, +US-VA-23297,US,VA,23297,5.3,,,, +US-VA-23298,US,VA,23298,5.3,,,, +US-VA-23301,US,VA,23301,5.3,,,, +US-VA-23302,US,VA,23302,5.3,,,, +US-VA-23303,US,VA,23303,5.3,,,, +US-VA-23304,US,VA,23304,6,,,, +US-VA-23306,US,VA,23306,5.3,,,, +US-VA-23307,US,VA,23307,5.3,,,, +US-VA-23308,US,VA,23308,5.3,,,, +US-VA-23310,US,VA,23310,5.3,,,, +US-VA-23313,US,VA,23313,5.3,,,, +US-VA-23314,US,VA,23314,6,,,, +US-VA-23315,US,VA,23315,6,,,, +US-VA-23316,US,VA,23316,5.3,,,, +US-VA-23320,US,VA,23320,6,,,, +US-VA-23321,US,VA,23321,6,,,, +US-VA-23322,US,VA,23322,6,,,, +US-VA-23323,US,VA,23323,6,,,, +US-VA-23324,US,VA,23324,6,,,, +US-VA-23325,US,VA,23325,6,,,, +US-VA-23326,US,VA,23326,6,,,, +US-VA-23327,US,VA,23327,6,,,, +US-VA-23328,US,VA,23328,6,,,, +US-VA-23336,US,VA,23336,5.3,,,, +US-VA-23337,US,VA,23337,5.3,,,, +US-VA-23341,US,VA,23341,5.3,,,, +US-VA-23345,US,VA,23345,5.3,,,, +US-VA-23347,US,VA,23347,5.3,,,, +US-VA-23350,US,VA,23350,5.3,,,, +US-VA-23354,US,VA,23354,5.3,,,, +US-VA-23356,US,VA,23356,5.3,,,, +US-VA-23357,US,VA,23357,5.3,,,, +US-VA-23358,US,VA,23358,5.3,,,, +US-VA-23359,US,VA,23359,5.3,,,, +US-VA-23389,US,VA,23389,5.3,,,, +US-VA-23395,US,VA,23395,5.3,,,, +US-VA-23396,US,VA,23396,5.3,,,, +US-VA-23397,US,VA,23397,6,,,, +US-VA-23398,US,VA,23398,5.3,,,, +US-VA-23399,US,VA,23399,5.3,,,, +US-VA-23401,US,VA,23401,5.3,,,, +US-VA-23404,US,VA,23404,5.3,,,, +US-VA-23405,US,VA,23405,5.3,,,, +US-VA-23407,US,VA,23407,5.3,,,, +US-VA-23408,US,VA,23408,5.3,,,, +US-VA-23409,US,VA,23409,5.3,,,, +US-VA-23410,US,VA,23410,5.3,,,, +US-VA-23412,US,VA,23412,5.3,,,, +US-VA-23413,US,VA,23413,5.3,,,, +US-VA-23414,US,VA,23414,5.3,,,, +US-VA-23415,US,VA,23415,5.3,,,, +US-VA-23416,US,VA,23416,5.3,,,, +US-VA-23417,US,VA,23417,5.3,,,, +US-VA-23418,US,VA,23418,5.3,,,, +US-VA-23419,US,VA,23419,5.3,,,, +US-VA-23420,US,VA,23420,5.3,,,, +US-VA-23421,US,VA,23421,5.3,,,, +US-VA-23422,US,VA,23422,5.3,,,, +US-VA-23423,US,VA,23423,5.3,,,, +US-VA-23424,US,VA,23424,6,,,, +US-VA-23426,US,VA,23426,5.3,,,, +US-VA-23427,US,VA,23427,5.3,,,, +US-VA-23429,US,VA,23429,5.3,,,, +US-VA-23430,US,VA,23430,6,,,, +US-VA-23431,US,VA,23431,6,,,, +US-VA-23432,US,VA,23432,6,,,, +US-VA-23433,US,VA,23433,6,,,, +US-VA-23434,US,VA,23434,6,,,, +US-VA-23435,US,VA,23435,6,,,, +US-VA-23436,US,VA,23436,6,,,, +US-VA-23437,US,VA,23437,6,,,, +US-VA-23438,US,VA,23438,6,,,, +US-VA-23439,US,VA,23439,6,,,, +US-VA-23440,US,VA,23440,5.3,,,, +US-VA-23441,US,VA,23441,5.3,,,, +US-VA-23442,US,VA,23442,5.3,,,, +US-VA-23443,US,VA,23443,5.3,,,, +US-VA-23450,US,VA,23450,6,,,, +US-VA-23451,US,VA,23451,6,,,, +US-VA-23452,US,VA,23452,6,,,, +US-VA-23453,US,VA,23453,6,,,, +US-VA-23454,US,VA,23454,6,,,, +US-VA-23455,US,VA,23455,6,,,, +US-VA-23456,US,VA,23456,6,,,, +US-VA-23457,US,VA,23457,6,,,, +US-VA-23458,US,VA,23458,6,,,, +US-VA-23459,US,VA,23459,6,,,, +US-VA-23460,US,VA,23460,6,,,, +US-VA-23461,US,VA,23461,6,,,, +US-VA-23462,US,VA,23462,6,,,, +US-VA-23463,US,VA,23463,6,,,, +US-VA-23464,US,VA,23464,6,,,, +US-VA-23465,US,VA,23465,6,,,, +US-VA-23466,US,VA,23466,6,,,, +US-VA-23467,US,VA,23467,6,,,, +US-VA-23471,US,VA,23471,6,,,, +US-VA-23479,US,VA,23479,6,,,, +US-VA-23480,US,VA,23480,5.3,,,, +US-VA-23482,US,VA,23482,5.3,,,, +US-VA-23483,US,VA,23483,5.3,,,, +US-VA-23486,US,VA,23486,5.3,,,, +US-VA-23487,US,VA,23487,6,,,, +US-VA-23488,US,VA,23488,5.3,,,, +US-VA-23501,US,VA,23501,6,,,, +US-VA-23502,US,VA,23502,6,,,, +US-VA-23503,US,VA,23503,6,,,, +US-VA-23504,US,VA,23504,6,,,, +US-VA-23505,US,VA,23505,6,,,, +US-VA-23506,US,VA,23506,6,,,, +US-VA-23507,US,VA,23507,6,,,, +US-VA-23508,US,VA,23508,6,,,, +US-VA-23509,US,VA,23509,6,,,, +US-VA-23510,US,VA,23510,6,,,, +US-VA-23511,US,VA,23511,6,,,, +US-VA-23513,US,VA,23513,6,,,, +US-VA-23514,US,VA,23514,6,,,, +US-VA-23515,US,VA,23515,6,,,, +US-VA-23517,US,VA,23517,6,,,, +US-VA-23518,US,VA,23518,6,,,, +US-VA-23519,US,VA,23519,6,,,, +US-VA-23520,US,VA,23520,6,,,, +US-VA-23521,US,VA,23521,6,,,, +US-VA-23523,US,VA,23523,6,,,, +US-VA-23529,US,VA,23529,6,,,, +US-VA-23541,US,VA,23541,6,,,, +US-VA-23551,US,VA,23551,6,,,, +US-VA-23601,US,VA,23601,6,,,, +US-VA-23602,US,VA,23602,6,,,, +US-VA-23603,US,VA,23603,6,,,, +US-VA-23604,US,VA,23604,6,,,, +US-VA-23605,US,VA,23605,6,,,, +US-VA-23606,US,VA,23606,6,,,, +US-VA-23607,US,VA,23607,6,,,, +US-VA-23608,US,VA,23608,6,,,, +US-VA-23609,US,VA,23609,6,,,, +US-VA-23612,US,VA,23612,6,,,, +US-VA-23628,US,VA,23628,6,,,, +US-VA-23630,US,VA,23630,6,,,, +US-VA-23651,US,VA,23651,6,,,, +US-VA-23661,US,VA,23661,6,,,, +US-VA-23662,US,VA,23662,6,,,, +US-VA-23663,US,VA,23663,6,,,, +US-VA-23664,US,VA,23664,6,,,, +US-VA-23665,US,VA,23665,6,,,, +US-VA-23666,US,VA,23666,6,,,, +US-VA-23667,US,VA,23667,6,,,, +US-VA-23668,US,VA,23668,6,,,, +US-VA-23669,US,VA,23669,6,,,, +US-VA-23670,US,VA,23670,6,,,, +US-VA-23681,US,VA,23681,6,,,, +US-VA-23690,US,VA,23690,6,,,, +US-VA-23691,US,VA,23691,6,,,, +US-VA-23692,US,VA,23692,6,,,, +US-VA-23693,US,VA,23693,6,,,, +US-VA-23694,US,VA,23694,6,,,, +US-VA-23696,US,VA,23696,6,,,, +US-VA-23701,US,VA,23701,6,,,, +US-VA-23702,US,VA,23702,6,,,, +US-VA-23703,US,VA,23703,6,,,, +US-VA-23704,US,VA,23704,6,,,, +US-VA-23705,US,VA,23705,6,,,, +US-VA-23707,US,VA,23707,6,,,, +US-VA-23708,US,VA,23708,6,,,, +US-VA-23709,US,VA,23709,6,,,, +US-VA-23801,US,VA,23801,5.3,,,, +US-VA-23803,US,VA,23803,5.3,,,, +US-VA-23804,US,VA,23804,5.3,,,, +US-VA-23805,US,VA,23805,5.3,,,, +US-VA-23806,US,VA,23806,5.3,,,, +US-VA-23821,US,VA,23821,5.3,,,, +US-VA-23822,US,VA,23822,5.3,,,, +US-VA-23824,US,VA,23824,5.3,,,, +US-VA-23827,US,VA,23827,6,,,, +US-VA-23828,US,VA,23828,6,,,, +US-VA-23829,US,VA,23829,6,,,, +US-VA-23830,US,VA,23830,5.3,,,, +US-VA-23831,US,VA,23831,5.3,,,, +US-VA-23832,US,VA,23832,5.3,,,, +US-VA-23833,US,VA,23833,5.3,,,, +US-VA-23834,US,VA,23834,5.3,,,, +US-VA-23836,US,VA,23836,5.3,,,, +US-VA-23837,US,VA,23837,6,,,, +US-VA-23838,US,VA,23838,5.3,,,, +US-VA-23839,US,VA,23839,5.3,,,, +US-VA-23840,US,VA,23840,5.3,,,, +US-VA-23841,US,VA,23841,5.3,,,, +US-VA-23842,US,VA,23842,5.3,,,, +US-VA-23843,US,VA,23843,5.3,,,, +US-VA-23844,US,VA,23844,6,,,, +US-VA-23845,US,VA,23845,5.3,,,, +US-VA-23846,US,VA,23846,5.3,,,, +US-VA-23847,US,VA,23847,5.3,,,, +US-VA-23850,US,VA,23850,5.3,,,, +US-VA-23851,US,VA,23851,6,,,, +US-VA-23856,US,VA,23856,5.3,,,, +US-VA-23857,US,VA,23857,5.3,,,, +US-VA-23860,US,VA,23860,5.3,,,, +US-VA-23866,US,VA,23866,6,,,, +US-VA-23867,US,VA,23867,5.3,,,, +US-VA-23868,US,VA,23868,5.3,,,, +US-VA-23870,US,VA,23870,5.3,,,, +US-VA-23872,US,VA,23872,5.3,,,, +US-VA-23874,US,VA,23874,6,,,, +US-VA-23875,US,VA,23875,5.3,,,, +US-VA-23876,US,VA,23876,5.3,,,, +US-VA-23878,US,VA,23878,6,,,, +US-VA-23879,US,VA,23879,5.3,,,, +US-VA-23881,US,VA,23881,5.3,,,, +US-VA-23882,US,VA,23882,5.3,,,, +US-VA-23883,US,VA,23883,5.3,,,, +US-VA-23884,US,VA,23884,5.3,,,, +US-VA-23885,US,VA,23885,5.3,,,, +US-VA-23887,US,VA,23887,5.3,,,, +US-VA-23888,US,VA,23888,5.3,,,, +US-VA-23889,US,VA,23889,5.3,,,, +US-VA-23890,US,VA,23890,5.3,,,, +US-VA-23891,US,VA,23891,5.3,,,, +US-VA-23893,US,VA,23893,5.3,,,, +US-VA-23894,US,VA,23894,5.3,,,, +US-VA-23897,US,VA,23897,5.3,,,, +US-VA-23898,US,VA,23898,6,,,, +US-VA-23899,US,VA,23899,5.3,,,, +US-VA-23901,US,VA,23901,5.3,,,, +US-VA-23909,US,VA,23909,5.3,,,, +US-VA-23915,US,VA,23915,5.3,,,, +US-VA-23917,US,VA,23917,5.3,,,, +US-VA-23919,US,VA,23919,5.3,,,, +US-VA-23920,US,VA,23920,5.3,,,, +US-VA-23921,US,VA,23921,5.3,,,, +US-VA-23922,US,VA,23922,5.3,,,, +US-VA-23923,US,VA,23923,5.3,,,, +US-VA-23924,US,VA,23924,5.3,,,, +US-VA-23927,US,VA,23927,5.3,,,, +US-VA-23930,US,VA,23930,5.3,,,, +US-VA-23934,US,VA,23934,5.3,,,, +US-VA-23936,US,VA,23936,5.3,,,, +US-VA-23937,US,VA,23937,5.3,,,, +US-VA-23938,US,VA,23938,5.3,,,, +US-VA-23939,US,VA,23939,5.3,,,, +US-VA-23941,US,VA,23941,5.3,,,, +US-VA-23942,US,VA,23942,5.3,,,, +US-VA-23943,US,VA,23943,5.3,,,, +US-VA-23944,US,VA,23944,5.3,,,, +US-VA-23947,US,VA,23947,5.3,,,, +US-VA-23950,US,VA,23950,5.3,,,, +US-VA-23952,US,VA,23952,5.3,,,, +US-VA-23954,US,VA,23954,5.3,,,, +US-VA-23955,US,VA,23955,5.3,,,, +US-VA-23958,US,VA,23958,5.3,,,, +US-VA-23959,US,VA,23959,5.3,,,, +US-VA-23960,US,VA,23960,5.3,,,, +US-VA-23962,US,VA,23962,5.3,,,, +US-VA-23963,US,VA,23963,5.3,,,, +US-VA-23964,US,VA,23964,5.3,,,, +US-VA-23966,US,VA,23966,5.3,,,, +US-VA-23967,US,VA,23967,5.3,,,, +US-VA-23968,US,VA,23968,5.3,,,, +US-VA-23970,US,VA,23970,5.3,,,, +US-VA-23974,US,VA,23974,5.3,,,, +US-VA-23976,US,VA,23976,5.3,,,, +US-VA-24001,US,VA,24001,5.3,,,, +US-VA-24002,US,VA,24002,5.3,,,, +US-VA-24003,US,VA,24003,5.3,,,, +US-VA-24004,US,VA,24004,5.3,,,, +US-VA-24005,US,VA,24005,5.3,,,, +US-VA-24006,US,VA,24006,5.3,,,, +US-VA-24007,US,VA,24007,5.3,,,, +US-VA-24008,US,VA,24008,5.3,,,, +US-VA-24009,US,VA,24009,5.3,,,, +US-VA-24010,US,VA,24010,5.3,,,, +US-VA-24011,US,VA,24011,5.3,,,, +US-VA-24012,US,VA,24012,5.3,,,, +US-VA-24013,US,VA,24013,5.3,,,, +US-VA-24014,US,VA,24014,5.3,,,, +US-VA-24015,US,VA,24015,5.3,,,, +US-VA-24016,US,VA,24016,5.3,,,, +US-VA-24017,US,VA,24017,5.3,,,, +US-VA-24018,US,VA,24018,5.3,,,, +US-VA-24019,US,VA,24019,5.3,,,, +US-VA-24020,US,VA,24020,5.3,,,, +US-VA-24022,US,VA,24022,5.3,,,, +US-VA-24023,US,VA,24023,5.3,,,, +US-VA-24024,US,VA,24024,5.3,,,, +US-VA-24025,US,VA,24025,5.3,,,, +US-VA-24026,US,VA,24026,5.3,,,, +US-VA-24027,US,VA,24027,5.3,,,, +US-VA-24028,US,VA,24028,5.3,,,, +US-VA-24029,US,VA,24029,5.3,,,, +US-VA-24030,US,VA,24030,5.3,,,, +US-VA-24031,US,VA,24031,5.3,,,, +US-VA-24032,US,VA,24032,5.3,,,, +US-VA-24033,US,VA,24033,5.3,,,, +US-VA-24034,US,VA,24034,5.3,,,, +US-VA-24035,US,VA,24035,5.3,,,, +US-VA-24036,US,VA,24036,5.3,,,, +US-VA-24037,US,VA,24037,5.3,,,, +US-VA-24038,US,VA,24038,5.3,,,, +US-VA-24040,US,VA,24040,5.3,,,, +US-VA-24042,US,VA,24042,5.3,,,, +US-VA-24043,US,VA,24043,5.3,,,, +US-VA-24050,US,VA,24050,5.3,,,, +US-VA-24053,US,VA,24053,5.3,,,, +US-VA-24054,US,VA,24054,5.3,,,, +US-VA-24055,US,VA,24055,5.3,,,, +US-VA-24058,US,VA,24058,5.3,,,, +US-VA-24059,US,VA,24059,5.3,,,, +US-VA-24060,US,VA,24060,5.3,,,, +US-VA-24061,US,VA,24061,5.3,,,, +US-VA-24062,US,VA,24062,5.3,,,, +US-VA-24063,US,VA,24063,5.3,,,, +US-VA-24064,US,VA,24064,5.3,,,, +US-VA-24065,US,VA,24065,5.3,,,, +US-VA-24066,US,VA,24066,5.3,,,, +US-VA-24067,US,VA,24067,5.3,,,, +US-VA-24068,US,VA,24068,5.3,,,, +US-VA-24069,US,VA,24069,5.3,,,, +US-VA-24070,US,VA,24070,5.3,,,, +US-VA-24072,US,VA,24072,5.3,,,, +US-VA-24073,US,VA,24073,5.3,,,, +US-VA-24076,US,VA,24076,5.3,,,, +US-VA-24077,US,VA,24077,5.3,,,, +US-VA-24078,US,VA,24078,5.3,,,, +US-VA-24079,US,VA,24079,5.3,,,, +US-VA-24082,US,VA,24082,5.3,,,, +US-VA-24083,US,VA,24083,5.3,,,, +US-VA-24084,US,VA,24084,5.3,,,, +US-VA-24085,US,VA,24085,5.3,,,, +US-VA-24086,US,VA,24086,5.3,,,, +US-VA-24087,US,VA,24087,5.3,,,, +US-VA-24088,US,VA,24088,5.3,,,, +US-VA-24089,US,VA,24089,5.3,,,, +US-VA-24090,US,VA,24090,5.3,,,, +US-VA-24091,US,VA,24091,5.3,,,, +US-VA-24092,US,VA,24092,5.3,,,, +US-VA-24093,US,VA,24093,5.3,,,, +US-VA-24095,US,VA,24095,5.3,,,, +US-VA-24101,US,VA,24101,5.3,,,, +US-VA-24102,US,VA,24102,5.3,,,, +US-VA-24104,US,VA,24104,5.3,,,, +US-VA-24105,US,VA,24105,5.3,,,, +US-VA-24112,US,VA,24112,5.3,,,, +US-VA-24113,US,VA,24113,5.3,,,, +US-VA-24114,US,VA,24114,5.3,,,, +US-VA-24115,US,VA,24115,5.3,,,, +US-VA-24120,US,VA,24120,5.3,,,, +US-VA-24121,US,VA,24121,5.3,,,, +US-VA-24122,US,VA,24122,5.3,,,, +US-VA-24124,US,VA,24124,5.3,,,, +US-VA-24127,US,VA,24127,5.3,,,, +US-VA-24128,US,VA,24128,5.3,,,, +US-VA-24129,US,VA,24129,5.3,,,, +US-VA-24130,US,VA,24130,5.3,,,, +US-VA-24131,US,VA,24131,5.3,,,, +US-VA-24132,US,VA,24132,5.3,,,, +US-VA-24133,US,VA,24133,5.3,,,, +US-VA-24134,US,VA,24134,5.3,,,, +US-VA-24136,US,VA,24136,5.3,,,, +US-VA-24137,US,VA,24137,5.3,,,, +US-VA-24138,US,VA,24138,5.3,,,, +US-VA-24139,US,VA,24139,5.3,,,, +US-VA-24141,US,VA,24141,5.3,,,, +US-VA-24142,US,VA,24142,5.3,,,, +US-VA-24143,US,VA,24143,5.3,,,, +US-VA-24146,US,VA,24146,5.3,,,, +US-VA-24147,US,VA,24147,5.3,,,, +US-VA-24148,US,VA,24148,5.3,,,, +US-VA-24149,US,VA,24149,5.3,,,, +US-VA-24150,US,VA,24150,5.3,,,, +US-VA-24151,US,VA,24151,5.3,,,, +US-VA-24153,US,VA,24153,5.3,,,, +US-VA-24155,US,VA,24155,5.3,,,, +US-VA-24157,US,VA,24157,5.3,,,, +US-VA-24161,US,VA,24161,5.3,,,, +US-VA-24162,US,VA,24162,5.3,,,, +US-VA-24165,US,VA,24165,5.3,,,, +US-VA-24167,US,VA,24167,5.3,,,, +US-VA-24168,US,VA,24168,5.3,,,, +US-VA-24171,US,VA,24171,5.3,,,, +US-VA-24174,US,VA,24174,5.3,,,, +US-VA-24175,US,VA,24175,5.3,,,, +US-VA-24176,US,VA,24176,5.3,,,, +US-VA-24177,US,VA,24177,5.3,,,, +US-VA-24178,US,VA,24178,5.3,,,, +US-VA-24179,US,VA,24179,5.3,,,, +US-VA-24184,US,VA,24184,5.3,,,, +US-VA-24185,US,VA,24185,5.3,,,, +US-VA-24201,US,VA,24201,5.3,,,, +US-VA-24202,US,VA,24202,5.3,,,, +US-VA-24203,US,VA,24203,5.3,,,, +US-VA-24205,US,VA,24205,5.3,,,, +US-VA-24209,US,VA,24209,5.3,,,, +US-VA-24210,US,VA,24210,5.3,,,, +US-VA-24211,US,VA,24211,5.3,,,, +US-VA-24212,US,VA,24212,5.3,,,, +US-VA-24215,US,VA,24215,5.3,,,, +US-VA-24216,US,VA,24216,5.3,,,, +US-VA-24217,US,VA,24217,5.3,,,, +US-VA-24218,US,VA,24218,5.3,,,, +US-VA-24219,US,VA,24219,5.3,,,, +US-VA-24220,US,VA,24220,5.3,,,, +US-VA-24221,US,VA,24221,5.3,,,, +US-VA-24224,US,VA,24224,5.3,,,, +US-VA-24225,US,VA,24225,5.3,,,, +US-VA-24226,US,VA,24226,5.3,,,, +US-VA-24228,US,VA,24228,5.3,,,, +US-VA-24230,US,VA,24230,5.3,,,, +US-VA-24236,US,VA,24236,5.3,,,, +US-VA-24237,US,VA,24237,5.3,,,, +US-VA-24239,US,VA,24239,5.3,,,, +US-VA-24243,US,VA,24243,5.3,,,, +US-VA-24244,US,VA,24244,5.3,,,, +US-VA-24245,US,VA,24245,5.3,,,, +US-VA-24246,US,VA,24246,5.3,,,, +US-VA-24248,US,VA,24248,5.3,,,, +US-VA-24250,US,VA,24250,5.3,,,, +US-VA-24251,US,VA,24251,5.3,,,, +US-VA-24256,US,VA,24256,5.3,,,, +US-VA-24258,US,VA,24258,5.3,,,, +US-VA-24260,US,VA,24260,5.3,,,, +US-VA-24263,US,VA,24263,5.3,,,, +US-VA-24265,US,VA,24265,5.3,,,, +US-VA-24266,US,VA,24266,5.3,,,, +US-VA-24269,US,VA,24269,5.3,,,, +US-VA-24270,US,VA,24270,5.3,,,, +US-VA-24271,US,VA,24271,5.3,,,, +US-VA-24272,US,VA,24272,5.3,,,, +US-VA-24273,US,VA,24273,5.3,,,, +US-VA-24277,US,VA,24277,5.3,,,, +US-VA-24279,US,VA,24279,5.3,,,, +US-VA-24280,US,VA,24280,5.3,,,, +US-VA-24281,US,VA,24281,5.3,,,, +US-VA-24282,US,VA,24282,5.3,,,, +US-VA-24283,US,VA,24283,5.3,,,, +US-VA-24290,US,VA,24290,5.3,,,, +US-VA-24292,US,VA,24292,5.3,,,, +US-VA-24293,US,VA,24293,5.3,,,, +US-VA-24301,US,VA,24301,5.3,,,, +US-VA-24311,US,VA,24311,5.3,,,, +US-VA-24312,US,VA,24312,5.3,,,, +US-VA-24313,US,VA,24313,5.3,,,, +US-VA-24314,US,VA,24314,5.3,,,, +US-VA-24315,US,VA,24315,5.3,,,, +US-VA-24316,US,VA,24316,5.3,,,, +US-VA-24317,US,VA,24317,5.3,,,, +US-VA-24318,US,VA,24318,5.3,,,, +US-VA-24319,US,VA,24319,5.3,,,, +US-VA-24322,US,VA,24322,5.3,,,, +US-VA-24323,US,VA,24323,5.3,,,, +US-VA-24324,US,VA,24324,5.3,,,, +US-VA-24325,US,VA,24325,5.3,,,, +US-VA-24326,US,VA,24326,5.3,,,, +US-VA-24327,US,VA,24327,5.3,,,, +US-VA-24328,US,VA,24328,5.3,,,, +US-VA-24330,US,VA,24330,5.3,,,, +US-VA-24333,US,VA,24333,5.3,,,, +US-VA-24340,US,VA,24340,5.3,,,, +US-VA-24343,US,VA,24343,5.3,,,, +US-VA-24347,US,VA,24347,5.3,,,, +US-VA-24348,US,VA,24348,5.3,,,, +US-VA-24350,US,VA,24350,5.3,,,, +US-VA-24351,US,VA,24351,5.3,,,, +US-VA-24352,US,VA,24352,5.3,,,, +US-VA-24354,US,VA,24354,5.3,,,, +US-VA-24360,US,VA,24360,5.3,,,, +US-VA-24361,US,VA,24361,5.3,,,, +US-VA-24363,US,VA,24363,5.3,,,, +US-VA-24366,US,VA,24366,5.3,,,, +US-VA-24368,US,VA,24368,5.3,,,, +US-VA-24370,US,VA,24370,5.3,,,, +US-VA-24374,US,VA,24374,5.3,,,, +US-VA-24375,US,VA,24375,5.3,,,, +US-VA-24377,US,VA,24377,5.3,,,, +US-VA-24378,US,VA,24378,5.3,,,, +US-VA-24380,US,VA,24380,5.3,,,, +US-VA-24381,US,VA,24381,5.3,,,, +US-VA-24382,US,VA,24382,5.3,,,, +US-VA-24401,US,VA,24401,5.3,,,, +US-VA-24402,US,VA,24402,5.3,,,, +US-VA-24411,US,VA,24411,5.3,,,, +US-VA-24412,US,VA,24412,5.3,,,, +US-VA-24413,US,VA,24413,5.3,,,, +US-VA-24415,US,VA,24415,5.3,,,, +US-VA-24416,US,VA,24416,5.3,,,, +US-VA-24421,US,VA,24421,5.3,,,, +US-VA-24422,US,VA,24422,5.3,,,, +US-VA-24426,US,VA,24426,5.3,,,, +US-VA-24430,US,VA,24430,5.3,,,, +US-VA-24431,US,VA,24431,5.3,,,, +US-VA-24432,US,VA,24432,5.3,,,, +US-VA-24433,US,VA,24433,5.3,,,, +US-VA-24435,US,VA,24435,5.3,,,, +US-VA-24437,US,VA,24437,5.3,,,, +US-VA-24438,US,VA,24438,5.3,,,, +US-VA-24439,US,VA,24439,5.3,,,, +US-VA-24440,US,VA,24440,5.3,,,, +US-VA-24441,US,VA,24441,5.3,,,, +US-VA-24442,US,VA,24442,5.3,,,, +US-VA-24445,US,VA,24445,5.3,,,, +US-VA-24448,US,VA,24448,5.3,,,, +US-VA-24450,US,VA,24450,5.3,,,, +US-VA-24457,US,VA,24457,5.3,,,, +US-VA-24458,US,VA,24458,5.3,,,, +US-VA-24459,US,VA,24459,5.3,,,, +US-VA-24460,US,VA,24460,5.3,,,, +US-VA-24463,US,VA,24463,5.3,,,, +US-VA-24464,US,VA,24464,5.3,,,, +US-VA-24465,US,VA,24465,5.3,,,, +US-VA-24467,US,VA,24467,5.3,,,, +US-VA-24468,US,VA,24468,5.3,,,, +US-VA-24469,US,VA,24469,5.3,,,, +US-VA-24471,US,VA,24471,5.3,,,, +US-VA-24472,US,VA,24472,5.3,,,, +US-VA-24473,US,VA,24473,5.3,,,, +US-VA-24474,US,VA,24474,5.3,,,, +US-VA-24476,US,VA,24476,5.3,,,, +US-VA-24477,US,VA,24477,5.3,,,, +US-VA-24479,US,VA,24479,5.3,,,, +US-VA-24482,US,VA,24482,5.3,,,, +US-VA-24483,US,VA,24483,5.3,,,, +US-VA-24484,US,VA,24484,5.3,,,, +US-VA-24485,US,VA,24485,5.3,,,, +US-VA-24486,US,VA,24486,5.3,,,, +US-VA-24487,US,VA,24487,5.3,,,, +US-VA-24501,US,VA,24501,5.3,,,, +US-VA-24502,US,VA,24502,5.3,,,, +US-VA-24503,US,VA,24503,5.3,,,, +US-VA-24504,US,VA,24504,5.3,,,, +US-VA-24505,US,VA,24505,5.3,,,, +US-VA-24506,US,VA,24506,5.3,,,, +US-VA-24513,US,VA,24513,5.3,,,, +US-VA-24514,US,VA,24514,5.3,,,, +US-VA-24515,US,VA,24515,5.3,,,, +US-VA-24517,US,VA,24517,5.3,,,, +US-VA-24520,US,VA,24520,5.3,,,, +US-VA-24521,US,VA,24521,5.3,,,, +US-VA-24522,US,VA,24522,5.3,,,, +US-VA-24523,US,VA,24523,5.3,,,, +US-VA-24526,US,VA,24526,5.3,,,, +US-VA-24527,US,VA,24527,5.3,,,, +US-VA-24528,US,VA,24528,5.3,,,, +US-VA-24529,US,VA,24529,5.3,,,, +US-VA-24530,US,VA,24530,5.3,,,, +US-VA-24531,US,VA,24531,5.3,,,, +US-VA-24533,US,VA,24533,5.3,,,, +US-VA-24534,US,VA,24534,5.3,,,, +US-VA-24535,US,VA,24535,5.3,,,, +US-VA-24536,US,VA,24536,5.3,,,, +US-VA-24538,US,VA,24538,5.3,,,, +US-VA-24539,US,VA,24539,5.3,,,, +US-VA-24540,US,VA,24540,5.3,,,, +US-VA-24541,US,VA,24541,5.3,,,, +US-VA-24543,US,VA,24543,5.3,,,, +US-VA-24549,US,VA,24549,5.3,,,, +US-VA-24550,US,VA,24550,5.3,,,, +US-VA-24551,US,VA,24551,5.3,,,, +US-VA-24553,US,VA,24553,5.3,,,, +US-VA-24554,US,VA,24554,5.3,,,, +US-VA-24555,US,VA,24555,5.3,,,, +US-VA-24556,US,VA,24556,5.3,,,, +US-VA-24557,US,VA,24557,5.3,,,, +US-VA-24558,US,VA,24558,5.3,,,, +US-VA-24562,US,VA,24562,5.3,,,, +US-VA-24563,US,VA,24563,5.3,,,, +US-VA-24565,US,VA,24565,5.3,,,, +US-VA-24566,US,VA,24566,5.3,,,, +US-VA-24569,US,VA,24569,5.3,,,, +US-VA-24570,US,VA,24570,5.3,,,, +US-VA-24571,US,VA,24571,5.3,,,, +US-VA-24572,US,VA,24572,5.3,,,, +US-VA-24574,US,VA,24574,5.3,,,, +US-VA-24576,US,VA,24576,5.3,,,, +US-VA-24577,US,VA,24577,5.3,,,, +US-VA-24578,US,VA,24578,5.3,,,, +US-VA-24579,US,VA,24579,5.3,,,, +US-VA-24580,US,VA,24580,5.3,,,, +US-VA-24581,US,VA,24581,5.3,,,, +US-VA-24586,US,VA,24586,5.3,,,, +US-VA-24588,US,VA,24588,5.3,,,, +US-VA-24589,US,VA,24589,5.3,,,, +US-VA-24590,US,VA,24590,5.3,,,, +US-VA-24592,US,VA,24592,5.3,,,, +US-VA-24593,US,VA,24593,5.3,,,, +US-VA-24594,US,VA,24594,5.3,,,, +US-VA-24595,US,VA,24595,5.3,,,, +US-VA-24597,US,VA,24597,5.3,,,, +US-VA-24598,US,VA,24598,5.3,,,, +US-VA-24599,US,VA,24599,5.3,,,, +US-VA-24601,US,VA,24601,5.3,,,, +US-VA-24602,US,VA,24602,5.3,,,, +US-VA-24603,US,VA,24603,5.3,,,, +US-VA-24604,US,VA,24604,5.3,,,, +US-VA-24605,US,VA,24605,5.3,,,, +US-VA-24606,US,VA,24606,5.3,,,, +US-VA-24607,US,VA,24607,5.3,,,, +US-VA-24608,US,VA,24608,5.3,,,, +US-VA-24609,US,VA,24609,5.3,,,, +US-VA-24612,US,VA,24612,5.3,,,, +US-VA-24613,US,VA,24613,5.3,,,, +US-VA-24614,US,VA,24614,5.3,,,, +US-VA-24619,US,VA,24619,5.3,,,, +US-VA-24620,US,VA,24620,5.3,,,, +US-VA-24622,US,VA,24622,5.3,,,, +US-VA-24624,US,VA,24624,5.3,,,, +US-VA-24628,US,VA,24628,5.3,,,, +US-VA-24630,US,VA,24630,5.3,,,, +US-VA-24631,US,VA,24631,5.3,,,, +US-VA-24634,US,VA,24634,5.3,,,, +US-VA-24635,US,VA,24635,5.3,,,, +US-VA-24637,US,VA,24637,5.3,,,, +US-VA-24639,US,VA,24639,5.3,,,, +US-VA-24640,US,VA,24640,5.3,,,, +US-VA-24641,US,VA,24641,5.3,,,, +US-VA-24646,US,VA,24646,5.3,,,, +US-VA-24647,US,VA,24647,5.3,,,, +US-VA-24649,US,VA,24649,5.3,,,, +US-VA-24651,US,VA,24651,5.3,,,, +US-VA-24656,US,VA,24656,5.3,,,, +US-VA-24657,US,VA,24657,5.3,,,, +US-VA-24658,US,VA,24658,5.3,,,, +US-VT-05001,US,VT,05001,6,,,, +US-VT-05009,US,VT,05009,6,,,, +US-VT-05030,US,VT,05030,6,,,, +US-VT-05031,US,VT,05031,6,,,, +US-VT-05032,US,VT,05032,6,,,, +US-VT-05033,US,VT,05033,6,,,, +US-VT-05034,US,VT,05034,6,,,, +US-VT-05035,US,VT,05035,6,,,, +US-VT-05036,US,VT,05036,6,,,, +US-VT-05037,US,VT,05037,6,,,, +US-VT-05038,US,VT,05038,6,,,, +US-VT-05039,US,VT,05039,6,,,, +US-VT-05040,US,VT,05040,6,,,, +US-VT-05041,US,VT,05041,6,,,, +US-VT-05042,US,VT,05042,6,,,, +US-VT-05043,US,VT,05043,6,,,, +US-VT-05045,US,VT,05045,6,,,, +US-VT-05046,US,VT,05046,6,,,, +US-VT-05047,US,VT,05047,6,,,, +US-VT-05048,US,VT,05048,6,,,, +US-VT-05049,US,VT,05049,6,,,, +US-VT-05050,US,VT,05050,6,,,, +US-VT-05051,US,VT,05051,6,,,, +US-VT-05052,US,VT,05052,6,,,, +US-VT-05053,US,VT,05053,6,,,, +US-VT-05054,US,VT,05054,6,,,, +US-VT-05055,US,VT,05055,6,,,, +US-VT-05056,US,VT,05056,6,,,, +US-VT-05058,US,VT,05058,6,,,, +US-VT-05059,US,VT,05059,6,,,, +US-VT-05060,US,VT,05060,6,,,, +US-VT-05061,US,VT,05061,6,,,, +US-VT-05062,US,VT,05062,6,,,, +US-VT-05065,US,VT,05065,6,,,, +US-VT-05067,US,VT,05067,6,,,, +US-VT-05068,US,VT,05068,6,,,, +US-VT-05069,US,VT,05069,6,,,, +US-VT-05070,US,VT,05070,6,,,, +US-VT-05071,US,VT,05071,6,,,, +US-VT-05072,US,VT,05072,6,,,, +US-VT-05073,US,VT,05073,6,,,, +US-VT-05074,US,VT,05074,6,,,, +US-VT-05075,US,VT,05075,6,,,, +US-VT-05076,US,VT,05076,6,,,, +US-VT-05077,US,VT,05077,6,,,, +US-VT-05079,US,VT,05079,6,,,, +US-VT-05081,US,VT,05081,6,,,, +US-VT-05083,US,VT,05083,6,,,, +US-VT-05084,US,VT,05084,6,,,, +US-VT-05085,US,VT,05085,6,,,, +US-VT-05086,US,VT,05086,6,,,, +US-VT-05088,US,VT,05088,6,,,, +US-VT-05089,US,VT,05089,6,,,, +US-VT-05091,US,VT,05091,6,,,, +US-VT-05101,US,VT,05101,6,,,, +US-VT-05141,US,VT,05141,6,,,, +US-VT-05142,US,VT,05142,6,,,, +US-VT-05143,US,VT,05143,6,,,, +US-VT-05144,US,VT,05144,6,,,, +US-VT-05146,US,VT,05146,6,,,, +US-VT-05148,US,VT,05148,6,,,, +US-VT-05149,US,VT,05149,6,,,, +US-VT-05150,US,VT,05150,6,,,, +US-VT-05151,US,VT,05151,6,,,, +US-VT-05152,US,VT,05152,6,,,, +US-VT-05153,US,VT,05153,6,,,, +US-VT-05154,US,VT,05154,6,,,, +US-VT-05155,US,VT,05155,6,,,, +US-VT-05156,US,VT,05156,6,,,, +US-VT-05158,US,VT,05158,6,,,, +US-VT-05159,US,VT,05159,6,,,, +US-VT-05161,US,VT,05161,6,,,, +US-VT-05201,US,VT,05201,6,,,, +US-VT-05250,US,VT,05250,6,,,, +US-VT-05251,US,VT,05251,6,,,, +US-VT-05252,US,VT,05252,6,,,, +US-VT-05253,US,VT,05253,6,,,, +US-VT-05254,US,VT,05254,7,,,, +US-VT-05255,US,VT,05255,7,,,, +US-VT-05257,US,VT,05257,6,,,, +US-VT-05260,US,VT,05260,6,,,, +US-VT-05261,US,VT,05261,6,,,, +US-VT-05262,US,VT,05262,6,,,, +US-VT-05301,US,VT,05301,6,,,, +US-VT-05302,US,VT,05302,6,,,, +US-VT-05303,US,VT,05303,6,,,, +US-VT-05304,US,VT,05304,6,,,, +US-VT-05340,US,VT,05340,7,,,, +US-VT-05341,US,VT,05341,7,,,, +US-VT-05342,US,VT,05342,6,,,, +US-VT-05343,US,VT,05343,6,,,, +US-VT-05344,US,VT,05344,6,,,, +US-VT-05345,US,VT,05345,6,,,, +US-VT-05346,US,VT,05346,6,,,, +US-VT-05350,US,VT,05350,6,,,, +US-VT-05351,US,VT,05351,6,,,, +US-VT-05352,US,VT,05352,6,,,, +US-VT-05353,US,VT,05353,6,,,, +US-VT-05354,US,VT,05354,6,,,, +US-VT-05355,US,VT,05355,6,,,, +US-VT-05356,US,VT,05356,7,,,, +US-VT-05357,US,VT,05357,6,,,, +US-VT-05358,US,VT,05358,6,,,, +US-VT-05359,US,VT,05359,6,,,, +US-VT-05360,US,VT,05360,7,,,, +US-VT-05361,US,VT,05361,6,,,, +US-VT-05362,US,VT,05362,6,,,, +US-VT-05363,US,VT,05363,7,,,, +US-VT-05401,US,VT,05401,7,,,, +US-VT-05402,US,VT,05402,7,,,, +US-VT-05403,US,VT,05403,7,,,, +US-VT-05404,US,VT,05404,6,,,, +US-VT-05405,US,VT,05405,7,,,, +US-VT-05406,US,VT,05406,7,,,, +US-VT-05407,US,VT,05407,7,,,, +US-VT-05408,US,VT,05408,7,,,, +US-VT-05439,US,VT,05439,6,,,, +US-VT-05440,US,VT,05440,6,,,, +US-VT-05441,US,VT,05441,6,,,, +US-VT-05442,US,VT,05442,6,,,, +US-VT-05443,US,VT,05443,6,,,, +US-VT-05444,US,VT,05444,6,,,, +US-VT-05445,US,VT,05445,6,,,, +US-VT-05446,US,VT,05446,6,,,, +US-VT-05447,US,VT,05447,6,,,, +US-VT-05448,US,VT,05448,6,,,, +US-VT-05449,US,VT,05449,6,,,, +US-VT-05450,US,VT,05450,6,,,, +US-VT-05451,US,VT,05451,6,,,, +US-VT-05452,US,VT,05452,6,,,, +US-VT-05453,US,VT,05453,6,,,, +US-VT-05454,US,VT,05454,6,,,, +US-VT-05455,US,VT,05455,6,,,, +US-VT-05456,US,VT,05456,6,,,, +US-VT-05457,US,VT,05457,6,,,, +US-VT-05458,US,VT,05458,6,,,, +US-VT-05459,US,VT,05459,6,,,, +US-VT-05460,US,VT,05460,6,,,, +US-VT-05461,US,VT,05461,6,,,, +US-VT-05462,US,VT,05462,6,,,, +US-VT-05463,US,VT,05463,6,,,, +US-VT-05464,US,VT,05464,6,,,, +US-VT-05465,US,VT,05465,6,,,, +US-VT-05466,US,VT,05466,6,,,, +US-VT-05468,US,VT,05468,6,,,, +US-VT-05469,US,VT,05469,6,,,, +US-VT-05470,US,VT,05470,6,,,, +US-VT-05471,US,VT,05471,6,,,, +US-VT-05472,US,VT,05472,6,,,, +US-VT-05473,US,VT,05473,6,,,, +US-VT-05474,US,VT,05474,6,,,, +US-VT-05476,US,VT,05476,6,,,, +US-VT-05477,US,VT,05477,6,,,, +US-VT-05478,US,VT,05478,6,,,, +US-VT-05479,US,VT,05479,6,,,, +US-VT-05481,US,VT,05481,6,,,, +US-VT-05482,US,VT,05482,6,,,, +US-VT-05483,US,VT,05483,6,,,, +US-VT-05485,US,VT,05485,6,,,, +US-VT-05486,US,VT,05486,6,,,, +US-VT-05487,US,VT,05487,6,,,, +US-VT-05488,US,VT,05488,6,,,, +US-VT-05489,US,VT,05489,6,,,, +US-VT-05490,US,VT,05490,6,,,, +US-VT-05491,US,VT,05491,6,,,, +US-VT-05492,US,VT,05492,6,,,, +US-VT-05494,US,VT,05494,6,,,, +US-VT-05495,US,VT,05495,7,,,, +US-VT-05601,US,VT,05601,6,,,, +US-VT-05602,US,VT,05602,6,,,, +US-VT-05603,US,VT,05603,6,,,, +US-VT-05604,US,VT,05604,6,,,, +US-VT-05609,US,VT,05609,6,,,, +US-VT-05620,US,VT,05620,6,,,, +US-VT-05633,US,VT,05633,6,,,, +US-VT-05640,US,VT,05640,6,,,, +US-VT-05641,US,VT,05641,6,,,, +US-VT-05647,US,VT,05647,6,,,, +US-VT-05648,US,VT,05648,6,,,, +US-VT-05649,US,VT,05649,6,,,, +US-VT-05650,US,VT,05650,6,,,, +US-VT-05651,US,VT,05651,6,,,, +US-VT-05652,US,VT,05652,6,,,, +US-VT-05653,US,VT,05653,6,,,, +US-VT-05654,US,VT,05654,6,,,, +US-VT-05655,US,VT,05655,6,,,, +US-VT-05656,US,VT,05656,6,,,, +US-VT-05657,US,VT,05657,6,,,, +US-VT-05658,US,VT,05658,6,,,, +US-VT-05660,US,VT,05660,6,,,, +US-VT-05661,US,VT,05661,6,,,, +US-VT-05662,US,VT,05662,6,,,, +US-VT-05663,US,VT,05663,6,,,, +US-VT-05664,US,VT,05664,6,,,, +US-VT-05665,US,VT,05665,6,,,, +US-VT-05666,US,VT,05666,6,,,, +US-VT-05667,US,VT,05667,6,,,, +US-VT-05669,US,VT,05669,6,,,, +US-VT-05670,US,VT,05670,6,,,, +US-VT-05671,US,VT,05671,6,,,, +US-VT-05672,US,VT,05672,6,,,, +US-VT-05673,US,VT,05673,6,,,, +US-VT-05674,US,VT,05674,6,,,, +US-VT-05675,US,VT,05675,6,,,, +US-VT-05676,US,VT,05676,6,,,, +US-VT-05677,US,VT,05677,6,,,, +US-VT-05678,US,VT,05678,6,,,, +US-VT-05679,US,VT,05679,6,,,, +US-VT-05680,US,VT,05680,6,,,, +US-VT-05681,US,VT,05681,6,,,, +US-VT-05682,US,VT,05682,6,,,, +US-VT-05701,US,VT,05701,6,,,, +US-VT-05702,US,VT,05702,6,,,, +US-VT-05730,US,VT,05730,6,,,, +US-VT-05731,US,VT,05731,6,,,, +US-VT-05732,US,VT,05732,6,,,, +US-VT-05733,US,VT,05733,6,,,, +US-VT-05734,US,VT,05734,6,,,, +US-VT-05735,US,VT,05735,6,,,, +US-VT-05736,US,VT,05736,7,,,, +US-VT-05737,US,VT,05737,6,,,, +US-VT-05738,US,VT,05738,6,,,, +US-VT-05739,US,VT,05739,6,,,, +US-VT-05740,US,VT,05740,7,,,, +US-VT-05741,US,VT,05741,6,,,, +US-VT-05742,US,VT,05742,6,,,, +US-VT-05743,US,VT,05743,6,,,, +US-VT-05744,US,VT,05744,6,,,, +US-VT-05745,US,VT,05745,6,,,, +US-VT-05746,US,VT,05746,6,,,, +US-VT-05747,US,VT,05747,6,,,, +US-VT-05748,US,VT,05748,6,,,, +US-VT-05750,US,VT,05750,6,,,, +US-VT-05751,US,VT,05751,7,,,, +US-VT-05753,US,VT,05753,7,,,, +US-VT-05757,US,VT,05757,6,,,, +US-VT-05758,US,VT,05758,6,,,, +US-VT-05759,US,VT,05759,6,,,, +US-VT-05760,US,VT,05760,6,,,, +US-VT-05761,US,VT,05761,6,,,, +US-VT-05762,US,VT,05762,6,,,, +US-VT-05763,US,VT,05763,6,,,, +US-VT-05764,US,VT,05764,6,,,, +US-VT-05765,US,VT,05765,6,,,, +US-VT-05766,US,VT,05766,6,,,, +US-VT-05767,US,VT,05767,6,,,, +US-VT-05768,US,VT,05768,6,,,, +US-VT-05769,US,VT,05769,6,,,, +US-VT-05770,US,VT,05770,6,,,, +US-VT-05772,US,VT,05772,6,,,, +US-VT-05773,US,VT,05773,6,,,, +US-VT-05774,US,VT,05774,6,,,, +US-VT-05775,US,VT,05775,6,,,, +US-VT-05776,US,VT,05776,6,,,, +US-VT-05777,US,VT,05777,6,,,, +US-VT-05778,US,VT,05778,6,,,, +US-VT-05819,US,VT,05819,6,,,, +US-VT-05820,US,VT,05820,6,,,, +US-VT-05821,US,VT,05821,6,,,, +US-VT-05822,US,VT,05822,6,,,, +US-VT-05823,US,VT,05823,6,,,, +US-VT-05824,US,VT,05824,6,,,, +US-VT-05825,US,VT,05825,6,,,, +US-VT-05826,US,VT,05826,6,,,, +US-VT-05827,US,VT,05827,6,,,, +US-VT-05828,US,VT,05828,6,,,, +US-VT-05829,US,VT,05829,6,,,, +US-VT-05830,US,VT,05830,6,,,, +US-VT-05832,US,VT,05832,6,,,, +US-VT-05833,US,VT,05833,6,,,, +US-VT-05836,US,VT,05836,6,,,, +US-VT-05837,US,VT,05837,6,,,, +US-VT-05838,US,VT,05838,6,,,, +US-VT-05839,US,VT,05839,6,,,, +US-VT-05840,US,VT,05840,6,,,, +US-VT-05841,US,VT,05841,6,,,, +US-VT-05842,US,VT,05842,6,,,, +US-VT-05843,US,VT,05843,6,,,, +US-VT-05845,US,VT,05845,6,,,, +US-VT-05846,US,VT,05846,6,,,, +US-VT-05847,US,VT,05847,6,,,, +US-VT-05848,US,VT,05848,6,,,, +US-VT-05849,US,VT,05849,6,,,, +US-VT-05850,US,VT,05850,6,,,, +US-VT-05851,US,VT,05851,6,,,, +US-VT-05853,US,VT,05853,6,,,, +US-VT-05855,US,VT,05855,6,,,, +US-VT-05857,US,VT,05857,6,,,, +US-VT-05858,US,VT,05858,6,,,, +US-VT-05859,US,VT,05859,6,,,, +US-VT-05860,US,VT,05860,6,,,, +US-VT-05861,US,VT,05861,6,,,, +US-VT-05862,US,VT,05862,6,,,, +US-VT-05863,US,VT,05863,6,,,, +US-VT-05866,US,VT,05866,6,,,, +US-VT-05867,US,VT,05867,6,,,, +US-VT-05868,US,VT,05868,6,,,, +US-VT-05871,US,VT,05871,6,,,, +US-VT-05872,US,VT,05872,6,,,, +US-VT-05873,US,VT,05873,6,,,, +US-VT-05874,US,VT,05874,6,,,, +US-VT-05875,US,VT,05875,6,,,, +US-VT-05901,US,VT,05901,6,,,, +US-VT-05902,US,VT,05902,6,,,, +US-VT-05903,US,VT,05903,6,,,, +US-VT-05904,US,VT,05904,6,,,, +US-VT-05905,US,VT,05905,6,,,, +US-VT-05906,US,VT,05906,6,,,, +US-VT-05907,US,VT,05907,6,,,, +US-WA-98001,US,WA,98001,9.5,,,, +US-WA-98002,US,WA,98002,9.5,,,, +US-WA-98003,US,WA,98003,9.5,,,, +US-WA-98004,US,WA,98004,9.5,,,, +US-WA-98005,US,WA,98005,9.5,,,, +US-WA-98006,US,WA,98006,9.5,,,, +US-WA-98007,US,WA,98007,9.5,,,, +US-WA-98008,US,WA,98008,9.5,,,, +US-WA-98009,US,WA,98009,9.5,,,, +US-WA-98010,US,WA,98010,8.6,,,, +US-WA-98011,US,WA,98011,9.5,,,, +US-WA-98012,US,WA,98012,9.6,,,, +US-WA-98013,US,WA,98013,8.6,,,, +US-WA-98014,US,WA,98014,8.6,,,, +US-WA-98015,US,WA,98015,9.5,,,, +US-WA-98019,US,WA,98019,8.6,,,, +US-WA-98020,US,WA,98020,9.5,,,, +US-WA-98021,US,WA,98021,9.5,,,, +US-WA-98022,US,WA,98022,8.6,,,, +US-WA-98023,US,WA,98023,9.5,,,, +US-WA-98024,US,WA,98024,8.6,,,, +US-WA-98025,US,WA,98025,8.6,,,, +US-WA-98026,US,WA,98026,9.5,,,, +US-WA-98027,US,WA,98027,9.5,,,, +US-WA-98028,US,WA,98028,9.5,,,, +US-WA-98029,US,WA,98029,9.5,,,, +US-WA-98030,US,WA,98030,9.5,,,, +US-WA-98031,US,WA,98031,9.5,,,, +US-WA-98032,US,WA,98032,9.5,,,, +US-WA-98033,US,WA,98033,9.5,,,, +US-WA-98034,US,WA,98034,9.5,,,, +US-WA-98035,US,WA,98035,9.5,,,, +US-WA-98036,US,WA,98036,9.5,,,, +US-WA-98037,US,WA,98037,9.5,,,, +US-WA-98038,US,WA,98038,8.6,,,, +US-WA-98039,US,WA,98039,9.5,,,, +US-WA-98040,US,WA,98040,9.5,,,, +US-WA-98041,US,WA,98041,9.5,,,, +US-WA-98042,US,WA,98042,8.6,,,, +US-WA-98043,US,WA,98043,9.5,,,, +US-WA-98045,US,WA,98045,8.6,,,, +US-WA-98046,US,WA,98046,9.5,,,, +US-WA-98047,US,WA,98047,9.5,,,, +US-WA-98050,US,WA,98050,8.6,,,, +US-WA-98051,US,WA,98051,8.6,,,, +US-WA-98052,US,WA,98052,9.5,,,, +US-WA-98053,US,WA,98053,8.6,,,, +US-WA-98055,US,WA,98055,9.5,,,, +US-WA-98056,US,WA,98056,9.5,,,, +US-WA-98057,US,WA,98057,9.5,,,, +US-WA-98058,US,WA,98058,9.5,,,, +US-WA-98059,US,WA,98059,9.5,,,, +US-WA-98061,US,WA,98061,8.6,,,, +US-WA-98062,US,WA,98062,9.5,,,, +US-WA-98063,US,WA,98063,9.5,,,, +US-WA-98064,US,WA,98064,9.5,,,, +US-WA-98065,US,WA,98065,8.6,,,, +US-WA-98068,US,WA,98068,8.8,,,, +US-WA-98070,US,WA,98070,8.6,,,, +US-WA-98071,US,WA,98071,9.5,,,, +US-WA-98072,US,WA,98072,9.5,,,, +US-WA-98073,US,WA,98073,9.5,,,, +US-WA-98074,US,WA,98074,9.5,,,, +US-WA-98075,US,WA,98075,9.5,,,, +US-WA-98077,US,WA,98077,8.6,,,, +US-WA-98082,US,WA,98082,9.6,,,, +US-WA-98083,US,WA,98083,9.5,,,, +US-WA-98087,US,WA,98087,9.5,,,, +US-WA-98089,US,WA,98089,9.5,,,, +US-WA-98092,US,WA,98092,9.5,,,, +US-WA-98093,US,WA,98093,9.5,,,, +US-WA-98101,US,WA,98101,9.5,,,, +US-WA-98102,US,WA,98102,9.5,,,, +US-WA-98103,US,WA,98103,9.5,,,, +US-WA-98104,US,WA,98104,9.5,,,, +US-WA-98105,US,WA,98105,9.5,,,, +US-WA-98106,US,WA,98106,9.5,,,, +US-WA-98107,US,WA,98107,9.5,,,, +US-WA-98108,US,WA,98108,9.5,,,, +US-WA-98109,US,WA,98109,9.5,,,, +US-WA-98110,US,WA,98110,8.6,,,, +US-WA-98111,US,WA,98111,9.5,,,, +US-WA-98112,US,WA,98112,9.5,,,, +US-WA-98113,US,WA,98113,9.5,,,, +US-WA-98114,US,WA,98114,9.5,,,, +US-WA-98115,US,WA,98115,9.5,,,, +US-WA-98116,US,WA,98116,9.5,,,, +US-WA-98117,US,WA,98117,9.5,,,, +US-WA-98118,US,WA,98118,9.5,,,, +US-WA-98119,US,WA,98119,9.5,,,, +US-WA-98121,US,WA,98121,9.5,,,, +US-WA-98122,US,WA,98122,9.5,,,, +US-WA-98124,US,WA,98124,9.5,,,, +US-WA-98125,US,WA,98125,9.5,,,, +US-WA-98126,US,WA,98126,9.5,,,, +US-WA-98127,US,WA,98127,9.5,,,, +US-WA-98129,US,WA,98129,9.5,,,, +US-WA-98131,US,WA,98131,9.5,,,, +US-WA-98132,US,WA,98132,9.5,,,, +US-WA-98133,US,WA,98133,9.5,,,, +US-WA-98134,US,WA,98134,9.5,,,, +US-WA-98136,US,WA,98136,9.5,,,, +US-WA-98138,US,WA,98138,9.5,,,, +US-WA-98139,US,WA,98139,9.5,,,, +US-WA-98141,US,WA,98141,9.5,,,, +US-WA-98144,US,WA,98144,9.5,,,, +US-WA-98145,US,WA,98145,9.5,,,, +US-WA-98146,US,WA,98146,9.5,,,, +US-WA-98148,US,WA,98148,9.5,,,, +US-WA-98154,US,WA,98154,9.5,,,, +US-WA-98155,US,WA,98155,9.5,,,, +US-WA-98158,US,WA,98158,9.5,,,, +US-WA-98160,US,WA,98160,9.5,,,, +US-WA-98161,US,WA,98161,9.5,,,, +US-WA-98164,US,WA,98164,9.5,,,, +US-WA-98165,US,WA,98165,9.5,,,, +US-WA-98166,US,WA,98166,9.5,,,, +US-WA-98168,US,WA,98168,9.5,,,, +US-WA-98170,US,WA,98170,9.5,,,, +US-WA-98174,US,WA,98174,9.5,,,, +US-WA-98175,US,WA,98175,9.5,,,, +US-WA-98177,US,WA,98177,9.5,,,, +US-WA-98178,US,WA,98178,9.5,,,, +US-WA-98181,US,WA,98181,9.5,,,, +US-WA-98185,US,WA,98185,9.5,,,, +US-WA-98188,US,WA,98188,9.5,,,, +US-WA-98189,US,WA,98189,9.5,,,, +US-WA-98190,US,WA,98190,9.5,,,, +US-WA-98191,US,WA,98191,9.5,,,, +US-WA-98194,US,WA,98194,9.5,,,, +US-WA-98195,US,WA,98195,9.5,,,, +US-WA-98198,US,WA,98198,9.5,,,, +US-WA-98199,US,WA,98199,9.5,,,, +US-WA-98201,US,WA,98201,9.2,,,, +US-WA-98203,US,WA,98203,9.2,,,, +US-WA-98204,US,WA,98204,9.5,,,, +US-WA-98205,US,WA,98205,9.2,,,, +US-WA-98206,US,WA,98206,9.5,,,, +US-WA-98207,US,WA,98207,9.2,,,, +US-WA-98208,US,WA,98208,9.5,,,, +US-WA-98213,US,WA,98213,9.2,,,, +US-WA-98220,US,WA,98220,8.5,,,, +US-WA-98221,US,WA,98221,8.2,,,, +US-WA-98222,US,WA,98222,8.1,,,, +US-WA-98223,US,WA,98223,8.6,,,, +US-WA-98224,US,WA,98224,8.6,,,, +US-WA-98225,US,WA,98225,8.7,,,, +US-WA-98226,US,WA,98226,8.7,,,, +US-WA-98227,US,WA,98227,8.7,,,, +US-WA-98228,US,WA,98228,8.7,,,, +US-WA-98229,US,WA,98229,8.7,,,, +US-WA-98230,US,WA,98230,8.5,,,, +US-WA-98231,US,WA,98231,8.5,,,, +US-WA-98232,US,WA,98232,8.2,,,, +US-WA-98233,US,WA,98233,8.2,,,, +US-WA-98235,US,WA,98235,8.2,,,, +US-WA-98236,US,WA,98236,8.7,,,, +US-WA-98237,US,WA,98237,8.2,,,, +US-WA-98238,US,WA,98238,7.8,,,, +US-WA-98239,US,WA,98239,8.7,,,, +US-WA-98240,US,WA,98240,8.5,,,, +US-WA-98241,US,WA,98241,8.6,,,, +US-WA-98243,US,WA,98243,8.1,,,, +US-WA-98244,US,WA,98244,8.5,,,, +US-WA-98245,US,WA,98245,8.1,,,, +US-WA-98247,US,WA,98247,8.5,,,, +US-WA-98248,US,WA,98248,8.7,,,, +US-WA-98249,US,WA,98249,8.7,,,, +US-WA-98250,US,WA,98250,8.1,,,, +US-WA-98251,US,WA,98251,8.6,,,, +US-WA-98252,US,WA,98252,8.6,,,, +US-WA-98253,US,WA,98253,8.7,,,, +US-WA-98255,US,WA,98255,8.2,,,, +US-WA-98256,US,WA,98256,8.6,,,, +US-WA-98257,US,WA,98257,7.8,,,, +US-WA-98258,US,WA,98258,8.6,,,, +US-WA-98259,US,WA,98259,8.6,,,, +US-WA-98260,US,WA,98260,8.7,,,, +US-WA-98261,US,WA,98261,8.1,,,, +US-WA-98262,US,WA,98262,8.5,,,, +US-WA-98263,US,WA,98263,8.2,,,, +US-WA-98264,US,WA,98264,8.7,,,, +US-WA-98266,US,WA,98266,8.5,,,, +US-WA-98267,US,WA,98267,8.2,,,, +US-WA-98270,US,WA,98270,8.6,,,, +US-WA-98271,US,WA,98271,8.6,,,, +US-WA-98272,US,WA,98272,8.6,,,, +US-WA-98273,US,WA,98273,8.2,,,, +US-WA-98274,US,WA,98274,8.2,,,, +US-WA-98275,US,WA,98275,9.5,,,, +US-WA-98276,US,WA,98276,8.5,,,, +US-WA-98277,US,WA,98277,8.7,,,, +US-WA-98278,US,WA,98278,8.7,,,, +US-WA-98279,US,WA,98279,8.1,,,, +US-WA-98280,US,WA,98280,8.1,,,, +US-WA-98281,US,WA,98281,8.5,,,, +US-WA-98282,US,WA,98282,8.7,,,, +US-WA-98283,US,WA,98283,8.2,,,, +US-WA-98284,US,WA,98284,8.2,,,, +US-WA-98286,US,WA,98286,8.1,,,, +US-WA-98287,US,WA,98287,8.6,,,, +US-WA-98288,US,WA,98288,8.6,,,, +US-WA-98290,US,WA,98290,7.7,,,, +US-WA-98291,US,WA,98291,8.8,,,, +US-WA-98292,US,WA,98292,7.7,,,, +US-WA-98293,US,WA,98293,8.6,,,, +US-WA-98294,US,WA,98294,8.6,,,, +US-WA-98295,US,WA,98295,8.5,,,, +US-WA-98296,US,WA,98296,7.7,,,, +US-WA-98297,US,WA,98297,8.1,,,, +US-WA-98303,US,WA,98303,7.9,,,, +US-WA-98304,US,WA,98304,7.9,,,, +US-WA-98305,US,WA,98305,8.4,,,, +US-WA-98310,US,WA,98310,8.6,,,, +US-WA-98311,US,WA,98311,8.6,,,, +US-WA-98312,US,WA,98312,8.6,,,, +US-WA-98314,US,WA,98314,8.6,,,, +US-WA-98315,US,WA,98315,8.6,,,, +US-WA-98320,US,WA,98320,9,,,, +US-WA-98321,US,WA,98321,7.9,,,, +US-WA-98322,US,WA,98322,8.6,,,, +US-WA-98323,US,WA,98323,7.9,,,, +US-WA-98324,US,WA,98324,8.4,,,, +US-WA-98325,US,WA,98325,9,,,, +US-WA-98326,US,WA,98326,8.4,,,, +US-WA-98327,US,WA,98327,8.8,,,, +US-WA-98328,US,WA,98328,7.9,,,, +US-WA-98329,US,WA,98329,7.9,,,, +US-WA-98330,US,WA,98330,7.9,,,, +US-WA-98331,US,WA,98331,8.4,,,, +US-WA-98332,US,WA,98332,7.9,,,, +US-WA-98333,US,WA,98333,7.9,,,, +US-WA-98335,US,WA,98335,7.9,,,, +US-WA-98336,US,WA,98336,7.8,,,, +US-WA-98337,US,WA,98337,8.6,,,, +US-WA-98338,US,WA,98338,7.9,,,, +US-WA-98339,US,WA,98339,9,,,, +US-WA-98340,US,WA,98340,8.6,,,, +US-WA-98342,US,WA,98342,8.6,,,, +US-WA-98343,US,WA,98343,8.4,,,, +US-WA-98344,US,WA,98344,7.9,,,, +US-WA-98345,US,WA,98345,8.6,,,, +US-WA-98346,US,WA,98346,8.6,,,, +US-WA-98348,US,WA,98348,7.9,,,, +US-WA-98349,US,WA,98349,7.9,,,, +US-WA-98350,US,WA,98350,8.4,,,, +US-WA-98351,US,WA,98351,7.9,,,, +US-WA-98352,US,WA,98352,8.8,,,, +US-WA-98353,US,WA,98353,8.6,,,, +US-WA-98354,US,WA,98354,9.4,,,, +US-WA-98355,US,WA,98355,7.8,,,, +US-WA-98356,US,WA,98356,7.8,,,, +US-WA-98357,US,WA,98357,8.4,,,, +US-WA-98358,US,WA,98358,9,,,, +US-WA-98359,US,WA,98359,8.6,,,, +US-WA-98360,US,WA,98360,7.9,,,, +US-WA-98361,US,WA,98361,7.8,,,, +US-WA-98362,US,WA,98362,8.4,,,, +US-WA-98363,US,WA,98363,8.4,,,, +US-WA-98364,US,WA,98364,8.6,,,, +US-WA-98365,US,WA,98365,9,,,, +US-WA-98366,US,WA,98366,8.6,,,, +US-WA-98367,US,WA,98367,8.6,,,, +US-WA-98368,US,WA,98368,9,,,, +US-WA-98370,US,WA,98370,8.6,,,, +US-WA-98371,US,WA,98371,9.4,,,, +US-WA-98372,US,WA,98372,9.4,,,, +US-WA-98373,US,WA,98373,9.4,,,, +US-WA-98374,US,WA,98374,9.4,,,, +US-WA-98375,US,WA,98375,8.8,,,, +US-WA-98376,US,WA,98376,9,,,, +US-WA-98377,US,WA,98377,7.8,,,, +US-WA-98378,US,WA,98378,8.6,,,, +US-WA-98380,US,WA,98380,8.6,,,, +US-WA-98381,US,WA,98381,8.4,,,, +US-WA-98382,US,WA,98382,8.4,,,, +US-WA-98383,US,WA,98383,8.6,,,, +US-WA-98384,US,WA,98384,8.6,,,, +US-WA-98385,US,WA,98385,7.9,,,, +US-WA-98386,US,WA,98386,8.6,,,, +US-WA-98387,US,WA,98387,9.4,,,, +US-WA-98388,US,WA,98388,9.4,,,, +US-WA-98390,US,WA,98390,8.8,,,, +US-WA-98391,US,WA,98391,8.8,,,, +US-WA-98392,US,WA,98392,8.6,,,, +US-WA-98393,US,WA,98393,8.6,,,, +US-WA-98394,US,WA,98394,7.9,,,, +US-WA-98395,US,WA,98395,7.9,,,, +US-WA-98396,US,WA,98396,7.9,,,, +US-WA-98397,US,WA,98397,7.9,,,, +US-WA-98398,US,WA,98398,7.9,,,, +US-WA-98401,US,WA,98401,9.5,,,, +US-WA-98402,US,WA,98402,9.5,,,, +US-WA-98403,US,WA,98403,9.5,,,, +US-WA-98404,US,WA,98404,9.5,,,, +US-WA-98405,US,WA,98405,9.5,,,, +US-WA-98406,US,WA,98406,9.5,,,, +US-WA-98407,US,WA,98407,9.5,,,, +US-WA-98408,US,WA,98408,9.5,,,, +US-WA-98409,US,WA,98409,9.5,,,, +US-WA-98411,US,WA,98411,9.5,,,, +US-WA-98412,US,WA,98412,9.5,,,, +US-WA-98413,US,WA,98413,9.5,,,, +US-WA-98415,US,WA,98415,9.5,,,, +US-WA-98416,US,WA,98416,9.5,,,, +US-WA-98417,US,WA,98417,9.5,,,, +US-WA-98418,US,WA,98418,9.5,,,, +US-WA-98419,US,WA,98419,9.5,,,, +US-WA-98421,US,WA,98421,9.5,,,, +US-WA-98422,US,WA,98422,9.5,,,, +US-WA-98424,US,WA,98424,9.4,,,, +US-WA-98430,US,WA,98430,9.5,,,, +US-WA-98431,US,WA,98431,9.5,,,, +US-WA-98433,US,WA,98433,8.8,,,, +US-WA-98438,US,WA,98438,8.8,,,, +US-WA-98439,US,WA,98439,9.4,,,, +US-WA-98443,US,WA,98443,9.4,,,, +US-WA-98444,US,WA,98444,9.4,,,, +US-WA-98445,US,WA,98445,9.4,,,, +US-WA-98446,US,WA,98446,8.8,,,, +US-WA-98447,US,WA,98447,9.4,,,, +US-WA-98448,US,WA,98448,9.5,,,, +US-WA-98464,US,WA,98464,9.4,,,, +US-WA-98465,US,WA,98465,9.5,,,, +US-WA-98466,US,WA,98466,9.4,,,, +US-WA-98467,US,WA,98467,9.4,,,, +US-WA-98471,US,WA,98471,9.5,,,, +US-WA-98481,US,WA,98481,9.5,,,, +US-WA-98490,US,WA,98490,9.5,,,, +US-WA-98493,US,WA,98493,9.5,,,, +US-WA-98496,US,WA,98496,9.4,,,, +US-WA-98497,US,WA,98497,9.5,,,, +US-WA-98498,US,WA,98498,9.4,,,, +US-WA-98499,US,WA,98499,9.4,,,, +US-WA-98501,US,WA,98501,8.8,,,, +US-WA-98502,US,WA,98502,8.8,,,, +US-WA-98503,US,WA,98503,8.7,,,, +US-WA-98504,US,WA,98504,8.8,,,, +US-WA-98505,US,WA,98505,8.7,,,, +US-WA-98506,US,WA,98506,8.8,,,, +US-WA-98507,US,WA,98507,8.8,,,, +US-WA-98508,US,WA,98508,8.8,,,, +US-WA-98509,US,WA,98509,8.7,,,, +US-WA-98511,US,WA,98511,8.7,,,, +US-WA-98512,US,WA,98512,8.7,,,, +US-WA-98513,US,WA,98513,8.7,,,, +US-WA-98516,US,WA,98516,7.9,,,, +US-WA-98520,US,WA,98520,8.53,,,, +US-WA-98522,US,WA,98522,7.8,,,, +US-WA-98524,US,WA,98524,8.5,,,, +US-WA-98526,US,WA,98526,8.4,,,, +US-WA-98527,US,WA,98527,7.8,,,, +US-WA-98528,US,WA,98528,8.5,,,, +US-WA-98530,US,WA,98530,7.9,,,, +US-WA-98531,US,WA,98531,8,,,, +US-WA-98532,US,WA,98532,8,,,, +US-WA-98533,US,WA,98533,7.8,,,, +US-WA-98535,US,WA,98535,8.4,,,, +US-WA-98536,US,WA,98536,8.4,,,, +US-WA-98537,US,WA,98537,8.4,,,, +US-WA-98538,US,WA,98538,7.8,,,, +US-WA-98539,US,WA,98539,7.8,,,, +US-WA-98540,US,WA,98540,7.9,,,, +US-WA-98541,US,WA,98541,8.4,,,, +US-WA-98542,US,WA,98542,7.8,,,, +US-WA-98544,US,WA,98544,7.8,,,, +US-WA-98546,US,WA,98546,8.5,,,, +US-WA-98547,US,WA,98547,7.8,,,, +US-WA-98548,US,WA,98548,8.5,,,, +US-WA-98550,US,WA,98550,8.4,,,, +US-WA-98552,US,WA,98552,8.4,,,, +US-WA-98554,US,WA,98554,7.8,,,, +US-WA-98555,US,WA,98555,8.5,,,, +US-WA-98556,US,WA,98556,7.9,,,, +US-WA-98557,US,WA,98557,8.4,,,, +US-WA-98558,US,WA,98558,7.9,,,, +US-WA-98559,US,WA,98559,8.4,,,, +US-WA-98560,US,WA,98560,8.5,,,, +US-WA-98561,US,WA,98561,7.8,,,, +US-WA-98562,US,WA,98562,8.4,,,, +US-WA-98563,US,WA,98563,8.4,,,, +US-WA-98564,US,WA,98564,7.8,,,, +US-WA-98565,US,WA,98565,7.8,,,, +US-WA-98566,US,WA,98566,8.4,,,, +US-WA-98568,US,WA,98568,8.4,,,, +US-WA-98569,US,WA,98569,8.4,,,, +US-WA-98570,US,WA,98570,7.8,,,, +US-WA-98571,US,WA,98571,8.4,,,, +US-WA-98572,US,WA,98572,7.8,,,, +US-WA-98575,US,WA,98575,8.4,,,, +US-WA-98576,US,WA,98576,7.9,,,, +US-WA-98577,US,WA,98577,7.8,,,, +US-WA-98579,US,WA,98579,7.9,,,, +US-WA-98580,US,WA,98580,7.9,,,, +US-WA-98581,US,WA,98581,7.7,,,, +US-WA-98582,US,WA,98582,7.8,,,, +US-WA-98583,US,WA,98583,8.4,,,, +US-WA-98584,US,WA,98584,8.5,,,, +US-WA-98585,US,WA,98585,7.8,,,, +US-WA-98586,US,WA,98586,7.8,,,, +US-WA-98587,US,WA,98587,8.4,,,, +US-WA-98588,US,WA,98588,8.5,,,, +US-WA-98589,US,WA,98589,7.9,,,, +US-WA-98590,US,WA,98590,7.8,,,, +US-WA-98591,US,WA,98591,7.8,,,, +US-WA-98592,US,WA,98592,8.5,,,, +US-WA-98593,US,WA,98593,7.8,,,, +US-WA-98595,US,WA,98595,8.4,,,, +US-WA-98596,US,WA,98596,7.8,,,, +US-WA-98597,US,WA,98597,7.9,,,, +US-WA-98599,US,WA,98599,8.8,,,, +US-WA-98601,US,WA,98601,7.7,,,, +US-WA-98602,US,WA,98602,7,,,, +US-WA-98603,US,WA,98603,7.7,,,, +US-WA-98604,US,WA,98604,7.7,,,, +US-WA-98605,US,WA,98605,7.5,,,, +US-WA-98606,US,WA,98606,7.7,,,, +US-WA-98607,US,WA,98607,8.4,,,, +US-WA-98609,US,WA,98609,7.7,,,, +US-WA-98610,US,WA,98610,7.7,,,, +US-WA-98611,US,WA,98611,7.7,,,, +US-WA-98612,US,WA,98612,7.6,,,, +US-WA-98613,US,WA,98613,7,,,, +US-WA-98614,US,WA,98614,7.8,,,, +US-WA-98616,US,WA,98616,7.7,,,, +US-WA-98617,US,WA,98617,7,,,, +US-WA-98619,US,WA,98619,7,,,, +US-WA-98620,US,WA,98620,7,,,, +US-WA-98621,US,WA,98621,7.6,,,, +US-WA-98622,US,WA,98622,8.4,,,, +US-WA-98623,US,WA,98623,7,,,, +US-WA-98624,US,WA,98624,7.8,,,, +US-WA-98625,US,WA,98625,7.7,,,, +US-WA-98626,US,WA,98626,8,,,, +US-WA-98628,US,WA,98628,7,,,, +US-WA-98629,US,WA,98629,7.7,,,, +US-WA-98631,US,WA,98631,7.8,,,, +US-WA-98632,US,WA,98632,8,,,, +US-WA-98635,US,WA,98635,7,,,, +US-WA-98637,US,WA,98637,7.8,,,, +US-WA-98638,US,WA,98638,7.8,,,, +US-WA-98639,US,WA,98639,7.7,,,, +US-WA-98640,US,WA,98640,7.8,,,, +US-WA-98641,US,WA,98641,7.8,,,, +US-WA-98642,US,WA,98642,7.7,,,, +US-WA-98643,US,WA,98643,7.6,,,, +US-WA-98644,US,WA,98644,7.8,,,, +US-WA-98645,US,WA,98645,7.7,,,, +US-WA-98647,US,WA,98647,7.6,,,, +US-WA-98648,US,WA,98648,7.7,,,, +US-WA-98649,US,WA,98649,7.7,,,, +US-WA-98650,US,WA,98650,7,,,, +US-WA-98651,US,WA,98651,7.7,,,, +US-WA-98660,US,WA,98660,8.4,,,, +US-WA-98661,US,WA,98661,8.4,,,, +US-WA-98662,US,WA,98662,8.4,,,, +US-WA-98663,US,WA,98663,8.4,,,, +US-WA-98664,US,WA,98664,8.4,,,, +US-WA-98665,US,WA,98665,8.4,,,, +US-WA-98666,US,WA,98666,8.4,,,, +US-WA-98668,US,WA,98668,8.4,,,, +US-WA-98670,US,WA,98670,7,,,, +US-WA-98671,US,WA,98671,8.4,,,, +US-WA-98672,US,WA,98672,7,,,, +US-WA-98673,US,WA,98673,7,,,, +US-WA-98674,US,WA,98674,7.7,,,, +US-WA-98675,US,WA,98675,7.7,,,, +US-WA-98682,US,WA,98682,8.4,,,, +US-WA-98683,US,WA,98683,8.4,,,, +US-WA-98684,US,WA,98684,8.4,,,, +US-WA-98685,US,WA,98685,8.4,,,, +US-WA-98686,US,WA,98686,8.4,,,, +US-WA-98687,US,WA,98687,8.4,,,, +US-WA-98801,US,WA,98801,8.4,,,, +US-WA-98802,US,WA,98802,8.2,,,, +US-WA-98807,US,WA,98807,8.4,,,, +US-WA-98811,US,WA,98811,8.2,,,, +US-WA-98812,US,WA,98812,7.7,,,, +US-WA-98813,US,WA,98813,7.7,,,, +US-WA-98814,US,WA,98814,7.7,,,, +US-WA-98815,US,WA,98815,8.2,,,, +US-WA-98816,US,WA,98816,8.2,,,, +US-WA-98817,US,WA,98817,8.2,,,, +US-WA-98819,US,WA,98819,7.7,,,, +US-WA-98821,US,WA,98821,8.2,,,, +US-WA-98822,US,WA,98822,8.2,,,, +US-WA-98823,US,WA,98823,7.9,,,, +US-WA-98824,US,WA,98824,7.9,,,, +US-WA-98826,US,WA,98826,8.2,,,, +US-WA-98827,US,WA,98827,7.7,,,, +US-WA-98828,US,WA,98828,8.2,,,, +US-WA-98829,US,WA,98829,7.7,,,, +US-WA-98830,US,WA,98830,7.8,,,, +US-WA-98831,US,WA,98831,8.2,,,, +US-WA-98832,US,WA,98832,7.9,,,, +US-WA-98833,US,WA,98833,7.7,,,, +US-WA-98834,US,WA,98834,7.7,,,, +US-WA-98836,US,WA,98836,8.2,,,, +US-WA-98837,US,WA,98837,7.9,,,, +US-WA-98840,US,WA,98840,7.8,,,, +US-WA-98841,US,WA,98841,7.7,,,, +US-WA-98843,US,WA,98843,8.2,,,, +US-WA-98844,US,WA,98844,7.7,,,, +US-WA-98845,US,WA,98845,7.8,,,, +US-WA-98846,US,WA,98846,7.7,,,, +US-WA-98847,US,WA,98847,8.2,,,, +US-WA-98848,US,WA,98848,7.9,,,, +US-WA-98849,US,WA,98849,7.7,,,, +US-WA-98850,US,WA,98850,8.2,,,, +US-WA-98851,US,WA,98851,7.9,,,, +US-WA-98852,US,WA,98852,8.2,,,, +US-WA-98853,US,WA,98853,7.9,,,, +US-WA-98855,US,WA,98855,7.7,,,, +US-WA-98856,US,WA,98856,7.8,,,, +US-WA-98857,US,WA,98857,7.9,,,, +US-WA-98858,US,WA,98858,8.2,,,, +US-WA-98859,US,WA,98859,7.7,,,, +US-WA-98860,US,WA,98860,7.9,,,, +US-WA-98862,US,WA,98862,7.7,,,, +US-WA-98901,US,WA,98901,8.2,,,, +US-WA-98902,US,WA,98902,8.2,,,, +US-WA-98903,US,WA,98903,7.9,,,, +US-WA-98904,US,WA,98904,8.2,,,, +US-WA-98907,US,WA,98907,8.2,,,, +US-WA-98908,US,WA,98908,8.2,,,, +US-WA-98909,US,WA,98909,8.2,,,, +US-WA-98920,US,WA,98920,7.9,,,, +US-WA-98921,US,WA,98921,7.9,,,, +US-WA-98922,US,WA,98922,8,,,, +US-WA-98923,US,WA,98923,7.9,,,, +US-WA-98925,US,WA,98925,8,,,, +US-WA-98926,US,WA,98926,8,,,, +US-WA-98930,US,WA,98930,7.9,,,, +US-WA-98932,US,WA,98932,7.9,,,, +US-WA-98933,US,WA,98933,7.9,,,, +US-WA-98934,US,WA,98934,8,,,, +US-WA-98935,US,WA,98935,7.9,,,, +US-WA-98936,US,WA,98936,7.9,,,, +US-WA-98937,US,WA,98937,7.9,,,, +US-WA-98938,US,WA,98938,7.9,,,, +US-WA-98939,US,WA,98939,7.9,,,, +US-WA-98940,US,WA,98940,8,,,, +US-WA-98941,US,WA,98941,8,,,, +US-WA-98942,US,WA,98942,7.9,,,, +US-WA-98943,US,WA,98943,8,,,, +US-WA-98944,US,WA,98944,7.9,,,, +US-WA-98946,US,WA,98946,8,,,, +US-WA-98947,US,WA,98947,7.9,,,, +US-WA-98948,US,WA,98948,7.9,,,, +US-WA-98950,US,WA,98950,8,,,, +US-WA-98951,US,WA,98951,7.9,,,, +US-WA-98952,US,WA,98952,7.9,,,, +US-WA-98953,US,WA,98953,7.9,,,, +US-WA-99001,US,WA,99001,8.7,,,, +US-WA-99003,US,WA,99003,8.1,,,, +US-WA-99004,US,WA,99004,8.7,,,, +US-WA-99005,US,WA,99005,8.1,,,, +US-WA-99006,US,WA,99006,8.1,,,, +US-WA-99008,US,WA,99008,7.7,,,, +US-WA-99009,US,WA,99009,8.1,,,, +US-WA-99011,US,WA,99011,8.7,,,, +US-WA-99012,US,WA,99012,8.1,,,, +US-WA-99013,US,WA,99013,7.6,,,, +US-WA-99014,US,WA,99014,8.7,,,, +US-WA-99016,US,WA,99016,8.7,,,, +US-WA-99017,US,WA,99017,7.8,,,, +US-WA-99018,US,WA,99018,8.1,,,, +US-WA-99019,US,WA,99019,8.7,,,, +US-WA-99020,US,WA,99020,8.1,,,, +US-WA-99021,US,WA,99021,8.1,,,, +US-WA-99022,US,WA,99022,8.1,,,, +US-WA-99023,US,WA,99023,8.1,,,, +US-WA-99025,US,WA,99025,8.1,,,, +US-WA-99026,US,WA,99026,8.1,,,, +US-WA-99027,US,WA,99027,8.1,,,, +US-WA-99029,US,WA,99029,7.7,,,, +US-WA-99030,US,WA,99030,8.1,,,, +US-WA-99031,US,WA,99031,8.1,,,, +US-WA-99032,US,WA,99032,7.7,,,, +US-WA-99033,US,WA,99033,7.8,,,, +US-WA-99034,US,WA,99034,7.6,,,, +US-WA-99036,US,WA,99036,8.1,,,, +US-WA-99037,US,WA,99037,8.7,,,, +US-WA-99039,US,WA,99039,8.1,,,, +US-WA-99040,US,WA,99040,7.6,,,, +US-WA-99101,US,WA,99101,7.6,,,, +US-WA-99102,US,WA,99102,7.8,,,, +US-WA-99103,US,WA,99103,7.7,,,, +US-WA-99104,US,WA,99104,7.8,,,, +US-WA-99105,US,WA,99105,7.7,,,, +US-WA-99107,US,WA,99107,7.7,,,, +US-WA-99109,US,WA,99109,7.6,,,, +US-WA-99110,US,WA,99110,7.6,,,, +US-WA-99111,US,WA,99111,7.8,,,, +US-WA-99113,US,WA,99113,7.8,,,, +US-WA-99114,US,WA,99114,7.6,,,, +US-WA-99115,US,WA,99115,7.9,,,, +US-WA-99116,US,WA,99116,7.7,,,, +US-WA-99117,US,WA,99117,7.7,,,, +US-WA-99118,US,WA,99118,7.7,,,, +US-WA-99119,US,WA,99119,7.6,,,, +US-WA-99121,US,WA,99121,7.7,,,, +US-WA-99122,US,WA,99122,7.7,,,, +US-WA-99123,US,WA,99123,7.9,,,, +US-WA-99124,US,WA,99124,7.7,,,, +US-WA-99125,US,WA,99125,7.8,,,, +US-WA-99126,US,WA,99126,7.6,,,, +US-WA-99128,US,WA,99128,7.8,,,, +US-WA-99129,US,WA,99129,7.6,,,, +US-WA-99130,US,WA,99130,7.8,,,, +US-WA-99131,US,WA,99131,7.6,,,, +US-WA-99133,US,WA,99133,7.9,,,, +US-WA-99134,US,WA,99134,7.7,,,, +US-WA-99135,US,WA,99135,7.9,,,, +US-WA-99136,US,WA,99136,7.8,,,, +US-WA-99137,US,WA,99137,7.6,,,, +US-WA-99138,US,WA,99138,7.7,,,, +US-WA-99139,US,WA,99139,7.6,,,, +US-WA-99140,US,WA,99140,7.7,,,, +US-WA-99141,US,WA,99141,7.6,,,, +US-WA-99143,US,WA,99143,7.8,,,, +US-WA-99144,US,WA,99144,7.7,,,, +US-WA-99146,US,WA,99146,7.7,,,, +US-WA-99147,US,WA,99147,7.7,,,, +US-WA-99148,US,WA,99148,7.6,,,, +US-WA-99149,US,WA,99149,7.8,,,, +US-WA-99150,US,WA,99150,7.7,,,, +US-WA-99151,US,WA,99151,7.6,,,, +US-WA-99152,US,WA,99152,7.6,,,, +US-WA-99153,US,WA,99153,7.6,,,, +US-WA-99154,US,WA,99154,7.7,,,, +US-WA-99155,US,WA,99155,7.7,,,, +US-WA-99156,US,WA,99156,7.6,,,, +US-WA-99157,US,WA,99157,7.6,,,, +US-WA-99158,US,WA,99158,7.8,,,, +US-WA-99159,US,WA,99159,7.7,,,, +US-WA-99160,US,WA,99160,7.7,,,, +US-WA-99161,US,WA,99161,7.8,,,, +US-WA-99163,US,WA,99163,7.8,,,, +US-WA-99164,US,WA,99164,7.8,,,, +US-WA-99166,US,WA,99166,7.7,,,, +US-WA-99167,US,WA,99167,7.6,,,, +US-WA-99169,US,WA,99169,7.7,,,, +US-WA-99170,US,WA,99170,7.8,,,, +US-WA-99171,US,WA,99171,7.8,,,, +US-WA-99173,US,WA,99173,7.6,,,, +US-WA-99174,US,WA,99174,7.8,,,, +US-WA-99176,US,WA,99176,7.8,,,, +US-WA-99179,US,WA,99179,7.8,,,, +US-WA-99180,US,WA,99180,7.6,,,, +US-WA-99181,US,WA,99181,7.6,,,, +US-WA-99185,US,WA,99185,7.7,,,, +US-WA-99201,US,WA,99201,8.7,,,, +US-WA-99202,US,WA,99202,8.7,,,, +US-WA-99203,US,WA,99203,8.7,,,, +US-WA-99204,US,WA,99204,8.7,,,, +US-WA-99205,US,WA,99205,8.7,,,, +US-WA-99206,US,WA,99206,8.7,,,, +US-WA-99207,US,WA,99207,8.7,,,, +US-WA-99208,US,WA,99208,8.7,,,, +US-WA-99209,US,WA,99209,8.7,,,, +US-WA-99210,US,WA,99210,8.7,,,, +US-WA-99211,US,WA,99211,8.7,,,, +US-WA-99212,US,WA,99212,8.7,,,, +US-WA-99213,US,WA,99213,8.7,,,, +US-WA-99214,US,WA,99214,8.7,,,, +US-WA-99215,US,WA,99215,8.7,,,, +US-WA-99216,US,WA,99216,8.7,,,, +US-WA-99217,US,WA,99217,8.7,,,, +US-WA-99218,US,WA,99218,8.7,,,, +US-WA-99219,US,WA,99219,8.7,,,, +US-WA-99220,US,WA,99220,8.7,,,, +US-WA-99223,US,WA,99223,8.7,,,, +US-WA-99224,US,WA,99224,8.7,,,, +US-WA-99228,US,WA,99228,8.7,,,, +US-WA-99251,US,WA,99251,8.7,,,, +US-WA-99252,US,WA,99252,8.7,,,, +US-WA-99256,US,WA,99256,8.7,,,, +US-WA-99258,US,WA,99258,8.7,,,, +US-WA-99260,US,WA,99260,8.7,,,, +US-WA-99301,US,WA,99301,8.6,,,, +US-WA-99302,US,WA,99302,8.6,,,, +US-WA-99320,US,WA,99320,8.3,,,, +US-WA-99321,US,WA,99321,7.9,,,, +US-WA-99322,US,WA,99322,7,,,, +US-WA-99323,US,WA,99323,8.1,,,, +US-WA-99324,US,WA,99324,8.7,,,, +US-WA-99326,US,WA,99326,8,,,, +US-WA-99328,US,WA,99328,7.9,,,, +US-WA-99329,US,WA,99329,8.1,,,, +US-WA-99330,US,WA,99330,8,,,, +US-WA-99333,US,WA,99333,7.8,,,, +US-WA-99335,US,WA,99335,8,,,, +US-WA-99336,US,WA,99336,8.3,,,, +US-WA-99337,US,WA,99337,8.3,,,, +US-WA-99338,US,WA,99338,8.3,,,, +US-WA-99341,US,WA,99341,7.7,,,, +US-WA-99343,US,WA,99343,8,,,, +US-WA-99344,US,WA,99344,7.7,,,, +US-WA-99345,US,WA,99345,7.7,,,, +US-WA-99346,US,WA,99346,7.7,,,, +US-WA-99347,US,WA,99347,7.5,,,, +US-WA-99348,US,WA,99348,8.1,,,, +US-WA-99349,US,WA,99349,7.9,,,, +US-WA-99350,US,WA,99350,8.3,,,, +US-WA-99352,US,WA,99352,8.3,,,, +US-WA-99353,US,WA,99353,8.3,,,, +US-WA-99354,US,WA,99354,8.3,,,, +US-WA-99356,US,WA,99356,7,,,, +US-WA-99357,US,WA,99357,7.9,,,, +US-WA-99359,US,WA,99359,7.9,,,, +US-WA-99360,US,WA,99360,8.1,,,, +US-WA-99361,US,WA,99361,8.1,,,, +US-WA-99362,US,WA,99362,8.9,,,, +US-WA-99363,US,WA,99363,8.1,,,, +US-WA-99371,US,WA,99371,7.7,,,, +US-WA-99401,US,WA,99401,7.5,,,, +US-WA-99402,US,WA,99402,7.5,,,, +US-WA-99403,US,WA,99403,7.5,,,, +US-WI-53001,US,WI,53001,5,,,, +US-WI-53002,US,WI,53002,5.6,,,, +US-WI-53003,US,WI,53003,5.5,,,, +US-WI-53004,US,WI,53004,5.6,,,, +US-WI-53005,US,WI,53005,5.1,,,, +US-WI-53006,US,WI,53006,5.5,,,, +US-WI-53007,US,WI,53007,5.1,,,, +US-WI-53008,US,WI,53008,5.1,,,, +US-WI-53010,US,WI,53010,5.5,,,, +US-WI-53011,US,WI,53011,5,,,, +US-WI-53012,US,WI,53012,5.6,,,, +US-WI-53013,US,WI,53013,5,,,, +US-WI-53014,US,WI,53014,5,,,, +US-WI-53015,US,WI,53015,5,,,, +US-WI-53016,US,WI,53016,5.5,,,, +US-WI-53017,US,WI,53017,5.6,,,, +US-WI-53018,US,WI,53018,5.1,,,, +US-WI-53019,US,WI,53019,5.5,,,, +US-WI-53020,US,WI,53020,5,,,, +US-WI-53021,US,WI,53021,5.6,,,, +US-WI-53022,US,WI,53022,5.6,,,, +US-WI-53023,US,WI,53023,5,,,, +US-WI-53024,US,WI,53024,5.6,,,, +US-WI-53026,US,WI,53026,5,,,, +US-WI-53027,US,WI,53027,5.6,,,, +US-WI-53029,US,WI,53029,5.1,,,, +US-WI-53031,US,WI,53031,5,,,, +US-WI-53032,US,WI,53032,5.5,,,, +US-WI-53033,US,WI,53033,5.6,,,, +US-WI-53034,US,WI,53034,5.5,,,, +US-WI-53035,US,WI,53035,5.5,,,, +US-WI-53036,US,WI,53036,5.5,,,, +US-WI-53037,US,WI,53037,5.6,,,, +US-WI-53038,US,WI,53038,5.5,,,, +US-WI-53039,US,WI,53039,5.5,,,, +US-WI-53040,US,WI,53040,5.6,,,, +US-WI-53042,US,WI,53042,5,,,, +US-WI-53044,US,WI,53044,5,,,, +US-WI-53045,US,WI,53045,5.1,,,, +US-WI-53046,US,WI,53046,5.1,,,, +US-WI-53047,US,WI,53047,5.5,,,, +US-WI-53048,US,WI,53048,5.5,,,, +US-WI-53049,US,WI,53049,5.5,,,, +US-WI-53050,US,WI,53050,5.5,,,, +US-WI-53051,US,WI,53051,5.1,,,, +US-WI-53052,US,WI,53052,5.1,,,, +US-WI-53056,US,WI,53056,5.1,,,, +US-WI-53057,US,WI,53057,5.5,,,, +US-WI-53058,US,WI,53058,5.1,,,, +US-WI-53059,US,WI,53059,5.5,,,, +US-WI-53060,US,WI,53060,5.6,,,, +US-WI-53061,US,WI,53061,5,,,, +US-WI-53062,US,WI,53062,5,,,, +US-WI-53063,US,WI,53063,5,,,, +US-WI-53064,US,WI,53064,5.1,,,, +US-WI-53065,US,WI,53065,5.5,,,, +US-WI-53066,US,WI,53066,5.1,,,, +US-WI-53069,US,WI,53069,5.1,,,, +US-WI-53070,US,WI,53070,5,,,, +US-WI-53072,US,WI,53072,5.1,,,, +US-WI-53073,US,WI,53073,5,,,, +US-WI-53074,US,WI,53074,5.6,,,, +US-WI-53075,US,WI,53075,5,,,, +US-WI-53076,US,WI,53076,5.6,,,, +US-WI-53078,US,WI,53078,5.5,,,, +US-WI-53079,US,WI,53079,5.5,,,, +US-WI-53080,US,WI,53080,5.6,,,, +US-WI-53081,US,WI,53081,5,,,, +US-WI-53082,US,WI,53082,5,,,, +US-WI-53083,US,WI,53083,5,,,, +US-WI-53085,US,WI,53085,5,,,, +US-WI-53086,US,WI,53086,5.6,,,, +US-WI-53088,US,WI,53088,5,,,, +US-WI-53089,US,WI,53089,5.1,,,, +US-WI-53090,US,WI,53090,5.6,,,, +US-WI-53091,US,WI,53091,5.5,,,, +US-WI-53092,US,WI,53092,5.6,,,, +US-WI-53093,US,WI,53093,5,,,, +US-WI-53094,US,WI,53094,5.5,,,, +US-WI-53095,US,WI,53095,5.6,,,, +US-WI-53097,US,WI,53097,5.6,,,, +US-WI-53098,US,WI,53098,5.5,,,, +US-WI-53099,US,WI,53099,5.5,,,, +US-WI-53101,US,WI,53101,5.5,,,, +US-WI-53102,US,WI,53102,5.5,,,, +US-WI-53103,US,WI,53103,5.1,,,, +US-WI-53104,US,WI,53104,5.5,,,, +US-WI-53105,US,WI,53105,5.1,,,, +US-WI-53108,US,WI,53108,5.1,,,, +US-WI-53109,US,WI,53109,5.5,,,, +US-WI-53110,US,WI,53110,5.6,,,, +US-WI-53114,US,WI,53114,5.5,,,, +US-WI-53115,US,WI,53115,5.5,,,, +US-WI-53118,US,WI,53118,5.1,,,, +US-WI-53119,US,WI,53119,5.1,,,, +US-WI-53120,US,WI,53120,5.5,,,, +US-WI-53121,US,WI,53121,5.5,,,, +US-WI-53122,US,WI,53122,5.1,,,, +US-WI-53125,US,WI,53125,5.5,,,, +US-WI-53126,US,WI,53126,5.1,,,, +US-WI-53127,US,WI,53127,5.1,,,, +US-WI-53128,US,WI,53128,5.5,,,, +US-WI-53129,US,WI,53129,5.6,,,, +US-WI-53130,US,WI,53130,5.6,,,, +US-WI-53132,US,WI,53132,5.6,,,, +US-WI-53137,US,WI,53137,5.5,,,, +US-WI-53138,US,WI,53138,5.5,,,, +US-WI-53139,US,WI,53139,5.1,,,, +US-WI-53140,US,WI,53140,5.5,,,, +US-WI-53141,US,WI,53141,5.5,,,, +US-WI-53142,US,WI,53142,5.5,,,, +US-WI-53143,US,WI,53143,5.5,,,, +US-WI-53144,US,WI,53144,5.5,,,, +US-WI-53146,US,WI,53146,5.1,,,, +US-WI-53147,US,WI,53147,5.5,,,, +US-WI-53148,US,WI,53148,5.5,,,, +US-WI-53149,US,WI,53149,5.1,,,, +US-WI-53150,US,WI,53150,5.1,,,, +US-WI-53151,US,WI,53151,5.1,,,, +US-WI-53152,US,WI,53152,5.5,,,, +US-WI-53153,US,WI,53153,5.1,,,, +US-WI-53154,US,WI,53154,5.6,,,, +US-WI-53156,US,WI,53156,5.5,,,, +US-WI-53157,US,WI,53157,5.5,,,, +US-WI-53158,US,WI,53158,5.5,,,, +US-WI-53159,US,WI,53159,5.5,,,, +US-WI-53167,US,WI,53167,5.1,,,, +US-WI-53168,US,WI,53168,5.5,,,, +US-WI-53170,US,WI,53170,5.5,,,, +US-WI-53171,US,WI,53171,5.5,,,, +US-WI-53172,US,WI,53172,5.6,,,, +US-WI-53176,US,WI,53176,5.5,,,, +US-WI-53177,US,WI,53177,5.1,,,, +US-WI-53178,US,WI,53178,5.5,,,, +US-WI-53179,US,WI,53179,5.5,,,, +US-WI-53181,US,WI,53181,5.5,,,, +US-WI-53182,US,WI,53182,5.1,,,, +US-WI-53183,US,WI,53183,5.1,,,, +US-WI-53184,US,WI,53184,5.5,,,, +US-WI-53185,US,WI,53185,5.1,,,, +US-WI-53186,US,WI,53186,5.1,,,, +US-WI-53187,US,WI,53187,5.1,,,, +US-WI-53188,US,WI,53188,5.1,,,, +US-WI-53189,US,WI,53189,5.1,,,, +US-WI-53190,US,WI,53190,5.5,,,, +US-WI-53191,US,WI,53191,5.5,,,, +US-WI-53192,US,WI,53192,5.5,,,, +US-WI-53194,US,WI,53194,5.5,,,, +US-WI-53195,US,WI,53195,5.5,,,, +US-WI-53201,US,WI,53201,5.6,,,, +US-WI-53202,US,WI,53202,5.6,,,, +US-WI-53203,US,WI,53203,5.6,,,, +US-WI-53204,US,WI,53204,5.6,,,, +US-WI-53205,US,WI,53205,5.6,,,, +US-WI-53206,US,WI,53206,5.6,,,, +US-WI-53207,US,WI,53207,5.6,,,, +US-WI-53208,US,WI,53208,5.6,,,, +US-WI-53209,US,WI,53209,5.6,,,, +US-WI-53210,US,WI,53210,5.6,,,, +US-WI-53211,US,WI,53211,5.6,,,, +US-WI-53212,US,WI,53212,5.6,,,, +US-WI-53213,US,WI,53213,5.6,,,, +US-WI-53214,US,WI,53214,5.6,,,, +US-WI-53215,US,WI,53215,5.6,,,, +US-WI-53216,US,WI,53216,5.6,,,, +US-WI-53217,US,WI,53217,5.6,,,, +US-WI-53218,US,WI,53218,5.6,,,, +US-WI-53219,US,WI,53219,5.6,,,, +US-WI-53220,US,WI,53220,5.6,,,, +US-WI-53221,US,WI,53221,5.6,,,, +US-WI-53222,US,WI,53222,5.6,,,, +US-WI-53223,US,WI,53223,5.6,,,, +US-WI-53224,US,WI,53224,5.6,,,, +US-WI-53225,US,WI,53225,5.6,,,, +US-WI-53226,US,WI,53226,5.6,,,, +US-WI-53227,US,WI,53227,5.6,,,, +US-WI-53228,US,WI,53228,5.6,,,, +US-WI-53233,US,WI,53233,5.6,,,, +US-WI-53234,US,WI,53234,5.6,,,, +US-WI-53235,US,WI,53235,5.6,,,, +US-WI-53237,US,WI,53237,5.6,,,, +US-WI-53259,US,WI,53259,5.6,,,, +US-WI-53263,US,WI,53263,5.6,,,, +US-WI-53267,US,WI,53267,5.6,,,, +US-WI-53268,US,WI,53268,5.6,,,, +US-WI-53274,US,WI,53274,5.6,,,, +US-WI-53278,US,WI,53278,5.6,,,, +US-WI-53288,US,WI,53288,5.6,,,, +US-WI-53290,US,WI,53290,5.6,,,, +US-WI-53293,US,WI,53293,5.6,,,, +US-WI-53295,US,WI,53295,5.6,,,, +US-WI-53401,US,WI,53401,5.1,,,, +US-WI-53402,US,WI,53402,5.1,,,, +US-WI-53403,US,WI,53403,5.1,,,, +US-WI-53404,US,WI,53404,5.1,,,, +US-WI-53405,US,WI,53405,5.1,,,, +US-WI-53406,US,WI,53406,5.1,,,, +US-WI-53407,US,WI,53407,5.1,,,, +US-WI-53408,US,WI,53408,5.1,,,, +US-WI-53501,US,WI,53501,5.5,,,, +US-WI-53502,US,WI,53502,5.5,,,, +US-WI-53503,US,WI,53503,5.5,,,, +US-WI-53504,US,WI,53504,5.5,,,, +US-WI-53505,US,WI,53505,5.5,,,, +US-WI-53506,US,WI,53506,5.5,,,, +US-WI-53507,US,WI,53507,5.5,,,, +US-WI-53508,US,WI,53508,5.5,,,, +US-WI-53510,US,WI,53510,5.5,,,, +US-WI-53511,US,WI,53511,5.5,,,, +US-WI-53512,US,WI,53512,5.5,,,, +US-WI-53515,US,WI,53515,5.5,,,, +US-WI-53516,US,WI,53516,5.5,,,, +US-WI-53517,US,WI,53517,5.5,,,, +US-WI-53518,US,WI,53518,5.5,,,, +US-WI-53520,US,WI,53520,5.5,,,, +US-WI-53521,US,WI,53521,5.5,,,, +US-WI-53522,US,WI,53522,5.5,,,, +US-WI-53523,US,WI,53523,5.5,,,, +US-WI-53525,US,WI,53525,5.5,,,, +US-WI-53526,US,WI,53526,5.5,,,, +US-WI-53527,US,WI,53527,5.5,,,, +US-WI-53528,US,WI,53528,5.5,,,, +US-WI-53529,US,WI,53529,5.5,,,, +US-WI-53530,US,WI,53530,5.5,,,, +US-WI-53531,US,WI,53531,5.5,,,, +US-WI-53532,US,WI,53532,5.5,,,, +US-WI-53533,US,WI,53533,5.5,,,, +US-WI-53534,US,WI,53534,5.5,,,, +US-WI-53535,US,WI,53535,5.5,,,, +US-WI-53536,US,WI,53536,5.5,,,, +US-WI-53537,US,WI,53537,5.5,,,, +US-WI-53538,US,WI,53538,5.5,,,, +US-WI-53540,US,WI,53540,5.5,,,, +US-WI-53541,US,WI,53541,5.5,,,, +US-WI-53542,US,WI,53542,5.5,,,, +US-WI-53543,US,WI,53543,5.5,,,, +US-WI-53544,US,WI,53544,5.5,,,, +US-WI-53545,US,WI,53545,5.5,,,, +US-WI-53546,US,WI,53546,5.5,,,, +US-WI-53547,US,WI,53547,5.5,,,, +US-WI-53548,US,WI,53548,5.5,,,, +US-WI-53549,US,WI,53549,5.5,,,, +US-WI-53550,US,WI,53550,5.5,,,, +US-WI-53551,US,WI,53551,5.5,,,, +US-WI-53553,US,WI,53553,5.5,,,, +US-WI-53554,US,WI,53554,5.5,,,, +US-WI-53555,US,WI,53555,5.5,,,, +US-WI-53556,US,WI,53556,5.5,,,, +US-WI-53557,US,WI,53557,5.5,,,, +US-WI-53558,US,WI,53558,5.5,,,, +US-WI-53559,US,WI,53559,5.5,,,, +US-WI-53560,US,WI,53560,5.5,,,, +US-WI-53561,US,WI,53561,5.5,,,, +US-WI-53562,US,WI,53562,5.5,,,, +US-WI-53563,US,WI,53563,5.5,,,, +US-WI-53565,US,WI,53565,5.5,,,, +US-WI-53566,US,WI,53566,5.5,,,, +US-WI-53569,US,WI,53569,5.5,,,, +US-WI-53570,US,WI,53570,5.5,,,, +US-WI-53571,US,WI,53571,5.5,,,, +US-WI-53572,US,WI,53572,5.5,,,, +US-WI-53573,US,WI,53573,5.5,,,, +US-WI-53574,US,WI,53574,5.5,,,, +US-WI-53575,US,WI,53575,5.5,,,, +US-WI-53576,US,WI,53576,5.5,,,, +US-WI-53577,US,WI,53577,5.5,,,, +US-WI-53578,US,WI,53578,5.5,,,, +US-WI-53579,US,WI,53579,5.5,,,, +US-WI-53580,US,WI,53580,5.5,,,, +US-WI-53581,US,WI,53581,5.5,,,, +US-WI-53582,US,WI,53582,5.5,,,, +US-WI-53583,US,WI,53583,5.5,,,, +US-WI-53584,US,WI,53584,5.5,,,, +US-WI-53585,US,WI,53585,5.5,,,, +US-WI-53586,US,WI,53586,5.5,,,, +US-WI-53587,US,WI,53587,5.5,,,, +US-WI-53588,US,WI,53588,5.5,,,, +US-WI-53589,US,WI,53589,5.5,,,, +US-WI-53590,US,WI,53590,5.5,,,, +US-WI-53593,US,WI,53593,5.5,,,, +US-WI-53594,US,WI,53594,5.5,,,, +US-WI-53595,US,WI,53595,5.5,,,, +US-WI-53596,US,WI,53596,5.5,,,, +US-WI-53597,US,WI,53597,5.5,,,, +US-WI-53598,US,WI,53598,5.5,,,, +US-WI-53599,US,WI,53599,5.5,,,, +US-WI-53701,US,WI,53701,5.5,,,, +US-WI-53702,US,WI,53702,5.5,,,, +US-WI-53703,US,WI,53703,5.5,,,, +US-WI-53704,US,WI,53704,5.5,,,, +US-WI-53705,US,WI,53705,5.5,,,, +US-WI-53706,US,WI,53706,5.5,,,, +US-WI-53707,US,WI,53707,5.5,,,, +US-WI-53708,US,WI,53708,5.5,,,, +US-WI-53711,US,WI,53711,5.5,,,, +US-WI-53713,US,WI,53713,5.5,,,, +US-WI-53714,US,WI,53714,5.5,,,, +US-WI-53715,US,WI,53715,5.5,,,, +US-WI-53716,US,WI,53716,5.5,,,, +US-WI-53717,US,WI,53717,5.5,,,, +US-WI-53718,US,WI,53718,5.5,,,, +US-WI-53719,US,WI,53719,5.5,,,, +US-WI-53725,US,WI,53725,5.5,,,, +US-WI-53726,US,WI,53726,5.5,,,, +US-WI-53744,US,WI,53744,5.5,,,, +US-WI-53774,US,WI,53774,5.5,,,, +US-WI-53777,US,WI,53777,5.5,,,, +US-WI-53778,US,WI,53778,5.5,,,, +US-WI-53779,US,WI,53779,5.5,,,, +US-WI-53782,US,WI,53782,5.5,,,, +US-WI-53783,US,WI,53783,5.5,,,, +US-WI-53784,US,WI,53784,5.5,,,, +US-WI-53785,US,WI,53785,5.5,,,, +US-WI-53786,US,WI,53786,5.5,,,, +US-WI-53788,US,WI,53788,5.5,,,, +US-WI-53789,US,WI,53789,5.5,,,, +US-WI-53790,US,WI,53790,5.5,,,, +US-WI-53791,US,WI,53791,5.5,,,, +US-WI-53792,US,WI,53792,5.5,,,, +US-WI-53793,US,WI,53793,5.5,,,, +US-WI-53794,US,WI,53794,5.5,,,, +US-WI-53801,US,WI,53801,5.5,,,, +US-WI-53802,US,WI,53802,5.5,,,, +US-WI-53803,US,WI,53803,5.5,,,, +US-WI-53804,US,WI,53804,5.5,,,, +US-WI-53805,US,WI,53805,5.5,,,, +US-WI-53806,US,WI,53806,5.5,,,, +US-WI-53807,US,WI,53807,5.5,,,, +US-WI-53808,US,WI,53808,5.5,,,, +US-WI-53809,US,WI,53809,5.5,,,, +US-WI-53810,US,WI,53810,5.5,,,, +US-WI-53811,US,WI,53811,5.5,,,, +US-WI-53812,US,WI,53812,5.5,,,, +US-WI-53813,US,WI,53813,5.5,,,, +US-WI-53816,US,WI,53816,5.5,,,, +US-WI-53817,US,WI,53817,5.5,,,, +US-WI-53818,US,WI,53818,5.5,,,, +US-WI-53820,US,WI,53820,5.5,,,, +US-WI-53821,US,WI,53821,5.5,,,, +US-WI-53824,US,WI,53824,5.5,,,, +US-WI-53825,US,WI,53825,5.5,,,, +US-WI-53826,US,WI,53826,5.5,,,, +US-WI-53827,US,WI,53827,5.5,,,, +US-WI-53901,US,WI,53901,5.5,,,, +US-WI-53910,US,WI,53910,5.5,,,, +US-WI-53911,US,WI,53911,5.5,,,, +US-WI-53913,US,WI,53913,5.5,,,, +US-WI-53916,US,WI,53916,5.5,,,, +US-WI-53919,US,WI,53919,5.5,,,, +US-WI-53920,US,WI,53920,5.5,,,, +US-WI-53922,US,WI,53922,5.5,,,, +US-WI-53923,US,WI,53923,5.5,,,, +US-WI-53924,US,WI,53924,5.5,,,, +US-WI-53925,US,WI,53925,5.5,,,, +US-WI-53926,US,WI,53926,5.5,,,, +US-WI-53927,US,WI,53927,5.5,,,, +US-WI-53928,US,WI,53928,5.5,,,, +US-WI-53929,US,WI,53929,5.5,,,, +US-WI-53930,US,WI,53930,5.5,,,, +US-WI-53931,US,WI,53931,5.5,,,, +US-WI-53932,US,WI,53932,5.5,,,, +US-WI-53933,US,WI,53933,5.5,,,, +US-WI-53934,US,WI,53934,5.5,,,, +US-WI-53935,US,WI,53935,5.5,,,, +US-WI-53936,US,WI,53936,5.5,,,, +US-WI-53937,US,WI,53937,5.5,,,, +US-WI-53939,US,WI,53939,5.5,,,, +US-WI-53940,US,WI,53940,5.5,,,, +US-WI-53941,US,WI,53941,5.5,,,, +US-WI-53942,US,WI,53942,5.5,,,, +US-WI-53943,US,WI,53943,5.5,,,, +US-WI-53944,US,WI,53944,5.5,,,, +US-WI-53946,US,WI,53946,5.5,,,, +US-WI-53947,US,WI,53947,5.5,,,, +US-WI-53948,US,WI,53948,5.5,,,, +US-WI-53949,US,WI,53949,5.5,,,, +US-WI-53950,US,WI,53950,5.5,,,, +US-WI-53951,US,WI,53951,5.5,,,, +US-WI-53952,US,WI,53952,5.5,,,, +US-WI-53953,US,WI,53953,5.5,,,, +US-WI-53954,US,WI,53954,5.5,,,, +US-WI-53955,US,WI,53955,5.5,,,, +US-WI-53956,US,WI,53956,5.5,,,, +US-WI-53957,US,WI,53957,5.5,,,, +US-WI-53958,US,WI,53958,5.5,,,, +US-WI-53959,US,WI,53959,5.5,,,, +US-WI-53960,US,WI,53960,5.5,,,, +US-WI-53961,US,WI,53961,5.5,,,, +US-WI-53962,US,WI,53962,5.5,,,, +US-WI-53963,US,WI,53963,5.5,,,, +US-WI-53964,US,WI,53964,5.5,,,, +US-WI-53965,US,WI,53965,5.5,,,, +US-WI-53968,US,WI,53968,5.5,,,, +US-WI-53969,US,WI,53969,5.5,,,, +US-WI-54001,US,WI,54001,5.5,,,, +US-WI-54002,US,WI,54002,5.5,,,, +US-WI-54003,US,WI,54003,5.5,,,, +US-WI-54004,US,WI,54004,5.5,,,, +US-WI-54005,US,WI,54005,5.5,,,, +US-WI-54006,US,WI,54006,5.5,,,, +US-WI-54007,US,WI,54007,5.5,,,, +US-WI-54009,US,WI,54009,5.5,,,, +US-WI-54010,US,WI,54010,5.5,,,, +US-WI-54011,US,WI,54011,5.5,,,, +US-WI-54013,US,WI,54013,5.5,,,, +US-WI-54014,US,WI,54014,5.5,,,, +US-WI-54015,US,WI,54015,5.5,,,, +US-WI-54016,US,WI,54016,5.5,,,, +US-WI-54017,US,WI,54017,5.5,,,, +US-WI-54020,US,WI,54020,5.5,,,, +US-WI-54021,US,WI,54021,5.5,,,, +US-WI-54022,US,WI,54022,5.5,,,, +US-WI-54023,US,WI,54023,5.5,,,, +US-WI-54024,US,WI,54024,5.5,,,, +US-WI-54025,US,WI,54025,5.5,,,, +US-WI-54026,US,WI,54026,5.5,,,, +US-WI-54027,US,WI,54027,5.5,,,, +US-WI-54028,US,WI,54028,5.5,,,, +US-WI-54082,US,WI,54082,5.5,,,, +US-WI-54101,US,WI,54101,5.5,,,, +US-WI-54102,US,WI,54102,5.5,,,, +US-WI-54103,US,WI,54103,5.5,,,, +US-WI-54104,US,WI,54104,5.5,,,, +US-WI-54106,US,WI,54106,5,,,, +US-WI-54107,US,WI,54107,5.5,,,, +US-WI-54110,US,WI,54110,5,,,, +US-WI-54111,US,WI,54111,5.5,,,, +US-WI-54112,US,WI,54112,5.5,,,, +US-WI-54113,US,WI,54113,5,,,, +US-WI-54114,US,WI,54114,5.5,,,, +US-WI-54115,US,WI,54115,5.5,,,, +US-WI-54119,US,WI,54119,5.5,,,, +US-WI-54120,US,WI,54120,5.5,,,, +US-WI-54121,US,WI,54121,5.5,,,, +US-WI-54123,US,WI,54123,5,,,, +US-WI-54124,US,WI,54124,5.5,,,, +US-WI-54125,US,WI,54125,5.5,,,, +US-WI-54126,US,WI,54126,5.5,,,, +US-WI-54127,US,WI,54127,5.5,,,, +US-WI-54128,US,WI,54128,5.5,,,, +US-WI-54129,US,WI,54129,5,,,, +US-WI-54130,US,WI,54130,5,,,, +US-WI-54131,US,WI,54131,5,,,, +US-WI-54135,US,WI,54135,5,,,, +US-WI-54136,US,WI,54136,5,,,, +US-WI-54137,US,WI,54137,5.5,,,, +US-WI-54138,US,WI,54138,5.5,,,, +US-WI-54139,US,WI,54139,5.5,,,, +US-WI-54140,US,WI,54140,5,,,, +US-WI-54141,US,WI,54141,5.5,,,, +US-WI-54143,US,WI,54143,5.5,,,, +US-WI-54149,US,WI,54149,5.5,,,, +US-WI-54150,US,WI,54150,5,,,, +US-WI-54151,US,WI,54151,5.5,,,, +US-WI-54152,US,WI,54152,5,,,, +US-WI-54153,US,WI,54153,5.5,,,, +US-WI-54154,US,WI,54154,5.5,,,, +US-WI-54155,US,WI,54155,5.5,,,, +US-WI-54156,US,WI,54156,5.5,,,, +US-WI-54157,US,WI,54157,5.5,,,, +US-WI-54159,US,WI,54159,5.5,,,, +US-WI-54160,US,WI,54160,5,,,, +US-WI-54161,US,WI,54161,5.5,,,, +US-WI-54162,US,WI,54162,5.5,,,, +US-WI-54165,US,WI,54165,5,,,, +US-WI-54166,US,WI,54166,5.5,,,, +US-WI-54169,US,WI,54169,5,,,, +US-WI-54170,US,WI,54170,5,,,, +US-WI-54171,US,WI,54171,5.5,,,, +US-WI-54173,US,WI,54173,5.5,,,, +US-WI-54174,US,WI,54174,5.5,,,, +US-WI-54175,US,WI,54175,5.5,,,, +US-WI-54177,US,WI,54177,5.5,,,, +US-WI-54180,US,WI,54180,5.5,,,, +US-WI-54182,US,WI,54182,5.5,,,, +US-WI-54201,US,WI,54201,5,,,, +US-WI-54202,US,WI,54202,5.5,,,, +US-WI-54204,US,WI,54204,5.5,,,, +US-WI-54205,US,WI,54205,5,,,, +US-WI-54207,US,WI,54207,5,,,, +US-WI-54208,US,WI,54208,5.5,,,, +US-WI-54209,US,WI,54209,5.5,,,, +US-WI-54210,US,WI,54210,5.5,,,, +US-WI-54211,US,WI,54211,5.5,,,, +US-WI-54212,US,WI,54212,5.5,,,, +US-WI-54213,US,WI,54213,5.5,,,, +US-WI-54214,US,WI,54214,5,,,, +US-WI-54215,US,WI,54215,5,,,, +US-WI-54216,US,WI,54216,5,,,, +US-WI-54217,US,WI,54217,5,,,, +US-WI-54220,US,WI,54220,5,,,, +US-WI-54221,US,WI,54221,5,,,, +US-WI-54226,US,WI,54226,5.5,,,, +US-WI-54227,US,WI,54227,5,,,, +US-WI-54228,US,WI,54228,5,,,, +US-WI-54229,US,WI,54229,5.5,,,, +US-WI-54230,US,WI,54230,5,,,, +US-WI-54232,US,WI,54232,5,,,, +US-WI-54234,US,WI,54234,5.5,,,, +US-WI-54235,US,WI,54235,5.5,,,, +US-WI-54241,US,WI,54241,5,,,, +US-WI-54245,US,WI,54245,5,,,, +US-WI-54246,US,WI,54246,5.5,,,, +US-WI-54247,US,WI,54247,5,,,, +US-WI-54301,US,WI,54301,5.5,,,, +US-WI-54302,US,WI,54302,5.5,,,, +US-WI-54303,US,WI,54303,5.5,,,, +US-WI-54304,US,WI,54304,5.5,,,, +US-WI-54305,US,WI,54305,5.5,,,, +US-WI-54306,US,WI,54306,5.5,,,, +US-WI-54307,US,WI,54307,5.5,,,, +US-WI-54308,US,WI,54308,5.5,,,, +US-WI-54311,US,WI,54311,5.5,,,, +US-WI-54313,US,WI,54313,5.5,,,, +US-WI-54324,US,WI,54324,5.5,,,, +US-WI-54344,US,WI,54344,5.5,,,, +US-WI-54401,US,WI,54401,5.5,,,, +US-WI-54402,US,WI,54402,5.5,,,, +US-WI-54403,US,WI,54403,5.5,,,, +US-WI-54404,US,WI,54404,5.5,,,, +US-WI-54405,US,WI,54405,5.5,,,, +US-WI-54406,US,WI,54406,5.5,,,, +US-WI-54407,US,WI,54407,5.5,,,, +US-WI-54408,US,WI,54408,5.5,,,, +US-WI-54409,US,WI,54409,5.5,,,, +US-WI-54410,US,WI,54410,5.5,,,, +US-WI-54411,US,WI,54411,5.5,,,, +US-WI-54412,US,WI,54412,5.5,,,, +US-WI-54413,US,WI,54413,5.5,,,, +US-WI-54414,US,WI,54414,5.5,,,, +US-WI-54415,US,WI,54415,5.5,,,, +US-WI-54416,US,WI,54416,5.5,,,, +US-WI-54417,US,WI,54417,5.5,,,, +US-WI-54418,US,WI,54418,5.5,,,, +US-WI-54420,US,WI,54420,5.5,,,, +US-WI-54421,US,WI,54421,5.5,,,, +US-WI-54422,US,WI,54422,5.5,,,, +US-WI-54423,US,WI,54423,5.5,,,, +US-WI-54424,US,WI,54424,5.5,,,, +US-WI-54425,US,WI,54425,5.5,,,, +US-WI-54426,US,WI,54426,5.5,,,, +US-WI-54427,US,WI,54427,5.5,,,, +US-WI-54428,US,WI,54428,5.5,,,, +US-WI-54429,US,WI,54429,5.5,,,, +US-WI-54430,US,WI,54430,5.5,,,, +US-WI-54432,US,WI,54432,5.5,,,, +US-WI-54433,US,WI,54433,5.5,,,, +US-WI-54434,US,WI,54434,5.5,,,, +US-WI-54435,US,WI,54435,5.5,,,, +US-WI-54436,US,WI,54436,5.5,,,, +US-WI-54437,US,WI,54437,5.5,,,, +US-WI-54439,US,WI,54439,5.5,,,, +US-WI-54440,US,WI,54440,5.5,,,, +US-WI-54441,US,WI,54441,5.5,,,, +US-WI-54442,US,WI,54442,5.5,,,, +US-WI-54443,US,WI,54443,5.5,,,, +US-WI-54446,US,WI,54446,5.5,,,, +US-WI-54447,US,WI,54447,5.5,,,, +US-WI-54448,US,WI,54448,5.5,,,, +US-WI-54449,US,WI,54449,5.5,,,, +US-WI-54450,US,WI,54450,5.5,,,, +US-WI-54451,US,WI,54451,5.5,,,, +US-WI-54452,US,WI,54452,5.5,,,, +US-WI-54454,US,WI,54454,5.5,,,, +US-WI-54455,US,WI,54455,5.5,,,, +US-WI-54456,US,WI,54456,5.5,,,, +US-WI-54457,US,WI,54457,5.5,,,, +US-WI-54458,US,WI,54458,5.5,,,, +US-WI-54459,US,WI,54459,5.5,,,, +US-WI-54460,US,WI,54460,5.5,,,, +US-WI-54462,US,WI,54462,5.5,,,, +US-WI-54463,US,WI,54463,5.5,,,, +US-WI-54464,US,WI,54464,5.5,,,, +US-WI-54465,US,WI,54465,5.5,,,, +US-WI-54466,US,WI,54466,5.5,,,, +US-WI-54467,US,WI,54467,5.5,,,, +US-WI-54469,US,WI,54469,5.5,,,, +US-WI-54470,US,WI,54470,5.5,,,, +US-WI-54471,US,WI,54471,5.5,,,, +US-WI-54472,US,WI,54472,5.5,,,, +US-WI-54473,US,WI,54473,5.5,,,, +US-WI-54474,US,WI,54474,5.5,,,, +US-WI-54475,US,WI,54475,5.5,,,, +US-WI-54476,US,WI,54476,5.5,,,, +US-WI-54479,US,WI,54479,5.5,,,, +US-WI-54480,US,WI,54480,5.5,,,, +US-WI-54481,US,WI,54481,5.5,,,, +US-WI-54482,US,WI,54482,5.5,,,, +US-WI-54484,US,WI,54484,5.5,,,, +US-WI-54485,US,WI,54485,5.5,,,, +US-WI-54486,US,WI,54486,5.5,,,, +US-WI-54487,US,WI,54487,5.5,,,, +US-WI-54488,US,WI,54488,5.5,,,, +US-WI-54489,US,WI,54489,5.5,,,, +US-WI-54490,US,WI,54490,5.5,,,, +US-WI-54491,US,WI,54491,5.5,,,, +US-WI-54492,US,WI,54492,5.5,,,, +US-WI-54493,US,WI,54493,5.5,,,, +US-WI-54494,US,WI,54494,5.5,,,, +US-WI-54495,US,WI,54495,5.5,,,, +US-WI-54498,US,WI,54498,5.5,,,, +US-WI-54499,US,WI,54499,5.5,,,, +US-WI-54501,US,WI,54501,5.5,,,, +US-WI-54511,US,WI,54511,5.5,,,, +US-WI-54512,US,WI,54512,5.5,,,, +US-WI-54513,US,WI,54513,5.5,,,, +US-WI-54514,US,WI,54514,5.5,,,, +US-WI-54515,US,WI,54515,5.5,,,, +US-WI-54517,US,WI,54517,5.5,,,, +US-WI-54519,US,WI,54519,5.5,,,, +US-WI-54520,US,WI,54520,5.5,,,, +US-WI-54521,US,WI,54521,5.5,,,, +US-WI-54524,US,WI,54524,5.5,,,, +US-WI-54525,US,WI,54525,5.5,,,, +US-WI-54526,US,WI,54526,5.5,,,, +US-WI-54527,US,WI,54527,5.5,,,, +US-WI-54529,US,WI,54529,5.5,,,, +US-WI-54530,US,WI,54530,5.5,,,, +US-WI-54531,US,WI,54531,5.5,,,, +US-WI-54532,US,WI,54532,5.5,,,, +US-WI-54534,US,WI,54534,5.5,,,, +US-WI-54536,US,WI,54536,5.5,,,, +US-WI-54537,US,WI,54537,5.5,,,, +US-WI-54538,US,WI,54538,5.5,,,, +US-WI-54539,US,WI,54539,5.5,,,, +US-WI-54540,US,WI,54540,5.5,,,, +US-WI-54541,US,WI,54541,5.5,,,, +US-WI-54542,US,WI,54542,5.5,,,, +US-WI-54543,US,WI,54543,5.5,,,, +US-WI-54545,US,WI,54545,5.5,,,, +US-WI-54546,US,WI,54546,5.5,,,, +US-WI-54547,US,WI,54547,5.5,,,, +US-WI-54548,US,WI,54548,5.5,,,, +US-WI-54550,US,WI,54550,5.5,,,, +US-WI-54552,US,WI,54552,5.5,,,, +US-WI-54554,US,WI,54554,5.5,,,, +US-WI-54555,US,WI,54555,5.5,,,, +US-WI-54556,US,WI,54556,5.5,,,, +US-WI-54557,US,WI,54557,5.5,,,, +US-WI-54558,US,WI,54558,5.5,,,, +US-WI-54559,US,WI,54559,5.5,,,, +US-WI-54560,US,WI,54560,5.5,,,, +US-WI-54561,US,WI,54561,5.5,,,, +US-WI-54562,US,WI,54562,5.5,,,, +US-WI-54563,US,WI,54563,5.5,,,, +US-WI-54564,US,WI,54564,5.5,,,, +US-WI-54565,US,WI,54565,5.5,,,, +US-WI-54566,US,WI,54566,5.5,,,, +US-WI-54568,US,WI,54568,5.5,,,, +US-WI-54601,US,WI,54601,5.5,,,, +US-WI-54602,US,WI,54602,5.5,,,, +US-WI-54603,US,WI,54603,5.5,,,, +US-WI-54610,US,WI,54610,5.5,,,, +US-WI-54611,US,WI,54611,5.5,,,, +US-WI-54612,US,WI,54612,5.5,,,, +US-WI-54613,US,WI,54613,5.5,,,, +US-WI-54614,US,WI,54614,5.5,,,, +US-WI-54615,US,WI,54615,5.5,,,, +US-WI-54616,US,WI,54616,5.5,,,, +US-WI-54618,US,WI,54618,5.5,,,, +US-WI-54619,US,WI,54619,5.5,,,, +US-WI-54620,US,WI,54620,5.5,,,, +US-WI-54621,US,WI,54621,5.5,,,, +US-WI-54622,US,WI,54622,5.5,,,, +US-WI-54623,US,WI,54623,5.5,,,, +US-WI-54624,US,WI,54624,5.5,,,, +US-WI-54625,US,WI,54625,5.5,,,, +US-WI-54626,US,WI,54626,5.5,,,, +US-WI-54627,US,WI,54627,5.5,,,, +US-WI-54628,US,WI,54628,5.5,,,, +US-WI-54629,US,WI,54629,5.5,,,, +US-WI-54630,US,WI,54630,5.5,,,, +US-WI-54631,US,WI,54631,5.5,,,, +US-WI-54632,US,WI,54632,5.5,,,, +US-WI-54634,US,WI,54634,5.5,,,, +US-WI-54635,US,WI,54635,5.5,,,, +US-WI-54636,US,WI,54636,5.5,,,, +US-WI-54637,US,WI,54637,5.5,,,, +US-WI-54638,US,WI,54638,5.5,,,, +US-WI-54639,US,WI,54639,5.5,,,, +US-WI-54640,US,WI,54640,5.5,,,, +US-WI-54641,US,WI,54641,5.5,,,, +US-WI-54642,US,WI,54642,5.5,,,, +US-WI-54643,US,WI,54643,5.5,,,, +US-WI-54644,US,WI,54644,5.5,,,, +US-WI-54645,US,WI,54645,5.5,,,, +US-WI-54646,US,WI,54646,5.5,,,, +US-WI-54648,US,WI,54648,5.5,,,, +US-WI-54649,US,WI,54649,5.5,,,, +US-WI-54650,US,WI,54650,5.5,,,, +US-WI-54651,US,WI,54651,5.5,,,, +US-WI-54652,US,WI,54652,5.5,,,, +US-WI-54653,US,WI,54653,5.5,,,, +US-WI-54654,US,WI,54654,5.5,,,, +US-WI-54655,US,WI,54655,5.5,,,, +US-WI-54656,US,WI,54656,5.5,,,, +US-WI-54657,US,WI,54657,5.5,,,, +US-WI-54658,US,WI,54658,5.5,,,, +US-WI-54659,US,WI,54659,5.5,,,, +US-WI-54660,US,WI,54660,5.5,,,, +US-WI-54661,US,WI,54661,5.5,,,, +US-WI-54662,US,WI,54662,5.5,,,, +US-WI-54664,US,WI,54664,5.5,,,, +US-WI-54665,US,WI,54665,5.5,,,, +US-WI-54666,US,WI,54666,5.5,,,, +US-WI-54667,US,WI,54667,5.5,,,, +US-WI-54669,US,WI,54669,5.5,,,, +US-WI-54670,US,WI,54670,5.5,,,, +US-WI-54701,US,WI,54701,5.5,,,, +US-WI-54702,US,WI,54702,5.5,,,, +US-WI-54703,US,WI,54703,5.5,,,, +US-WI-54720,US,WI,54720,5.5,,,, +US-WI-54721,US,WI,54721,5.5,,,, +US-WI-54722,US,WI,54722,5.5,,,, +US-WI-54723,US,WI,54723,5.5,,,, +US-WI-54724,US,WI,54724,5.5,,,, +US-WI-54725,US,WI,54725,5.5,,,, +US-WI-54726,US,WI,54726,5.5,,,, +US-WI-54727,US,WI,54727,5.5,,,, +US-WI-54728,US,WI,54728,5.5,,,, +US-WI-54729,US,WI,54729,5.5,,,, +US-WI-54730,US,WI,54730,5.5,,,, +US-WI-54731,US,WI,54731,5.5,,,, +US-WI-54732,US,WI,54732,5.5,,,, +US-WI-54733,US,WI,54733,5.5,,,, +US-WI-54734,US,WI,54734,5.5,,,, +US-WI-54735,US,WI,54735,5.5,,,, +US-WI-54736,US,WI,54736,5.5,,,, +US-WI-54737,US,WI,54737,5.5,,,, +US-WI-54738,US,WI,54738,5.5,,,, +US-WI-54739,US,WI,54739,5.5,,,, +US-WI-54740,US,WI,54740,5.5,,,, +US-WI-54741,US,WI,54741,5.5,,,, +US-WI-54742,US,WI,54742,5.5,,,, +US-WI-54743,US,WI,54743,5.5,,,, +US-WI-54745,US,WI,54745,5.5,,,, +US-WI-54746,US,WI,54746,5.5,,,, +US-WI-54747,US,WI,54747,5.5,,,, +US-WI-54748,US,WI,54748,5.5,,,, +US-WI-54749,US,WI,54749,5.5,,,, +US-WI-54750,US,WI,54750,5.5,,,, +US-WI-54751,US,WI,54751,5.5,,,, +US-WI-54754,US,WI,54754,5.5,,,, +US-WI-54755,US,WI,54755,5.5,,,, +US-WI-54756,US,WI,54756,5.5,,,, +US-WI-54757,US,WI,54757,5.5,,,, +US-WI-54758,US,WI,54758,5.5,,,, +US-WI-54759,US,WI,54759,5.5,,,, +US-WI-54760,US,WI,54760,5.5,,,, +US-WI-54761,US,WI,54761,5.5,,,, +US-WI-54762,US,WI,54762,5.5,,,, +US-WI-54763,US,WI,54763,5.5,,,, +US-WI-54764,US,WI,54764,5.5,,,, +US-WI-54765,US,WI,54765,5.5,,,, +US-WI-54766,US,WI,54766,5.5,,,, +US-WI-54767,US,WI,54767,5.5,,,, +US-WI-54768,US,WI,54768,5.5,,,, +US-WI-54769,US,WI,54769,5.5,,,, +US-WI-54770,US,WI,54770,5.5,,,, +US-WI-54771,US,WI,54771,5.5,,,, +US-WI-54772,US,WI,54772,5.5,,,, +US-WI-54773,US,WI,54773,5.5,,,, +US-WI-54774,US,WI,54774,5.5,,,, +US-WI-54801,US,WI,54801,5.5,,,, +US-WI-54805,US,WI,54805,5.5,,,, +US-WI-54806,US,WI,54806,5.5,,,, +US-WI-54810,US,WI,54810,5.5,,,, +US-WI-54812,US,WI,54812,5.5,,,, +US-WI-54813,US,WI,54813,5.5,,,, +US-WI-54814,US,WI,54814,5.5,,,, +US-WI-54816,US,WI,54816,5.5,,,, +US-WI-54817,US,WI,54817,5.5,,,, +US-WI-54818,US,WI,54818,5.5,,,, +US-WI-54819,US,WI,54819,5.5,,,, +US-WI-54820,US,WI,54820,5.5,,,, +US-WI-54821,US,WI,54821,5.5,,,, +US-WI-54822,US,WI,54822,5.5,,,, +US-WI-54824,US,WI,54824,5.5,,,, +US-WI-54826,US,WI,54826,5.5,,,, +US-WI-54827,US,WI,54827,5.5,,,, +US-WI-54828,US,WI,54828,5.5,,,, +US-WI-54829,US,WI,54829,5.5,,,, +US-WI-54830,US,WI,54830,5.5,,,, +US-WI-54832,US,WI,54832,5.5,,,, +US-WI-54834,US,WI,54834,5.5,,,, +US-WI-54835,US,WI,54835,5.5,,,, +US-WI-54836,US,WI,54836,5.5,,,, +US-WI-54837,US,WI,54837,5.5,,,, +US-WI-54838,US,WI,54838,5.5,,,, +US-WI-54839,US,WI,54839,5.5,,,, +US-WI-54840,US,WI,54840,5.5,,,, +US-WI-54841,US,WI,54841,5.5,,,, +US-WI-54842,US,WI,54842,5.5,,,, +US-WI-54843,US,WI,54843,5.5,,,, +US-WI-54844,US,WI,54844,5.5,,,, +US-WI-54845,US,WI,54845,5.5,,,, +US-WI-54846,US,WI,54846,5.5,,,, +US-WI-54847,US,WI,54847,5.5,,,, +US-WI-54848,US,WI,54848,5.5,,,, +US-WI-54849,US,WI,54849,5.5,,,, +US-WI-54850,US,WI,54850,5.5,,,, +US-WI-54853,US,WI,54853,5.5,,,, +US-WI-54854,US,WI,54854,5.5,,,, +US-WI-54855,US,WI,54855,5.5,,,, +US-WI-54856,US,WI,54856,5.5,,,, +US-WI-54857,US,WI,54857,5.5,,,, +US-WI-54858,US,WI,54858,5.5,,,, +US-WI-54859,US,WI,54859,5.5,,,, +US-WI-54861,US,WI,54861,5.5,,,, +US-WI-54862,US,WI,54862,5.5,,,, +US-WI-54864,US,WI,54864,5.5,,,, +US-WI-54865,US,WI,54865,5.5,,,, +US-WI-54867,US,WI,54867,5.5,,,, +US-WI-54868,US,WI,54868,5.5,,,, +US-WI-54870,US,WI,54870,5.5,,,, +US-WI-54871,US,WI,54871,5.5,,,, +US-WI-54872,US,WI,54872,5.5,,,, +US-WI-54873,US,WI,54873,5.5,,,, +US-WI-54874,US,WI,54874,5.5,,,, +US-WI-54875,US,WI,54875,5.5,,,, +US-WI-54876,US,WI,54876,5.5,,,, +US-WI-54880,US,WI,54880,5.5,,,, +US-WI-54888,US,WI,54888,5.5,,,, +US-WI-54889,US,WI,54889,5.5,,,, +US-WI-54890,US,WI,54890,5.5,,,, +US-WI-54891,US,WI,54891,5.5,,,, +US-WI-54893,US,WI,54893,5.5,,,, +US-WI-54895,US,WI,54895,5.5,,,, +US-WI-54896,US,WI,54896,5.5,,,, +US-WI-54901,US,WI,54901,5,,,, +US-WI-54902,US,WI,54902,5,,,, +US-WI-54903,US,WI,54903,5,,,, +US-WI-54904,US,WI,54904,5,,,, +US-WI-54906,US,WI,54906,5,,,, +US-WI-54909,US,WI,54909,5.5,,,, +US-WI-54911,US,WI,54911,5,,,, +US-WI-54912,US,WI,54912,5,,,, +US-WI-54913,US,WI,54913,5,,,, +US-WI-54914,US,WI,54914,5,,,, +US-WI-54915,US,WI,54915,5,,,, +US-WI-54919,US,WI,54919,5,,,, +US-WI-54921,US,WI,54921,5.5,,,, +US-WI-54922,US,WI,54922,5,,,, +US-WI-54923,US,WI,54923,5.5,,,, +US-WI-54926,US,WI,54926,5.5,,,, +US-WI-54927,US,WI,54927,5,,,, +US-WI-54928,US,WI,54928,5.5,,,, +US-WI-54929,US,WI,54929,5.5,,,, +US-WI-54930,US,WI,54930,5.5,,,, +US-WI-54931,US,WI,54931,5,,,, +US-WI-54932,US,WI,54932,5.5,,,, +US-WI-54933,US,WI,54933,5.5,,,, +US-WI-54934,US,WI,54934,5,,,, +US-WI-54935,US,WI,54935,5.5,,,, +US-WI-54936,US,WI,54936,5.5,,,, +US-WI-54937,US,WI,54937,5.5,,,, +US-WI-54940,US,WI,54940,5.5,,,, +US-WI-54941,US,WI,54941,5.5,,,, +US-WI-54942,US,WI,54942,5,,,, +US-WI-54943,US,WI,54943,5.5,,,, +US-WI-54944,US,WI,54944,5,,,, +US-WI-54945,US,WI,54945,5.5,,,, +US-WI-54946,US,WI,54946,5.5,,,, +US-WI-54947,US,WI,54947,5,,,, +US-WI-54948,US,WI,54948,5.5,,,, +US-WI-54949,US,WI,54949,5.5,,,, +US-WI-54950,US,WI,54950,5.5,,,, +US-WI-54952,US,WI,54952,5,,,, +US-WI-54956,US,WI,54956,5,,,, +US-WI-54957,US,WI,54957,5,,,, +US-WI-54960,US,WI,54960,5.5,,,, +US-WI-54961,US,WI,54961,5.5,,,, +US-WI-54962,US,WI,54962,5.5,,,, +US-WI-54963,US,WI,54963,5,,,, +US-WI-54964,US,WI,54964,5,,,, +US-WI-54965,US,WI,54965,5.5,,,, +US-WI-54966,US,WI,54966,5.5,,,, +US-WI-54967,US,WI,54967,5.5,,,, +US-WI-54968,US,WI,54968,5.5,,,, +US-WI-54969,US,WI,54969,5.5,,,, +US-WI-54970,US,WI,54970,5.5,,,, +US-WI-54971,US,WI,54971,5.5,,,, +US-WI-54974,US,WI,54974,5.5,,,, +US-WI-54976,US,WI,54976,5.5,,,, +US-WI-54977,US,WI,54977,5.5,,,, +US-WI-54978,US,WI,54978,5.5,,,, +US-WI-54979,US,WI,54979,5.5,,,, +US-WI-54980,US,WI,54980,5,,,, +US-WI-54981,US,WI,54981,5.5,,,, +US-WI-54982,US,WI,54982,5.5,,,, +US-WI-54983,US,WI,54983,5.5,,,, +US-WI-54984,US,WI,54984,5.5,,,, +US-WI-54985,US,WI,54985,5,,,, +US-WI-54986,US,WI,54986,5,,,, +US-WI-54990,US,WI,54990,5.5,,,, +US-WV-24701,US,WV,24701,6,,,, +US-WV-24712,US,WV,24712,6,,,, +US-WV-24714,US,WV,24714,6,,,, +US-WV-24715,US,WV,24715,6,,,, +US-WV-24716,US,WV,24716,6,,,, +US-WV-24719,US,WV,24719,6,,,, +US-WV-24724,US,WV,24724,6,,,, +US-WV-24726,US,WV,24726,6,,,, +US-WV-24729,US,WV,24729,6,,,, +US-WV-24731,US,WV,24731,6,,,, +US-WV-24732,US,WV,24732,6,,,, +US-WV-24733,US,WV,24733,6,,,, +US-WV-24736,US,WV,24736,6,,,, +US-WV-24737,US,WV,24737,6,,,, +US-WV-24738,US,WV,24738,6,,,, +US-WV-24739,US,WV,24739,6,,,, +US-WV-24740,US,WV,24740,6,,,, +US-WV-24747,US,WV,24747,6,,,, +US-WV-24751,US,WV,24751,6,,,, +US-WV-24801,US,WV,24801,6,,,, +US-WV-24808,US,WV,24808,6,,,, +US-WV-24811,US,WV,24811,6,,,, +US-WV-24813,US,WV,24813,6,,,, +US-WV-24815,US,WV,24815,6,,,, +US-WV-24816,US,WV,24816,6,,,, +US-WV-24817,US,WV,24817,6,,,, +US-WV-24818,US,WV,24818,6,,,, +US-WV-24822,US,WV,24822,6,,,, +US-WV-24823,US,WV,24823,6,,,, +US-WV-24826,US,WV,24826,6,,,, +US-WV-24827,US,WV,24827,6,,,, +US-WV-24828,US,WV,24828,6,,,, +US-WV-24829,US,WV,24829,6,,,, +US-WV-24830,US,WV,24830,6,,,, +US-WV-24831,US,WV,24831,6,,,, +US-WV-24834,US,WV,24834,6,,,, +US-WV-24836,US,WV,24836,6,,,, +US-WV-24839,US,WV,24839,6,,,, +US-WV-24843,US,WV,24843,6,,,, +US-WV-24844,US,WV,24844,6,,,, +US-WV-24845,US,WV,24845,6,,,, +US-WV-24846,US,WV,24846,6,,,, +US-WV-24847,US,WV,24847,6,,,, +US-WV-24848,US,WV,24848,6,,,, +US-WV-24849,US,WV,24849,6,,,, +US-WV-24850,US,WV,24850,6,,,, +US-WV-24851,US,WV,24851,6,,,, +US-WV-24853,US,WV,24853,6,,,, +US-WV-24854,US,WV,24854,6,,,, +US-WV-24855,US,WV,24855,6,,,, +US-WV-24857,US,WV,24857,6,,,, +US-WV-24859,US,WV,24859,6,,,, +US-WV-24860,US,WV,24860,6,,,, +US-WV-24861,US,WV,24861,6,,,, +US-WV-24862,US,WV,24862,6,,,, +US-WV-24866,US,WV,24866,6,,,, +US-WV-24867,US,WV,24867,6,,,, +US-WV-24868,US,WV,24868,6,,,, +US-WV-24869,US,WV,24869,6,,,, +US-WV-24870,US,WV,24870,6,,,, +US-WV-24871,US,WV,24871,6,,,, +US-WV-24872,US,WV,24872,6,,,, +US-WV-24873,US,WV,24873,6,,,, +US-WV-24874,US,WV,24874,6,,,, +US-WV-24878,US,WV,24878,6,,,, +US-WV-24879,US,WV,24879,6,,,, +US-WV-24880,US,WV,24880,6,,,, +US-WV-24881,US,WV,24881,6,,,, +US-WV-24882,US,WV,24882,6,,,, +US-WV-24884,US,WV,24884,6,,,, +US-WV-24887,US,WV,24887,6,,,, +US-WV-24888,US,WV,24888,6,,,, +US-WV-24892,US,WV,24892,6,,,, +US-WV-24894,US,WV,24894,6,,,, +US-WV-24895,US,WV,24895,6,,,, +US-WV-24898,US,WV,24898,6,,,, +US-WV-24901,US,WV,24901,6,,,, +US-WV-24902,US,WV,24902,6,,,, +US-WV-24910,US,WV,24910,6,,,, +US-WV-24915,US,WV,24915,6,,,, +US-WV-24916,US,WV,24916,6,,,, +US-WV-24918,US,WV,24918,6,,,, +US-WV-24920,US,WV,24920,6,,,, +US-WV-24924,US,WV,24924,6,,,, +US-WV-24925,US,WV,24925,6,,,, +US-WV-24927,US,WV,24927,6,,,, +US-WV-24931,US,WV,24931,6,,,, +US-WV-24934,US,WV,24934,6,,,, +US-WV-24935,US,WV,24935,6,,,, +US-WV-24938,US,WV,24938,6,,,, +US-WV-24941,US,WV,24941,6,,,, +US-WV-24943,US,WV,24943,6,,,, +US-WV-24944,US,WV,24944,6,,,, +US-WV-24945,US,WV,24945,6,,,, +US-WV-24946,US,WV,24946,6,,,, +US-WV-24951,US,WV,24951,6,,,, +US-WV-24954,US,WV,24954,6,,,, +US-WV-24957,US,WV,24957,6,,,, +US-WV-24962,US,WV,24962,6,,,, +US-WV-24963,US,WV,24963,6,,,, +US-WV-24966,US,WV,24966,6,,,, +US-WV-24970,US,WV,24970,6,,,, +US-WV-24974,US,WV,24974,6,,,, +US-WV-24976,US,WV,24976,6,,,, +US-WV-24977,US,WV,24977,6,,,, +US-WV-24981,US,WV,24981,6,,,, +US-WV-24983,US,WV,24983,6,,,, +US-WV-24984,US,WV,24984,6,,,, +US-WV-24985,US,WV,24985,6,,,, +US-WV-24986,US,WV,24986,6,,,, +US-WV-24991,US,WV,24991,6,,,, +US-WV-24993,US,WV,24993,6,,,, +US-WV-25002,US,WV,25002,6,,,, +US-WV-25003,US,WV,25003,6,,,, +US-WV-25005,US,WV,25005,6,,,, +US-WV-25007,US,WV,25007,6,,,, +US-WV-25008,US,WV,25008,6,,,, +US-WV-25009,US,WV,25009,6,,,, +US-WV-25011,US,WV,25011,6,,,, +US-WV-25015,US,WV,25015,6,,,, +US-WV-25019,US,WV,25019,6,,,, +US-WV-25021,US,WV,25021,6,,,, +US-WV-25022,US,WV,25022,6,,,, +US-WV-25024,US,WV,25024,6,,,, +US-WV-25025,US,WV,25025,6,,,, +US-WV-25026,US,WV,25026,6,,,, +US-WV-25028,US,WV,25028,6,,,, +US-WV-25030,US,WV,25030,6,,,, +US-WV-25031,US,WV,25031,6,,,, +US-WV-25033,US,WV,25033,6,,,, +US-WV-25035,US,WV,25035,6,,,, +US-WV-25036,US,WV,25036,6,,,, +US-WV-25039,US,WV,25039,6,,,, +US-WV-25040,US,WV,25040,6,,,, +US-WV-25043,US,WV,25043,6,,,, +US-WV-25044,US,WV,25044,6,,,, +US-WV-25045,US,WV,25045,6,,,, +US-WV-25047,US,WV,25047,6,,,, +US-WV-25048,US,WV,25048,6,,,, +US-WV-25049,US,WV,25049,6,,,, +US-WV-25051,US,WV,25051,6,,,, +US-WV-25053,US,WV,25053,6,,,, +US-WV-25054,US,WV,25054,6,,,, +US-WV-25057,US,WV,25057,6,,,, +US-WV-25059,US,WV,25059,6,,,, +US-WV-25060,US,WV,25060,6,,,, +US-WV-25061,US,WV,25061,6,,,, +US-WV-25062,US,WV,25062,6,,,, +US-WV-25063,US,WV,25063,6,,,, +US-WV-25064,US,WV,25064,6,,,, +US-WV-25067,US,WV,25067,6,,,, +US-WV-25070,US,WV,25070,6,,,, +US-WV-25071,US,WV,25071,6,,,, +US-WV-25075,US,WV,25075,6,,,, +US-WV-25076,US,WV,25076,6,,,, +US-WV-25079,US,WV,25079,6,,,, +US-WV-25081,US,WV,25081,6,,,, +US-WV-25082,US,WV,25082,6,,,, +US-WV-25083,US,WV,25083,6,,,, +US-WV-25085,US,WV,25085,6,,,, +US-WV-25086,US,WV,25086,6,,,, +US-WV-25088,US,WV,25088,6,,,, +US-WV-25090,US,WV,25090,6,,,, +US-WV-25093,US,WV,25093,6,,,, +US-WV-25102,US,WV,25102,6,,,, +US-WV-25103,US,WV,25103,6,,,, +US-WV-25106,US,WV,25106,6,,,, +US-WV-25107,US,WV,25107,6,,,, +US-WV-25108,US,WV,25108,6,,,, +US-WV-25109,US,WV,25109,6,,,, +US-WV-25110,US,WV,25110,6,,,, +US-WV-25111,US,WV,25111,6,,,, +US-WV-25112,US,WV,25112,6,,,, +US-WV-25113,US,WV,25113,6,,,, +US-WV-25114,US,WV,25114,6,,,, +US-WV-25115,US,WV,25115,6,,,, +US-WV-25118,US,WV,25118,6,,,, +US-WV-25119,US,WV,25119,6,,,, +US-WV-25121,US,WV,25121,6,,,, +US-WV-25123,US,WV,25123,6,,,, +US-WV-25124,US,WV,25124,6,,,, +US-WV-25125,US,WV,25125,6,,,, +US-WV-25126,US,WV,25126,6,,,, +US-WV-25130,US,WV,25130,6,,,, +US-WV-25132,US,WV,25132,6,,,, +US-WV-25133,US,WV,25133,6,,,, +US-WV-25134,US,WV,25134,6,,,, +US-WV-25136,US,WV,25136,6,,,, +US-WV-25139,US,WV,25139,6,,,, +US-WV-25140,US,WV,25140,6,,,, +US-WV-25141,US,WV,25141,6,,,, +US-WV-25142,US,WV,25142,6,,,, +US-WV-25143,US,WV,25143,6,,,, +US-WV-25148,US,WV,25148,6,,,, +US-WV-25149,US,WV,25149,6,,,, +US-WV-25152,US,WV,25152,6,,,, +US-WV-25154,US,WV,25154,6,,,, +US-WV-25156,US,WV,25156,6,,,, +US-WV-25159,US,WV,25159,6,,,, +US-WV-25160,US,WV,25160,6,,,, +US-WV-25161,US,WV,25161,6,,,, +US-WV-25162,US,WV,25162,6,,,, +US-WV-25164,US,WV,25164,6,,,, +US-WV-25165,US,WV,25165,6,,,, +US-WV-25168,US,WV,25168,6,,,, +US-WV-25169,US,WV,25169,6,,,, +US-WV-25173,US,WV,25173,6,,,, +US-WV-25174,US,WV,25174,6,,,, +US-WV-25177,US,WV,25177,6,,,, +US-WV-25180,US,WV,25180,6,,,, +US-WV-25181,US,WV,25181,6,,,, +US-WV-25183,US,WV,25183,6,,,, +US-WV-25185,US,WV,25185,6,,,, +US-WV-25186,US,WV,25186,6,,,, +US-WV-25187,US,WV,25187,6,,,, +US-WV-25193,US,WV,25193,6,,,, +US-WV-25201,US,WV,25201,6,,,, +US-WV-25202,US,WV,25202,6,,,, +US-WV-25203,US,WV,25203,6,,,, +US-WV-25204,US,WV,25204,6,,,, +US-WV-25205,US,WV,25205,6,,,, +US-WV-25206,US,WV,25206,6,,,, +US-WV-25208,US,WV,25208,6,,,, +US-WV-25209,US,WV,25209,6,,,, +US-WV-25211,US,WV,25211,6,,,, +US-WV-25213,US,WV,25213,6,,,, +US-WV-25214,US,WV,25214,6,,,, +US-WV-25231,US,WV,25231,6,,,, +US-WV-25234,US,WV,25234,6,,,, +US-WV-25235,US,WV,25235,6,,,, +US-WV-25239,US,WV,25239,6,,,, +US-WV-25241,US,WV,25241,6,,,, +US-WV-25243,US,WV,25243,6,,,, +US-WV-25244,US,WV,25244,6,,,, +US-WV-25245,US,WV,25245,6,,,, +US-WV-25247,US,WV,25247,6,,,, +US-WV-25248,US,WV,25248,6,,,, +US-WV-25251,US,WV,25251,6,,,, +US-WV-25252,US,WV,25252,6,,,, +US-WV-25253,US,WV,25253,6,,,, +US-WV-25259,US,WV,25259,6,,,, +US-WV-25260,US,WV,25260,6,,,, +US-WV-25261,US,WV,25261,6,,,, +US-WV-25262,US,WV,25262,6,,,, +US-WV-25264,US,WV,25264,6,,,, +US-WV-25265,US,WV,25265,6,,,, +US-WV-25266,US,WV,25266,6,,,, +US-WV-25267,US,WV,25267,6,,,, +US-WV-25268,US,WV,25268,6,,,, +US-WV-25270,US,WV,25270,6,,,, +US-WV-25271,US,WV,25271,6,,,, +US-WV-25275,US,WV,25275,6,,,, +US-WV-25276,US,WV,25276,6,,,, +US-WV-25285,US,WV,25285,6,,,, +US-WV-25286,US,WV,25286,6,,,, +US-WV-25287,US,WV,25287,6,,,, +US-WV-25301,US,WV,25301,6.5,,,, +US-WV-25302,US,WV,25302,6.5,,,, +US-WV-25303,US,WV,25303,6,,,, +US-WV-25304,US,WV,25304,6.5,,,, +US-WV-25305,US,WV,25305,6.5,,,, +US-WV-25306,US,WV,25306,6,,,, +US-WV-25309,US,WV,25309,6,,,, +US-WV-25311,US,WV,25311,6.5,,,, +US-WV-25312,US,WV,25312,6,,,, +US-WV-25313,US,WV,25313,6,,,, +US-WV-25314,US,WV,25314,6.5,,,, +US-WV-25315,US,WV,25315,6,,,, +US-WV-25317,US,WV,25317,6.5,,,, +US-WV-25320,US,WV,25320,6,,,, +US-WV-25321,US,WV,25321,6.5,,,, +US-WV-25322,US,WV,25322,6.5,,,, +US-WV-25323,US,WV,25323,6.5,,,, +US-WV-25324,US,WV,25324,6.5,,,, +US-WV-25325,US,WV,25325,6.5,,,, +US-WV-25326,US,WV,25326,6.5,,,, +US-WV-25327,US,WV,25327,6.5,,,, +US-WV-25328,US,WV,25328,6.5,,,, +US-WV-25329,US,WV,25329,6.5,,,, +US-WV-25330,US,WV,25330,6.5,,,, +US-WV-25331,US,WV,25331,6.5,,,, +US-WV-25332,US,WV,25332,6.5,,,, +US-WV-25333,US,WV,25333,6.5,,,, +US-WV-25334,US,WV,25334,6.5,,,, +US-WV-25335,US,WV,25335,6.5,,,, +US-WV-25336,US,WV,25336,6.5,,,, +US-WV-25337,US,WV,25337,6.5,,,, +US-WV-25338,US,WV,25338,6.5,,,, +US-WV-25339,US,WV,25339,6.5,,,, +US-WV-25350,US,WV,25350,6.5,,,, +US-WV-25356,US,WV,25356,6,,,, +US-WV-25357,US,WV,25357,6.5,,,, +US-WV-25358,US,WV,25358,6.5,,,, +US-WV-25360,US,WV,25360,6,,,, +US-WV-25361,US,WV,25361,6.5,,,, +US-WV-25362,US,WV,25362,6.5,,,, +US-WV-25364,US,WV,25364,6.5,,,, +US-WV-25365,US,WV,25365,6,,,, +US-WV-25375,US,WV,25375,6.5,,,, +US-WV-25387,US,WV,25387,6.5,,,, +US-WV-25389,US,WV,25389,6.5,,,, +US-WV-25392,US,WV,25392,6.5,,,, +US-WV-25396,US,WV,25396,6.5,,,, +US-WV-25401,US,WV,25401,6,,,, +US-WV-25402,US,WV,25402,6,,,, +US-WV-25403,US,WV,25403,6,,,, +US-WV-25404,US,WV,25404,6,,,, +US-WV-25405,US,WV,25405,6,,,, +US-WV-25410,US,WV,25410,6,,,, +US-WV-25411,US,WV,25411,6,,,, +US-WV-25413,US,WV,25413,6,,,, +US-WV-25414,US,WV,25414,6,,,, +US-WV-25419,US,WV,25419,6,,,, +US-WV-25420,US,WV,25420,6,,,, +US-WV-25421,US,WV,25421,6,,,, +US-WV-25422,US,WV,25422,6,,,, +US-WV-25423,US,WV,25423,6,,,, +US-WV-25425,US,WV,25425,6,,,, +US-WV-25427,US,WV,25427,6,,,, +US-WV-25428,US,WV,25428,6,,,, +US-WV-25430,US,WV,25430,6,,,, +US-WV-25431,US,WV,25431,6,,,, +US-WV-25432,US,WV,25432,6,,,, +US-WV-25434,US,WV,25434,6,,,, +US-WV-25437,US,WV,25437,6,,,, +US-WV-25438,US,WV,25438,6,,,, +US-WV-25440,US,WV,25440,6,,,, +US-WV-25441,US,WV,25441,6,,,, +US-WV-25442,US,WV,25442,6,,,, +US-WV-25443,US,WV,25443,6,,,, +US-WV-25444,US,WV,25444,6,,,, +US-WV-25446,US,WV,25446,6,,,, +US-WV-25501,US,WV,25501,6,,,, +US-WV-25502,US,WV,25502,6,,,, +US-WV-25503,US,WV,25503,6,,,, +US-WV-25504,US,WV,25504,6,,,, +US-WV-25505,US,WV,25505,6,,,, +US-WV-25506,US,WV,25506,6,,,, +US-WV-25507,US,WV,25507,6,,,, +US-WV-25508,US,WV,25508,6,,,, +US-WV-25510,US,WV,25510,6,,,, +US-WV-25511,US,WV,25511,6,,,, +US-WV-25512,US,WV,25512,6,,,, +US-WV-25514,US,WV,25514,6,,,, +US-WV-25515,US,WV,25515,6,,,, +US-WV-25517,US,WV,25517,6,,,, +US-WV-25520,US,WV,25520,6,,,, +US-WV-25521,US,WV,25521,6,,,, +US-WV-25523,US,WV,25523,6,,,, +US-WV-25524,US,WV,25524,6,,,, +US-WV-25526,US,WV,25526,6,,,, +US-WV-25529,US,WV,25529,6,,,, +US-WV-25530,US,WV,25530,6,,,, +US-WV-25534,US,WV,25534,6,,,, +US-WV-25535,US,WV,25535,6,,,, +US-WV-25537,US,WV,25537,6,,,, +US-WV-25540,US,WV,25540,6,,,, +US-WV-25541,US,WV,25541,6,,,, +US-WV-25544,US,WV,25544,6,,,, +US-WV-25545,US,WV,25545,6,,,, +US-WV-25547,US,WV,25547,6,,,, +US-WV-25550,US,WV,25550,6,,,, +US-WV-25555,US,WV,25555,6,,,, +US-WV-25557,US,WV,25557,6,,,, +US-WV-25559,US,WV,25559,6,,,, +US-WV-25560,US,WV,25560,6,,,, +US-WV-25562,US,WV,25562,6,,,, +US-WV-25564,US,WV,25564,6,,,, +US-WV-25565,US,WV,25565,6,,,, +US-WV-25567,US,WV,25567,6,,,, +US-WV-25569,US,WV,25569,6,,,, +US-WV-25570,US,WV,25570,6,,,, +US-WV-25571,US,WV,25571,6,,,, +US-WV-25572,US,WV,25572,6,,,, +US-WV-25573,US,WV,25573,6,,,, +US-WV-25601,US,WV,25601,6,,,, +US-WV-25606,US,WV,25606,6,,,, +US-WV-25607,US,WV,25607,6,,,, +US-WV-25608,US,WV,25608,6,,,, +US-WV-25611,US,WV,25611,6,,,, +US-WV-25612,US,WV,25612,6,,,, +US-WV-25614,US,WV,25614,6,,,, +US-WV-25617,US,WV,25617,6,,,, +US-WV-25621,US,WV,25621,6,,,, +US-WV-25624,US,WV,25624,6,,,, +US-WV-25625,US,WV,25625,6,,,, +US-WV-25628,US,WV,25628,6,,,, +US-WV-25630,US,WV,25630,6,,,, +US-WV-25632,US,WV,25632,6,,,, +US-WV-25634,US,WV,25634,6,,,, +US-WV-25635,US,WV,25635,6,,,, +US-WV-25637,US,WV,25637,6,,,, +US-WV-25638,US,WV,25638,6,,,, +US-WV-25639,US,WV,25639,6,,,, +US-WV-25644,US,WV,25644,6,,,, +US-WV-25646,US,WV,25646,6,,,, +US-WV-25647,US,WV,25647,6,,,, +US-WV-25649,US,WV,25649,6,,,, +US-WV-25650,US,WV,25650,6,,,, +US-WV-25651,US,WV,25651,6,,,, +US-WV-25652,US,WV,25652,6,,,, +US-WV-25653,US,WV,25653,6,,,, +US-WV-25654,US,WV,25654,6,,,, +US-WV-25661,US,WV,25661,6,,,, +US-WV-25665,US,WV,25665,6,,,, +US-WV-25666,US,WV,25666,6,,,, +US-WV-25667,US,WV,25667,6,,,, +US-WV-25669,US,WV,25669,6,,,, +US-WV-25670,US,WV,25670,6,,,, +US-WV-25671,US,WV,25671,6,,,, +US-WV-25672,US,WV,25672,6,,,, +US-WV-25674,US,WV,25674,6,,,, +US-WV-25676,US,WV,25676,6,,,, +US-WV-25678,US,WV,25678,6,,,, +US-WV-25685,US,WV,25685,6,,,, +US-WV-25686,US,WV,25686,6,,,, +US-WV-25688,US,WV,25688,6,,,, +US-WV-25690,US,WV,25690,6,,,, +US-WV-25691,US,WV,25691,6,,,, +US-WV-25692,US,WV,25692,6,,,, +US-WV-25696,US,WV,25696,6,,,, +US-WV-25699,US,WV,25699,6,,,, +US-WV-25701,US,WV,25701,7,,,, +US-WV-25702,US,WV,25702,7,,,, +US-WV-25703,US,WV,25703,7,,,, +US-WV-25704,US,WV,25704,7,,,, +US-WV-25705,US,WV,25705,6,,,, +US-WV-25706,US,WV,25706,7,,,, +US-WV-25707,US,WV,25707,7,,,, +US-WV-25708,US,WV,25708,7,,,, +US-WV-25709,US,WV,25709,7,,,, +US-WV-25710,US,WV,25710,7,,,, +US-WV-25711,US,WV,25711,7,,,, +US-WV-25712,US,WV,25712,7,,,, +US-WV-25713,US,WV,25713,7,,,, +US-WV-25714,US,WV,25714,7,,,, +US-WV-25715,US,WV,25715,7,,,, +US-WV-25716,US,WV,25716,7,,,, +US-WV-25717,US,WV,25717,7,,,, +US-WV-25718,US,WV,25718,7,,,, +US-WV-25719,US,WV,25719,7,,,, +US-WV-25720,US,WV,25720,7,,,, +US-WV-25721,US,WV,25721,7,,,, +US-WV-25722,US,WV,25722,7,,,, +US-WV-25723,US,WV,25723,7,,,, +US-WV-25724,US,WV,25724,7,,,, +US-WV-25725,US,WV,25725,7,,,, +US-WV-25726,US,WV,25726,7,,,, +US-WV-25727,US,WV,25727,7,,,, +US-WV-25728,US,WV,25728,7,,,, +US-WV-25729,US,WV,25729,7,,,, +US-WV-25755,US,WV,25755,7,,,, +US-WV-25770,US,WV,25770,7,,,, +US-WV-25771,US,WV,25771,7,,,, +US-WV-25772,US,WV,25772,7,,,, +US-WV-25773,US,WV,25773,7,,,, +US-WV-25774,US,WV,25774,7,,,, +US-WV-25775,US,WV,25775,7,,,, +US-WV-25776,US,WV,25776,7,,,, +US-WV-25777,US,WV,25777,7,,,, +US-WV-25778,US,WV,25778,7,,,, +US-WV-25779,US,WV,25779,7,,,, +US-WV-25801,US,WV,25801,6,,,, +US-WV-25802,US,WV,25802,6,,,, +US-WV-25810,US,WV,25810,6,,,, +US-WV-25811,US,WV,25811,6,,,, +US-WV-25812,US,WV,25812,6,,,, +US-WV-25813,US,WV,25813,6,,,, +US-WV-25817,US,WV,25817,6,,,, +US-WV-25818,US,WV,25818,6,,,, +US-WV-25820,US,WV,25820,6,,,, +US-WV-25823,US,WV,25823,6,,,, +US-WV-25825,US,WV,25825,6,,,, +US-WV-25826,US,WV,25826,6,,,, +US-WV-25827,US,WV,25827,6,,,, +US-WV-25831,US,WV,25831,6,,,, +US-WV-25832,US,WV,25832,6,,,, +US-WV-25833,US,WV,25833,6,,,, +US-WV-25836,US,WV,25836,6,,,, +US-WV-25837,US,WV,25837,6,,,, +US-WV-25839,US,WV,25839,6,,,, +US-WV-25840,US,WV,25840,6,,,, +US-WV-25841,US,WV,25841,6,,,, +US-WV-25843,US,WV,25843,6,,,, +US-WV-25844,US,WV,25844,6,,,, +US-WV-25845,US,WV,25845,6,,,, +US-WV-25846,US,WV,25846,6,,,, +US-WV-25848,US,WV,25848,6,,,, +US-WV-25849,US,WV,25849,6,,,, +US-WV-25851,US,WV,25851,6,,,, +US-WV-25853,US,WV,25853,6,,,, +US-WV-25854,US,WV,25854,6,,,, +US-WV-25855,US,WV,25855,6,,,, +US-WV-25857,US,WV,25857,6,,,, +US-WV-25860,US,WV,25860,6,,,, +US-WV-25862,US,WV,25862,6,,,, +US-WV-25864,US,WV,25864,6,,,, +US-WV-25865,US,WV,25865,6,,,, +US-WV-25866,US,WV,25866,6,,,, +US-WV-25868,US,WV,25868,6,,,, +US-WV-25870,US,WV,25870,6,,,, +US-WV-25871,US,WV,25871,6,,,, +US-WV-25873,US,WV,25873,6,,,, +US-WV-25875,US,WV,25875,6,,,, +US-WV-25876,US,WV,25876,6,,,, +US-WV-25878,US,WV,25878,6,,,, +US-WV-25879,US,WV,25879,6,,,, +US-WV-25880,US,WV,25880,6,,,, +US-WV-25882,US,WV,25882,6,,,, +US-WV-25888,US,WV,25888,6,,,, +US-WV-25901,US,WV,25901,6,,,, +US-WV-25902,US,WV,25902,6,,,, +US-WV-25904,US,WV,25904,6,,,, +US-WV-25906,US,WV,25906,6,,,, +US-WV-25907,US,WV,25907,6,,,, +US-WV-25908,US,WV,25908,6,,,, +US-WV-25909,US,WV,25909,6,,,, +US-WV-25911,US,WV,25911,6,,,, +US-WV-25913,US,WV,25913,6,,,, +US-WV-25915,US,WV,25915,6,,,, +US-WV-25916,US,WV,25916,6,,,, +US-WV-25917,US,WV,25917,6,,,, +US-WV-25918,US,WV,25918,6,,,, +US-WV-25919,US,WV,25919,6,,,, +US-WV-25920,US,WV,25920,6,,,, +US-WV-25921,US,WV,25921,6,,,, +US-WV-25922,US,WV,25922,6,,,, +US-WV-25927,US,WV,25927,6,,,, +US-WV-25928,US,WV,25928,6,,,, +US-WV-25932,US,WV,25932,6,,,, +US-WV-25936,US,WV,25936,6,,,, +US-WV-25938,US,WV,25938,6,,,, +US-WV-25942,US,WV,25942,6,,,, +US-WV-25943,US,WV,25943,6,,,, +US-WV-25951,US,WV,25951,6,,,, +US-WV-25958,US,WV,25958,6,,,, +US-WV-25962,US,WV,25962,6,,,, +US-WV-25966,US,WV,25966,6,,,, +US-WV-25969,US,WV,25969,6,,,, +US-WV-25971,US,WV,25971,6,,,, +US-WV-25972,US,WV,25972,6,,,, +US-WV-25976,US,WV,25976,6,,,, +US-WV-25977,US,WV,25977,6,,,, +US-WV-25978,US,WV,25978,6,,,, +US-WV-25979,US,WV,25979,6,,,, +US-WV-25981,US,WV,25981,6,,,, +US-WV-25984,US,WV,25984,7,,,, +US-WV-25985,US,WV,25985,6,,,, +US-WV-25986,US,WV,25986,6,,,, +US-WV-25989,US,WV,25989,6,,,, +US-WV-26003,US,WV,26003,6.5,,,, +US-WV-26030,US,WV,26030,6,,,, +US-WV-26031,US,WV,26031,6,,,, +US-WV-26032,US,WV,26032,6,,,, +US-WV-26033,US,WV,26033,6,,,, +US-WV-26034,US,WV,26034,6,,,, +US-WV-26035,US,WV,26035,6,,,, +US-WV-26036,US,WV,26036,6,,,, +US-WV-26037,US,WV,26037,6,,,, +US-WV-26038,US,WV,26038,6,,,, +US-WV-26039,US,WV,26039,6,,,, +US-WV-26040,US,WV,26040,6,,,, +US-WV-26041,US,WV,26041,6,,,, +US-WV-26047,US,WV,26047,6,,,, +US-WV-26050,US,WV,26050,6,,,, +US-WV-26055,US,WV,26055,6,,,, +US-WV-26056,US,WV,26056,6,,,, +US-WV-26058,US,WV,26058,6,,,, +US-WV-26059,US,WV,26059,6,,,, +US-WV-26060,US,WV,26060,6,,,, +US-WV-26062,US,WV,26062,6,,,, +US-WV-26070,US,WV,26070,6,,,, +US-WV-26074,US,WV,26074,6,,,, +US-WV-26075,US,WV,26075,6,,,, +US-WV-26101,US,WV,26101,6,,,, +US-WV-26102,US,WV,26102,6,,,, +US-WV-26103,US,WV,26103,6,,,, +US-WV-26104,US,WV,26104,6,,,, +US-WV-26105,US,WV,26105,6,,,, +US-WV-26106,US,WV,26106,6,,,, +US-WV-26120,US,WV,26120,6,,,, +US-WV-26121,US,WV,26121,6,,,, +US-WV-26133,US,WV,26133,6,,,, +US-WV-26134,US,WV,26134,6,,,, +US-WV-26136,US,WV,26136,6,,,, +US-WV-26137,US,WV,26137,6,,,, +US-WV-26138,US,WV,26138,6,,,, +US-WV-26141,US,WV,26141,6,,,, +US-WV-26142,US,WV,26142,6,,,, +US-WV-26143,US,WV,26143,6,,,, +US-WV-26146,US,WV,26146,6,,,, +US-WV-26147,US,WV,26147,6,,,, +US-WV-26148,US,WV,26148,6,,,, +US-WV-26149,US,WV,26149,6,,,, +US-WV-26150,US,WV,26150,6,,,, +US-WV-26151,US,WV,26151,6,,,, +US-WV-26152,US,WV,26152,6,,,, +US-WV-26155,US,WV,26155,6,,,, +US-WV-26159,US,WV,26159,6,,,, +US-WV-26160,US,WV,26160,6,,,, +US-WV-26161,US,WV,26161,6,,,, +US-WV-26162,US,WV,26162,6,,,, +US-WV-26164,US,WV,26164,6,,,, +US-WV-26167,US,WV,26167,6,,,, +US-WV-26169,US,WV,26169,6,,,, +US-WV-26170,US,WV,26170,6,,,, +US-WV-26175,US,WV,26175,6,,,, +US-WV-26178,US,WV,26178,6,,,, +US-WV-26180,US,WV,26180,6,,,, +US-WV-26181,US,WV,26181,6,,,, +US-WV-26184,US,WV,26184,6,,,, +US-WV-26187,US,WV,26187,7,,,, +US-WV-26201,US,WV,26201,6,,,, +US-WV-26202,US,WV,26202,6,,,, +US-WV-26203,US,WV,26203,6,,,, +US-WV-26205,US,WV,26205,6,,,, +US-WV-26206,US,WV,26206,6,,,, +US-WV-26208,US,WV,26208,6,,,, +US-WV-26209,US,WV,26209,6,,,, +US-WV-26210,US,WV,26210,6,,,, +US-WV-26215,US,WV,26215,6,,,, +US-WV-26217,US,WV,26217,6,,,, +US-WV-26218,US,WV,26218,6,,,, +US-WV-26219,US,WV,26219,6,,,, +US-WV-26222,US,WV,26222,6,,,, +US-WV-26224,US,WV,26224,6,,,, +US-WV-26228,US,WV,26228,6,,,, +US-WV-26229,US,WV,26229,6,,,, +US-WV-26230,US,WV,26230,6,,,, +US-WV-26234,US,WV,26234,6,,,, +US-WV-26236,US,WV,26236,6,,,, +US-WV-26237,US,WV,26237,6,,,, +US-WV-26238,US,WV,26238,6,,,, +US-WV-26241,US,WV,26241,6,,,, +US-WV-26250,US,WV,26250,6,,,, +US-WV-26253,US,WV,26253,6,,,, +US-WV-26254,US,WV,26254,6,,,, +US-WV-26257,US,WV,26257,6,,,, +US-WV-26259,US,WV,26259,6,,,, +US-WV-26260,US,WV,26260,6,,,, +US-WV-26261,US,WV,26261,6,,,, +US-WV-26263,US,WV,26263,6,,,, +US-WV-26264,US,WV,26264,6,,,, +US-WV-26266,US,WV,26266,6,,,, +US-WV-26267,US,WV,26267,6,,,, +US-WV-26268,US,WV,26268,6,,,, +US-WV-26269,US,WV,26269,6,,,, +US-WV-26270,US,WV,26270,6,,,, +US-WV-26271,US,WV,26271,6,,,, +US-WV-26273,US,WV,26273,6,,,, +US-WV-26275,US,WV,26275,6,,,, +US-WV-26276,US,WV,26276,6,,,, +US-WV-26278,US,WV,26278,6,,,, +US-WV-26280,US,WV,26280,6,,,, +US-WV-26282,US,WV,26282,6,,,, +US-WV-26283,US,WV,26283,6,,,, +US-WV-26285,US,WV,26285,6,,,, +US-WV-26287,US,WV,26287,6,,,, +US-WV-26288,US,WV,26288,6,,,, +US-WV-26289,US,WV,26289,6,,,, +US-WV-26291,US,WV,26291,6,,,, +US-WV-26292,US,WV,26292,6,,,, +US-WV-26293,US,WV,26293,6,,,, +US-WV-26294,US,WV,26294,6,,,, +US-WV-26296,US,WV,26296,6,,,, +US-WV-26298,US,WV,26298,6,,,, +US-WV-26301,US,WV,26301,6,,,, +US-WV-26302,US,WV,26302,6,,,, +US-WV-26306,US,WV,26306,6,,,, +US-WV-26320,US,WV,26320,6,,,, +US-WV-26321,US,WV,26321,6,,,, +US-WV-26323,US,WV,26323,6,,,, +US-WV-26325,US,WV,26325,6,,,, +US-WV-26327,US,WV,26327,6,,,, +US-WV-26330,US,WV,26330,6,,,, +US-WV-26335,US,WV,26335,6,,,, +US-WV-26337,US,WV,26337,6,,,, +US-WV-26338,US,WV,26338,6,,,, +US-WV-26339,US,WV,26339,6,,,, +US-WV-26342,US,WV,26342,6,,,, +US-WV-26343,US,WV,26343,6,,,, +US-WV-26346,US,WV,26346,6,,,, +US-WV-26347,US,WV,26347,6,,,, +US-WV-26348,US,WV,26348,6,,,, +US-WV-26349,US,WV,26349,6,,,, +US-WV-26351,US,WV,26351,6,,,, +US-WV-26354,US,WV,26354,6,,,, +US-WV-26361,US,WV,26361,6,,,, +US-WV-26362,US,WV,26362,7,,,, +US-WV-26366,US,WV,26366,6,,,, +US-WV-26369,US,WV,26369,6,,,, +US-WV-26372,US,WV,26372,6,,,, +US-WV-26374,US,WV,26374,6,,,, +US-WV-26376,US,WV,26376,6,,,, +US-WV-26377,US,WV,26377,6,,,, +US-WV-26378,US,WV,26378,6,,,, +US-WV-26384,US,WV,26384,6,,,, +US-WV-26385,US,WV,26385,6,,,, +US-WV-26386,US,WV,26386,6,,,, +US-WV-26404,US,WV,26404,6,,,, +US-WV-26405,US,WV,26405,6,,,, +US-WV-26408,US,WV,26408,6,,,, +US-WV-26410,US,WV,26410,6,,,, +US-WV-26411,US,WV,26411,6,,,, +US-WV-26412,US,WV,26412,6,,,, +US-WV-26415,US,WV,26415,6,,,, +US-WV-26416,US,WV,26416,6,,,, +US-WV-26419,US,WV,26419,6,,,, +US-WV-26421,US,WV,26421,6,,,, +US-WV-26422,US,WV,26422,6,,,, +US-WV-26424,US,WV,26424,6,,,, +US-WV-26425,US,WV,26425,6,,,, +US-WV-26426,US,WV,26426,6,,,, +US-WV-26430,US,WV,26430,6,,,, +US-WV-26431,US,WV,26431,6,,,, +US-WV-26434,US,WV,26434,6,,,, +US-WV-26435,US,WV,26435,6,,,, +US-WV-26436,US,WV,26436,6,,,, +US-WV-26437,US,WV,26437,6,,,, +US-WV-26438,US,WV,26438,6,,,, +US-WV-26440,US,WV,26440,6,,,, +US-WV-26443,US,WV,26443,6,,,, +US-WV-26444,US,WV,26444,6,,,, +US-WV-26447,US,WV,26447,6,,,, +US-WV-26448,US,WV,26448,6,,,, +US-WV-26451,US,WV,26451,6,,,, +US-WV-26452,US,WV,26452,6,,,, +US-WV-26456,US,WV,26456,6,,,, +US-WV-26463,US,WV,26463,6,,,, +US-WV-26501,US,WV,26501,6,,,, +US-WV-26502,US,WV,26502,6,,,, +US-WV-26504,US,WV,26504,6,,,, +US-WV-26505,US,WV,26505,6,,,, +US-WV-26506,US,WV,26506,6,,,, +US-WV-26507,US,WV,26507,6,,,, +US-WV-26508,US,WV,26508,6,,,, +US-WV-26519,US,WV,26519,6,,,, +US-WV-26520,US,WV,26520,6,,,, +US-WV-26521,US,WV,26521,6,,,, +US-WV-26524,US,WV,26524,6,,,, +US-WV-26525,US,WV,26525,6,,,, +US-WV-26527,US,WV,26527,6,,,, +US-WV-26531,US,WV,26531,6,,,, +US-WV-26534,US,WV,26534,6,,,, +US-WV-26537,US,WV,26537,6,,,, +US-WV-26541,US,WV,26541,6,,,, +US-WV-26542,US,WV,26542,6,,,, +US-WV-26543,US,WV,26543,6,,,, +US-WV-26544,US,WV,26544,6,,,, +US-WV-26546,US,WV,26546,6,,,, +US-WV-26547,US,WV,26547,6,,,, +US-WV-26554,US,WV,26554,6,,,, +US-WV-26555,US,WV,26555,6,,,, +US-WV-26559,US,WV,26559,6,,,, +US-WV-26560,US,WV,26560,6,,,, +US-WV-26561,US,WV,26561,6,,,, +US-WV-26562,US,WV,26562,6,,,, +US-WV-26563,US,WV,26563,6,,,, +US-WV-26566,US,WV,26566,6,,,, +US-WV-26568,US,WV,26568,6,,,, +US-WV-26570,US,WV,26570,6,,,, +US-WV-26571,US,WV,26571,6,,,, +US-WV-26572,US,WV,26572,6,,,, +US-WV-26574,US,WV,26574,6,,,, +US-WV-26575,US,WV,26575,6,,,, +US-WV-26576,US,WV,26576,6,,,, +US-WV-26578,US,WV,26578,6,,,, +US-WV-26581,US,WV,26581,6,,,, +US-WV-26582,US,WV,26582,6,,,, +US-WV-26585,US,WV,26585,6,,,, +US-WV-26586,US,WV,26586,6,,,, +US-WV-26587,US,WV,26587,6,,,, +US-WV-26588,US,WV,26588,6,,,, +US-WV-26590,US,WV,26590,6,,,, +US-WV-26591,US,WV,26591,6,,,, +US-WV-26601,US,WV,26601,6,,,, +US-WV-26610,US,WV,26610,6,,,, +US-WV-26611,US,WV,26611,6,,,, +US-WV-26615,US,WV,26615,6,,,, +US-WV-26617,US,WV,26617,6,,,, +US-WV-26619,US,WV,26619,6,,,, +US-WV-26621,US,WV,26621,6,,,, +US-WV-26623,US,WV,26623,6,,,, +US-WV-26624,US,WV,26624,6,,,, +US-WV-26627,US,WV,26627,6,,,, +US-WV-26629,US,WV,26629,6,,,, +US-WV-26631,US,WV,26631,6,,,, +US-WV-26636,US,WV,26636,6,,,, +US-WV-26638,US,WV,26638,6,,,, +US-WV-26651,US,WV,26651,6,,,, +US-WV-26656,US,WV,26656,6,,,, +US-WV-26660,US,WV,26660,6,,,, +US-WV-26662,US,WV,26662,6,,,, +US-WV-26667,US,WV,26667,6,,,, +US-WV-26671,US,WV,26671,6,,,, +US-WV-26675,US,WV,26675,6,,,, +US-WV-26676,US,WV,26676,6,,,, +US-WV-26678,US,WV,26678,6,,,, +US-WV-26679,US,WV,26679,6,,,, +US-WV-26680,US,WV,26680,6,,,, +US-WV-26681,US,WV,26681,6,,,, +US-WV-26684,US,WV,26684,6,,,, +US-WV-26690,US,WV,26690,6,,,, +US-WV-26691,US,WV,26691,6,,,, +US-WV-26704,US,WV,26704,6,,,, +US-WV-26705,US,WV,26705,6,,,, +US-WV-26707,US,WV,26707,6,,,, +US-WV-26710,US,WV,26710,6,,,, +US-WV-26711,US,WV,26711,6,,,, +US-WV-26714,US,WV,26714,6,,,, +US-WV-26716,US,WV,26716,6,,,, +US-WV-26717,US,WV,26717,6,,,, +US-WV-26719,US,WV,26719,6,,,, +US-WV-26720,US,WV,26720,6,,,, +US-WV-26722,US,WV,26722,6,,,, +US-WV-26726,US,WV,26726,6,,,, +US-WV-26731,US,WV,26731,6,,,, +US-WV-26739,US,WV,26739,6,,,, +US-WV-26743,US,WV,26743,6,,,, +US-WV-26750,US,WV,26750,6,,,, +US-WV-26753,US,WV,26753,6,,,, +US-WV-26755,US,WV,26755,6,,,, +US-WV-26757,US,WV,26757,6,,,, +US-WV-26761,US,WV,26761,6,,,, +US-WV-26763,US,WV,26763,6,,,, +US-WV-26764,US,WV,26764,6,,,, +US-WV-26767,US,WV,26767,6,,,, +US-WV-26801,US,WV,26801,6,,,, +US-WV-26802,US,WV,26802,6,,,, +US-WV-26804,US,WV,26804,6,,,, +US-WV-26807,US,WV,26807,6,,,, +US-WV-26808,US,WV,26808,6,,,, +US-WV-26810,US,WV,26810,6,,,, +US-WV-26812,US,WV,26812,6,,,, +US-WV-26814,US,WV,26814,6,,,, +US-WV-26815,US,WV,26815,6,,,, +US-WV-26817,US,WV,26817,6,,,, +US-WV-26818,US,WV,26818,6,,,, +US-WV-26823,US,WV,26823,6,,,, +US-WV-26833,US,WV,26833,6,,,, +US-WV-26836,US,WV,26836,6,,,, +US-WV-26838,US,WV,26838,6,,,, +US-WV-26845,US,WV,26845,6,,,, +US-WV-26847,US,WV,26847,6,,,, +US-WV-26851,US,WV,26851,6,,,, +US-WV-26852,US,WV,26852,6,,,, +US-WV-26855,US,WV,26855,6,,,, +US-WV-26865,US,WV,26865,6,,,, +US-WV-26866,US,WV,26866,6,,,, +US-WV-26884,US,WV,26884,6,,,, +US-WV-26886,US,WV,26886,6,,,, +US-WY-82001,US,WY,82001,6,,,, +US-WY-82002,US,WY,82002,6,,,, +US-WY-82003,US,WY,82003,6,,,, +US-WY-82005,US,WY,82005,6,,,, +US-WY-82006,US,WY,82006,6,,,, +US-WY-82007,US,WY,82007,6,,,, +US-WY-82008,US,WY,82008,6,,,, +US-WY-82009,US,WY,82009,6,,,, +US-WY-82010,US,WY,82010,6,,,, +US-WY-82050,US,WY,82050,6,,,, +US-WY-82051,US,WY,82051,6,,,, +US-WY-82052,US,WY,82052,6,,,, +US-WY-82053,US,WY,82053,6,,,, +US-WY-82054,US,WY,82054,6,,,, +US-WY-82055,US,WY,82055,6,,,, +US-WY-82058,US,WY,82058,6,,,, +US-WY-82059,US,WY,82059,6,,,, +US-WY-82060,US,WY,82060,6,,,, +US-WY-82061,US,WY,82061,6,,,, +US-WY-82063,US,WY,82063,6,,,, +US-WY-82070,US,WY,82070,6,,,, +US-WY-82071,US,WY,82071,6,,,, +US-WY-82072,US,WY,82072,6,,,, +US-WY-82073,US,WY,82073,6,,,, +US-WY-82081,US,WY,82081,6,,,, +US-WY-82082,US,WY,82082,6,,,, +US-WY-82083,US,WY,82083,6,,,, +US-WY-82084,US,WY,82084,6,,,, +US-WY-82190,US,WY,82190,4,,,, +US-WY-82201,US,WY,82201,6,,,, +US-WY-82210,US,WY,82210,6,,,, +US-WY-82212,US,WY,82212,5.25,,,, +US-WY-82213,US,WY,82213,6,,,, +US-WY-82214,US,WY,82214,6,,,, +US-WY-82215,US,WY,82215,6,,,, +US-WY-82217,US,WY,82217,5.25,,,, +US-WY-82218,US,WY,82218,5.25,,,, +US-WY-82219,US,WY,82219,5.25,,,, +US-WY-82221,US,WY,82221,5.25,,,, +US-WY-82222,US,WY,82222,6,,,, +US-WY-82223,US,WY,82223,5.25,,,, +US-WY-82224,US,WY,82224,6,,,, +US-WY-82225,US,WY,82225,6,,,, +US-WY-82227,US,WY,82227,6,,,, +US-WY-82229,US,WY,82229,6,,,, +US-WY-82240,US,WY,82240,5.25,,,, +US-WY-82242,US,WY,82242,6,,,, +US-WY-82243,US,WY,82243,5.25,,,, +US-WY-82244,US,WY,82244,5.25,,,, +US-WY-82301,US,WY,82301,6,,,, +US-WY-82310,US,WY,82310,6,,,, +US-WY-82321,US,WY,82321,6,,,, +US-WY-82322,US,WY,82322,6,,,, +US-WY-82323,US,WY,82323,6,,,, +US-WY-82324,US,WY,82324,6,,,, +US-WY-82325,US,WY,82325,6,,,, +US-WY-82327,US,WY,82327,6,,,, +US-WY-82329,US,WY,82329,6,,,, +US-WY-82331,US,WY,82331,6,,,, +US-WY-82332,US,WY,82332,6,,,, +US-WY-82334,US,WY,82334,6,,,, +US-WY-82335,US,WY,82335,6,,,, +US-WY-82336,US,WY,82336,6,,,, +US-WY-82401,US,WY,82401,5,,,, +US-WY-82410,US,WY,82410,5,,,, +US-WY-82411,US,WY,82411,5,,,, +US-WY-82412,US,WY,82412,5,,,, +US-WY-82414,US,WY,82414,4,,,, +US-WY-82420,US,WY,82420,5,,,, +US-WY-82421,US,WY,82421,5,,,, +US-WY-82422,US,WY,82422,5,,,, +US-WY-82423,US,WY,82423,4,,,, +US-WY-82426,US,WY,82426,5,,,, +US-WY-82428,US,WY,82428,5,,,, +US-WY-82430,US,WY,82430,5,,,, +US-WY-82431,US,WY,82431,5,,,, +US-WY-82432,US,WY,82432,5,,,, +US-WY-82433,US,WY,82433,4,,,, +US-WY-82434,US,WY,82434,5,,,, +US-WY-82435,US,WY,82435,4,,,, +US-WY-82440,US,WY,82440,4,,,, +US-WY-82441,US,WY,82441,5,,,, +US-WY-82442,US,WY,82442,5,,,, +US-WY-82443,US,WY,82443,5,,,, +US-WY-82450,US,WY,82450,4,,,, +US-WY-82501,US,WY,82501,5,,,, +US-WY-82510,US,WY,82510,5,,,, +US-WY-82512,US,WY,82512,5,,,, +US-WY-82513,US,WY,82513,5,,,, +US-WY-82514,US,WY,82514,5,,,, +US-WY-82515,US,WY,82515,5,,,, +US-WY-82516,US,WY,82516,5,,,, +US-WY-82520,US,WY,82520,5,,,, +US-WY-82523,US,WY,82523,5,,,, +US-WY-82524,US,WY,82524,5,,,, +US-WY-82601,US,WY,82601,5,,,, +US-WY-82602,US,WY,82602,5,,,, +US-WY-82604,US,WY,82604,5,,,, +US-WY-82605,US,WY,82605,5,,,, +US-WY-82609,US,WY,82609,5,,,, +US-WY-82620,US,WY,82620,5,,,, +US-WY-82630,US,WY,82630,5,,,, +US-WY-82633,US,WY,82633,6,,,, +US-WY-82635,US,WY,82635,5,,,, +US-WY-82636,US,WY,82636,5,,,, +US-WY-82637,US,WY,82637,6,,,, +US-WY-82638,US,WY,82638,5,,,, +US-WY-82639,US,WY,82639,5,,,, +US-WY-82640,US,WY,82640,5,,,, +US-WY-82642,US,WY,82642,5,,,, +US-WY-82643,US,WY,82643,5,,,, +US-WY-82644,US,WY,82644,5,,,, +US-WY-82646,US,WY,82646,5,,,, +US-WY-82648,US,WY,82648,5,,,, +US-WY-82649,US,WY,82649,5,,,, +US-WY-82701,US,WY,82701,5,,,, +US-WY-82710,US,WY,82710,5,,,, +US-WY-82711,US,WY,82711,5,,,, +US-WY-82712,US,WY,82712,5,,,, +US-WY-82714,US,WY,82714,5,,,, +US-WY-82715,US,WY,82715,5,,,, +US-WY-82716,US,WY,82716,6,,,, +US-WY-82717,US,WY,82717,6,,,, +US-WY-82718,US,WY,82718,6,,,, +US-WY-82720,US,WY,82720,5,,,, +US-WY-82721,US,WY,82721,5,,,, +US-WY-82723,US,WY,82723,5,,,, +US-WY-82725,US,WY,82725,6,,,, +US-WY-82727,US,WY,82727,6,,,, +US-WY-82729,US,WY,82729,5,,,, +US-WY-82730,US,WY,82730,5,,,, +US-WY-82731,US,WY,82731,6,,,, +US-WY-82732,US,WY,82732,6,,,, +US-WY-82801,US,WY,82801,6,,,, +US-WY-82831,US,WY,82831,6,,,, +US-WY-82832,US,WY,82832,6,,,, +US-WY-82833,US,WY,82833,6,,,, +US-WY-82834,US,WY,82834,5,,,, +US-WY-82835,US,WY,82835,6,,,, +US-WY-82836,US,WY,82836,6,,,, +US-WY-82837,US,WY,82837,6,,,, +US-WY-82838,US,WY,82838,6,,,, +US-WY-82839,US,WY,82839,6,,,, +US-WY-82840,US,WY,82840,5,,,, +US-WY-82842,US,WY,82842,6,,,, +US-WY-82844,US,WY,82844,6,,,, +US-WY-82845,US,WY,82845,6,,,, +US-WY-82901,US,WY,82901,6,,,, +US-WY-82902,US,WY,82902,6,,,, +US-WY-82922,US,WY,82922,4,,,, +US-WY-82923,US,WY,82923,4,,,, +US-WY-82925,US,WY,82925,4,,,, +US-WY-82930,US,WY,82930,5,,,, +US-WY-82931,US,WY,82931,5,,,, +US-WY-82932,US,WY,82932,6,,,, +US-WY-82933,US,WY,82933,5,,,, +US-WY-82934,US,WY,82934,6,,,, +US-WY-82935,US,WY,82935,6,,,, +US-WY-82936,US,WY,82936,5,,,, +US-WY-82937,US,WY,82937,5,,,, +US-WY-82938,US,WY,82938,6,,,, +US-WY-82939,US,WY,82939,5,,,, +US-WY-82941,US,WY,82941,4,,,, +US-WY-82942,US,WY,82942,6,,,, +US-WY-82943,US,WY,82943,6,,,, +US-WY-82944,US,WY,82944,5,,,, +US-WY-82945,US,WY,82945,6,,,, +US-WY-83001,US,WY,83001,6,,,, +US-WY-83002,US,WY,83002,6,,,, +US-WY-83011,US,WY,83011,6,,,, +US-WY-83012,US,WY,83012,6,,,, +US-WY-83013,US,WY,83013,6,,,, +US-WY-83014,US,WY,83014,6,,,, +US-WY-83025,US,WY,83025,6,,,, +US-WY-83101,US,WY,83101,5,,,, +US-WY-83110,US,WY,83110,5,,,, +US-WY-83111,US,WY,83111,5,,,, +US-WY-83112,US,WY,83112,5,,,, +US-WY-83113,US,WY,83113,4,,,, +US-WY-83114,US,WY,83114,5,,,, +US-WY-83115,US,WY,83115,4,,,, +US-WY-83116,US,WY,83116,5,,,, +US-WY-83118,US,WY,83118,5,,,, +US-WY-83119,US,WY,83119,5,,,, +US-WY-83120,US,WY,83120,5,,,, +US-WY-83121,US,WY,83121,5,,,, +US-WY-83122,US,WY,83122,5,,,, +US-WY-83123,US,WY,83123,5,,,, +US-WY-83124,US,WY,83124,5,,,, +US-WY-83126,US,WY,83126,5,,,, +US-WY-83127,US,WY,83127,5,,,, +US-WY-83128,US,WY,83128,5,,,, +US-WY-83414,US,WY,83414,6,,,, diff --git a/dev/tools/performance-toolkit/fixtures/tax_rates.php b/dev/tools/performance-toolkit/fixtures/tax_rates.php new file mode 100644 index 0000000000000000000000000000000000000000..6c9f2745a7a5737c4d7ccdf11d3f8414b5b48330 --- /dev/null +++ b/dev/tools/performance-toolkit/fixtures/tax_rates.php @@ -0,0 +1,49 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +/** @var \Magento\ToolkitFramework\Application $this */ +$this->resetObjectManager(); +/** Clean predefined tax rates to maintain consistency */ +/** @var $collection Magento\Tax\Model\Resource\Calculation\Rate\Collection */ +$collection = $this->getObjectManager()->get('Magento\Tax\Model\Resource\Calculation\Rate\Collection'); + +/** @var $model Magento\Tax\Model\Calculation\Rate */ +$model = $this->getObjectManager()->get('Magento\Tax\Model\Calculation\Rate'); + +foreach ($collection->getAllIds() as $id) { + $model->setId($id); + $model->delete(); +} +/** + * Import tax rates with import handler + */ +$filename = realpath(__DIR__ . '/tax_rates.csv'); +$file = array ( + 'name' => $filename, + 'type' => 'application/vnd.ms-excel', + 'tmp_name' => $filename, + 'error' => 0, + 'size' => filesize($filename), +); +$importHandler = $this->getObjectManager()->create('Magento\TaxImportExport\Model\Rate\CsvImportHandler'); +$importHandler->importFromCsvFile($file); diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php new file mode 100644 index 0000000000000000000000000000000000000000..78343e70782ea1cccbbf76d501427c21a4e388e5 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php @@ -0,0 +1,189 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * Magento application for performance tests + */ +namespace Magento\ToolkitFramework; + +class Application +{ + /** + * Area code + */ + const AREA_CODE = 'install'; + + /** + * Application object + * + * @var \Magento\Framework\AppInterface + */ + protected $_application; + + /** + * @var \Magento\Framework\Shell + */ + protected $_shell; + + /** + * @var \Magento\Framework\ObjectManager + */ + protected $_objectManager; + + /** + * List of fixtures applied to the application + * + * @var array + */ + protected $_fixtures = array(); + + /** + * @var string + */ + protected $_applicationBaseDir; + + /** + * @param string $applicationBaseDir + * @param \Magento\Framework\Shell $shell + */ + public function __construct($applicationBaseDir, \Magento\Framework\Shell $shell) + { + $this->_applicationBaseDir = $applicationBaseDir; + $this->_shell = $shell; + } + + /** + * Update permissions for `var` directory + * + * @return void + */ + protected function _updateFilesystemPermissions() + { + /** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */ + $varDirectory = $this->getObjectManager()->get('Magento\Framework\App\Filesystem') + ->getDirectoryWrite(\Magento\Framework\App\Filesystem::VAR_DIR); + $varDirectory->changePermissions('', 0777); + } + + /** + * Bootstrap application, so it is possible to use its resources + * + * @return \Magento\ToolkitFramework\Application + */ + protected function _bootstrap() + { + $this->getObjectManager()->configure( + $this->getObjectManager()->get('Magento\Framework\App\ObjectManager\ConfigLoader')->load(self::AREA_CODE) + ); + $this->getObjectManager()->get('Magento\Framework\Config\ScopeInterface')->setCurrentScope(self::AREA_CODE); + return $this; + } + + /** + * Bootstrap + * + * @return Application + */ + public function bootstrap() + { + return $this->_bootstrap(); + } + + /** + * Run reindex + * + * @return Application + */ + public function reindex() + { + $this->_shell->execute( + 'php -f ' . $this->_applicationBaseDir . '/dev/shell/indexer.php -- reindexall' + ); + return $this; + } + + /** + * Work on application, so that it has all and only $fixtures applied. May require reinstall, if + * excessive fixtures has been applied before. + * + * @param array $fixtures + * + * @return void + */ + public function applyFixtures(array $fixtures) + { + // Apply fixtures + $fixturesToApply = array_diff($fixtures, $this->_fixtures); + if (!$fixturesToApply) { + return; + } + + $this->_bootstrap(); + foreach ($fixturesToApply as $fixtureFile) { + $this->applyFixture($fixtureFile); + } + $this->_fixtures = $fixtures; + + $this->reindex() + ->_updateFilesystemPermissions(); + } + + /** + * Apply fixture file + * + * @param string $fixtureFilename + * + * @return void + */ + public function applyFixture($fixtureFilename) + { + require $fixtureFilename; + } + + /** + * Get object manager + * + * @return \Magento\Framework\ObjectManager + */ + public function getObjectManager() + { + if (!$this->_objectManager) { + $locatorFactory = new \Magento\Framework\App\ObjectManagerFactory(); + $this->_objectManager = $locatorFactory->create(BP, $_SERVER); + $this->_objectManager->get('Magento\Framework\App\State')->setAreaCode(self::AREA_CODE); + } + return $this->_objectManager; + } + + /** + * Reset object manager + * + * @return \Magento\Framework\ObjectManager + */ + public function resetObjectManager() + { + $this->_objectManager = null; + return $this; + } +} diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Config.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Config.php new file mode 100644 index 0000000000000000000000000000000000000000..43ce2b694909e6ade3d08f9693b238295697071d --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Config.php @@ -0,0 +1,111 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework; + +class Config +{ + /** + * Configuration array + * + * @var array + */ + protected $_config = array(); + + /** + * Labels for config values + * + * @var array + */ + protected $_labels = array(); + + /** + * Get config instance + * + * @return \Magento\ToolkitFramework\Config + */ + public static function getInstance() + { + static $instance; + if (!$instance instanceof static) { + $instance = new static; + } + return $instance; + } + + /** + * Load config from file + * + * @param string $filename + * @throws \Exception + * + * @return void + */ + public function loadConfig($filename) + { + if (!is_readable($filename)) { + throw new \Exception("Profile configuration file `{$filename}` is not readable or does not exists."); + } + $this->_config = (new \Magento\Framework\Xml\Parser())->load($filename)->xmlToArray(); + } + + /** + * Load labels + * + * @param string $filename + * @throws \Exception + * + * @return void + */ + public function loadLabels($filename) + { + if (!is_readable($filename)) { + throw new \Exception("Labels file `{$filename}` is not readable or does not exists."); + } + $this->_labels = (new \Magento\Framework\Xml\Parser())->load($filename)->xmlToArray(); + } + + /** + * Get labels array + * + * @return array + */ + public function getLabels() + { + return isset($this->_labels['config']['labels']) ? $this->_labels['config']['labels'] : array(); + } + + /** + * Get profile configuration value + * + * @param string $key + * @param null|mixed $default + * + * @return mixed + */ + public function getValue($key, $default = null) + { + return isset($this->_config['config']['profile'][$key]) ? $this->_config['config']['profile'][$key] : $default; + } +} diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/FixtureSet.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/FixtureSet.php new file mode 100644 index 0000000000000000000000000000000000000000..6a6a37352043bdae486f459884cfe6433ad9800e --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/FixtureSet.php @@ -0,0 +1,75 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework; + +class FixtureSet +{ + /** + * Configuration array + * + * @var array + */ + protected $_fixtures = []; + + /** + * Get config instance + * + * @return \Magento\ToolkitFramework\FixtureSet + */ + public static function getInstance() + { + static $instance; + if (!$instance instanceof static) { + $instance = new static(__DIR__ . '/../../fixtures.xml'); + } + return $instance; + } + + /** + * Constructor + * + * @param string $filename + * @throws \Exception + */ + public function __construct($filename) + { + if (!is_readable($filename)) { + throw new \Exception("Fixtures set file `{$filename}` is not readable or does not exists."); + } + $this->_fixtures = (new \Magento\Framework\Xml\Parser())->load($filename)->xmlToArray(); + } + + /** + * Get fixtures array + * + * @param array $default + * + * @return array + */ + public function getFixtures($default = array()) + { + return isset($this->_fixtures['fixtures']) ? $this->_fixtures['fixtures'] : $default; + } +} diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Helper/Cli.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Helper/Cli.php new file mode 100644 index 0000000000000000000000000000000000000000..83786c9c04bf6e0c78d1695e60b83417fbe9d4b0 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Helper/Cli.php @@ -0,0 +1,71 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\Helper; + +/** + * Class Cli static helper + * + */ +class Cli +{ + /** + * Getopt object + * + * @var \Zend_Console_Getopt + */ + protected static $_getopt; + + /** + * Set GetOpt object + * + * @param \Zend_Console_Getopt $getopt + * + * @return void + */ + public static function setOpt(\Zend_Console_Getopt $getopt) + { + static::$_getopt = $getopt; + } + + /** + * Get option value + * + * @param string $key + * @param mixed $default + * + * @return mixed|null + */ + public static function getOption($key, $default = null) + { + if (!static::$_getopt instanceof \Zend_Console_Getopt) { + return $default; + } + $value = static::$_getopt->getOption($key); + if (is_null($value)) { + return $default; + } + return $value; + } +} diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Generator.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Generator.php new file mode 100644 index 0000000000000000000000000000000000000000..e82e07b23f3f4e70769bd406cfab7037f138fc71 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Generator.php @@ -0,0 +1,140 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\ImportExport\Fixture\Complex; + +/** + * Class Generator + * + * + */ +class Generator extends \Magento\ImportExport\Model\Import\AbstractSource +{ + /** + * Data row pattern + * + * @var \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern + */ + protected $_pattern; + + /** + * Entities limit + * + * @var int + */ + protected $_limit = 0; + + /** + * Entities Count + * + * @var int + */ + protected $_count = 0; + + /** + * Array of template variables (static values or callables) + * + * @var array + */ + protected $_variables = array(); + + /** + * Current index + * + * @var int + */ + protected $_index = 1; + + /** + * Rows count in pattern + * + * @var int + */ + protected $_patternRowsCount = 0; + + /** + * Read the row pattern to determine which columns are dynamic, set the collection size + * + * @param Pattern $rowPattern + * @param int $count how many records to generate + */ + public function __construct(Pattern $rowPattern, $count) + { + $this->_pattern = $rowPattern; + $this->_count = $count; + $this->_patternRowsCount = $this->_pattern->getRowsCount(); + $this->_limit = (int)$count * $this->_patternRowsCount; + parent::__construct($this->_pattern->getHeaders()); + } + + /** + * Get row index for template + * + * @param int $key + * + * @return float + */ + public function getIndex($key) + { + return floor($key / $this->_patternRowsCount) + 1; + } + + /** + * Whether limit of generated elements is reached (according to "Iterator" interface) + * + * @return bool + */ + public function valid() + { + return $this->_key + 1 <= $this->_limit; + } + + /** + * Get next row in set + * + * @return array|bool + */ + protected function _getNextRow() + { + $key = $this->key(); + $this->_index = $this->getIndex($key); + + if ($key > $this->_limit) { + return false; + } + return $this->_pattern->getRow($this->_index, $key); + } + + /** + * Return the current element + * + * Returns the row in associative array format: array(<col_name> => <value>, ...) + * + * @return array + */ + public function current() + { + return $this->_row; + } +} diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Pattern.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Pattern.php new file mode 100644 index 0000000000000000000000000000000000000000..90201a20ae59c5c6849c348519c48f4df95e8a44 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Pattern.php @@ -0,0 +1,145 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\ImportExport\Fixture\Complex; + +/** + * Complex pattern class for complex generator (used for creating configurable products) + * + * + */ +class Pattern +{ + /** + * Pattern headers set + * + * @var array + */ + protected $_headers; + + /** + * Rows set - array of rows pattern, can contain as many rows as you need + * + * @var array(array) + */ + protected $_rowsSet; + + /** + * Position + * + * @var int + */ + protected $_position = 0; + + /** + * Set headers + * + * @param array $headers + * + * @return Pattern + */ + public function setHeaders(array $headers) + { + $this->_headers = $headers; + return $this; + } + + /** + * Get headers array + * + * @return array + */ + public function getHeaders() + { + return $this->_headers; + } + + /** + * Set combined rows set + * + * @param array $rowsSet + * + * @return Pattern + * @throws \Exception + */ + public function setRowsSet(array $rowsSet) + { + if (!count($rowsSet)) { + throw new \Exception("Rows set must contain at least 1 array representing a row pattern"); + } + $this->_rowsSet = $rowsSet; + if (!isset($this->_headers)) { + $this->_headers = array_keys($rowsSet[0]); + } + return $this; + } + + /** + * Add row + * + * @param array $row + * + * @return Pattern + */ + public function addRow(array $row) + { + $this->_rowsSet[] = $row; + return $this; + } + + /** + * Get row + * + * @param int $index + * @param int $generatorKey + * + * @return array|null + */ + public function getRow($index, $generatorKey) + { + $row = $this->_rowsSet[$generatorKey % count($this->_rowsSet)]; + foreach ($this->getHeaders() as $key) { + if (isset($row[$key])) { + if (is_callable($row[$key])) { + $row[$key] = call_user_func($row[$key], $index); + } else { + $row[$key] = str_replace('%s', $index, $row[$key]); + } + } else { + $row[$key] = ''; + } + } + return $row; + } + + /** + * Get rows count + * + * @return int + */ + public function getRowsCount() + { + return count($this->_rowsSet); + } +} diff --git a/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Generator.php b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Generator.php new file mode 100644 index 0000000000000000000000000000000000000000..3aef310b5e61371da7f1b57cc9b1351e65a94292 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Generator.php @@ -0,0 +1,99 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * A custom "Import" adapter for Magento_ImportExport module that allows generating arbitrary data rows + */ +namespace Magento\ToolkitFramework\ImportExport\Fixture; + +class Generator extends \Magento\ImportExport\Model\Import\AbstractSource +{ + /** + * Data row pattern + * + * @var array + */ + protected $_pattern = array(); + + /** + * Which columns are determined as dynamic + * + * @var array + */ + protected $_dynamicColumns = array(); + + /** + * @var int + */ + protected $_limit = 0; + + /** + * Read the row pattern to determine which columns are dynamic, set the collection size + * + * @param array $rowPattern + * @param int $limit how many records to generate + */ + public function __construct(array $rowPattern, $limit) + { + foreach ($rowPattern as $key => $value) { + if (is_callable($value) || is_string($value) && (false !== strpos($value, '%s'))) { + $this->_dynamicColumns[$key] = $value; + } + } + $this->_pattern = $rowPattern; + $this->_limit = (int)$limit; + parent::__construct(array_keys($rowPattern)); + } + + /** + * Whether limit of generated elements is reached (according to "Iterator" interface) + * + * @return bool + */ + public function valid() + { + return $this->_key + 1 <= $this->_limit; + } + + /** + * Render next row + * + * Return array or false on error + * + * @return array|false + */ + protected function _getNextRow() + { + $row = $this->_pattern; + foreach ($this->_dynamicColumns as $key => $dynamicValue) { + $index = $this->_key + 1; + if (is_callable($dynamicValue)) { + $row[$key] = call_user_func($dynamicValue, $index); + } else { + $row[$key] = str_replace('%s', $index, $dynamicValue); + } + } + return $row; + } +} diff --git a/dev/tools/performance-toolkit/framework/bootstrap.php b/dev/tools/performance-toolkit/framework/bootstrap.php new file mode 100644 index 0000000000000000000000000000000000000000..04692120fcade99f01c7dc7ab77bebac2ff38720 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/bootstrap.php @@ -0,0 +1,33 @@ +<?php +/** + * Toolkit framework bootstrap script + * + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$toolkitBaseDir = realpath(__DIR__ . '/..'); +$magentoBaseDir = realpath($toolkitBaseDir . '/../../../'); + +require_once "$magentoBaseDir/app/bootstrap.php"; +(new \Magento\Framework\Autoload\IncludePath())->addIncludePath("$toolkitBaseDir/framework"); + +return $magentoBaseDir; diff --git a/dev/tools/performance-toolkit/framework/fixtures.xml b/dev/tools/performance-toolkit/framework/fixtures.xml new file mode 100644 index 0000000000000000000000000000000000000000..64fc1ca22a060949dc3b6afde22814ca0ba7f74f --- /dev/null +++ b/dev/tools/performance-toolkit/framework/fixtures.xml @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<fixtures> + <stores> + <file>stores.php</file> + <action>Generating stores, store views and websites</action> + </stores> + <categories> + <file>categories.php</file> + <action>Generating categories</action> + </categories> + <simple_products> + <file>simple_products.php</file> + <action>Generating simple products</action> + </simple_products> + <eav_variations> + <file>eav_variations.php</file> + <action>Generating EAV variations for configurable products</action> + </eav_variations> + <configurable_products> + <file>configurable_products.php</file> + <action>Generating configurable products</action> + </configurable_products> + <customers> + <file>customers.php</file> + <action>Generating customer accounts</action> + </customers> + <cart_price_rules> + <file>cart_price_rules.php</file> + <action>Generating shopping cart price rules</action> + </cart_price_rules> + <catalog_price_rules> + <file>catalog_price_rules.php</file> + <action>Generating catalog price rules</action> + </catalog_price_rules> + <tax_rates> + <file>tax_rates.php</file> + <action>Generating tax rates</action> + </tax_rates> + <disable_form_key_usage> + <file>disable_form_key_usage.php</file> + <action>Disabling form key usage for admin</action> + </disable_form_key_usage> + <shipping_flatrate_enabled> + <file>shipping_flatrate_enabled.php</file> + <action>Enabling FlatRate shipping method</action> + </shipping_flatrate_enabled> +</fixtures> \ No newline at end of file diff --git a/dev/tools/performance-toolkit/framework/labels.xml b/dev/tools/performance-toolkit/framework/labels.xml new file mode 100644 index 0000000000000000000000000000000000000000..6aa5360ebb6ec50fc7a76a86ed54e75960fc1fba --- /dev/null +++ b/dev/tools/performance-toolkit/framework/labels.xml @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config> + <labels> + <websites>Websites</websites> + <store_groups>Store Groups</store_groups> + <store_views>Store Views</store_views> + <simple_products>Simple Products</simple_products> + <configurable_products>Configurable Products</configurable_products> + <categories>Categories</categories> + <catalog_price_rules>Catalog Price Rules</catalog_price_rules> + <cart_price_rules>Cart Price Rules</cart_price_rules> + <customers>Regitered Customers</customers> + </labels> +</config> diff --git a/dev/tools/performance-toolkit/framework/tests/unit/framework/bootstrap.php b/dev/tools/performance-toolkit/framework/tests/unit/framework/bootstrap.php new file mode 100644 index 0000000000000000000000000000000000000000..ed06aa5c708a73e285e5ee1d5301036951fd4c7e --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/framework/bootstrap.php @@ -0,0 +1,30 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$magentoBaseDir = realpath(__DIR__ . '/../../../../../../../'); + +require_once "$magentoBaseDir/app/bootstrap.php"; +(new \Magento\Framework\Autoload\IncludePath())->addIncludePath( + "$magentoBaseDir/dev/tools/performance-toolkit/framework" +); diff --git a/dev/tools/performance-toolkit/framework/tests/unit/phpunit.xml.dist b/dev/tools/performance-toolkit/framework/tests/unit/phpunit.xml.dist new file mode 100644 index 0000000000000000000000000000000000000000..a9347263b804537751cda9bfcfd48cbd01c59e79 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/phpunit.xml.dist @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" + colors="true" + bootstrap="./framework/bootstrap.php" +> + <testsuites> + <testsuite name="Unit Tests for Preformance Toolkit Framework"> + <directory suffix="Test.php">testsuite</directory> + </testsuite> + </testsuites> + <php> + <ini name="date.timezone" value="America/Los_Angeles"/> + </php> +</phpunit> diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ApplicationTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ApplicationTest.php new file mode 100644 index 0000000000000000000000000000000000000000..59a46180b42bb5f346c4c32cf4dc1913a1ec1b09 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ApplicationTest.php @@ -0,0 +1,167 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework; + +/** + * Class ApplicationTest + * + */ +class ApplicationTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Framework\Shell|\PHPUnit_Framework_MockObject_MockObject + */ + protected $_shell; + + /** + * @var \Magento\ToolkitFramework\Application|\PHPUnit_Framework_MockObject_MockObject + */ + protected $_object; + + /** + * @var string + */ + protected $_applicationBaseDir; + + /** + * Set Up before test + * + * @return void + */ + protected function setUp() + { + $this->_applicationBaseDir = __DIR__ . '/../../../../../bootstrap.php'; + $this->_shell = $this->getMock('Magento\Framework\Shell', array('execute'), array(), '', false); + + $this->_object = new \Magento\ToolkitFramework\Application($this->_applicationBaseDir, $this->_shell); + + $this->_object->applied = array(); // For fixture testing + } + + /** + * Tear down after test + * + * @return void + */ + protected function tearDown() + { + unset($this->_shell); + unset($this->_object); + } + + /** + * Apply fixtures test + * + * @param array $fixtures + * @param array $expected + * @dataProvider applyFixturesDataProvider + * + * @return void + */ + public function testApplyFixtures($fixtures, $expected) + { + $this->_object->applyFixtures($fixtures); + $this->assertEquals($expected, $this->_object->applied); + } + + /** + * Apply fixture data provider + * + * @return array + */ + public function applyFixturesDataProvider() + { + return array( + 'empty fixtures' => array( + array(), + array() + ), + 'fixtures' => array( + $this->_getFixtureFiles(array('fixture1', 'fixture2')), + array('fixture1', 'fixture2') + ), + ); + } + + /** + * Apply fixture test + * + * @param array $initialFixtures + * @param array $subsequentFixtures + * @param array $subsequentExpected + * @dataProvider applyFixturesSeveralTimesDataProvider + * + * @return void + */ + public function testApplyFixturesSeveralTimes($initialFixtures, $subsequentFixtures, $subsequentExpected) + { + $this->_object->applyFixtures($initialFixtures); + $this->_object->applied = array(); + $this->_object->applyFixtures($subsequentFixtures); + $this->assertEquals($subsequentExpected, $this->_object->applied); + } + + /** + * Apply fixture data provider + * + * @return array + */ + public function applyFixturesSeveralTimesDataProvider() + { + return array( + 'no fixtures applied, when sets are same' => array( + $this->_getFixtureFiles(array('fixture1', 'fixture2')), + $this->_getFixtureFiles(array('fixture1', 'fixture2')), + array() + ), + 'missing fixture applied for a super set' => array( + $this->_getFixtureFiles(array('fixture1')), + $this->_getFixtureFiles(array('fixture1', 'fixture2')), + array('fixture2') + ), + 'no fixtures applied, when sets were exist before' => array( + $this->_getFixtureFiles(array('fixture1', 'fixture2')), + $this->_getFixtureFiles(array('fixture1')), + array() + ), + ); + } + + /** + * Get fixture files + * + * @param array $fixtures + * + * @return array + */ + protected function _getFixtureFiles($fixtures) + { + $result = array(); + foreach ($fixtures as $fixture) { + $result[] = __DIR__ . "/_files/application_test/{$fixture}.php"; + } + return $result; + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ConfigTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ConfigTest.php new file mode 100644 index 0000000000000000000000000000000000000000..65b503a1008bbf7e9dfd341965a7b2ef3d1cb086 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ConfigTest.php @@ -0,0 +1,36 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\ToolkitFramework; + +class ConfigTest extends \PHPUnit_Framework_TestCase +{ + /** + * @return void + */ + public function testUnaccessibleConfig() + { + $this->setExpectedException('Exception', 'Profile configuration file `))` is not readable or does not exists.'); + \Magento\ToolkitFramework\Config::getInstance()->loadConfig('))'); + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/FixtureSetTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/FixtureSetTest.php new file mode 100644 index 0000000000000000000000000000000000000000..4efa2d17ef94287254ab2102a031cb52cfdd11a9 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/FixtureSetTest.php @@ -0,0 +1,36 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\ToolkitFramework; + +class FixtureSetTest extends \PHPUnit_Framework_TestCase +{ + /** + * @return void + */ + public function testUnaccessibleConfig() + { + $this->setExpectedException('Exception', 'Fixtures set file `))` is not readable or does not exists.'); + new \Magento\ToolkitFramework\FixtureSet('))'); + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/Helper/CliTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/Helper/CliTest.php new file mode 100644 index 0000000000000000000000000000000000000000..8fc01e51e89f98d8448c63c9a440c4e8c72ba7dc --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/Helper/CliTest.php @@ -0,0 +1,102 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\Helper; + +/** + * Class CliTest + * + */ +class CliTest extends \PHPUnit_Framework_TestCase +{ + /** + * Getopt object + * + * @var \Zend_Console_Getopt + */ + protected $_getOpt; + + /** + * Param constants + */ + const TEST_OPTION_NAME = 'name'; + const TEST_OPTION_VALUE = 'test_option_value'; + + /** + * Set up before test + * + * @return void + */ + public function setUp() + { + + $this->_getOpt = $this->getMock( + 'Zend_Console_Getopt', + array('getOption'), + array(array()) + ); + $this->_getOpt->expects($this->any())->method('getOption')->will( + $this->returnValueMap( + array( + array(self::TEST_OPTION_NAME, self::TEST_OPTION_VALUE), + array('xxx', null), + ) + ) + ); + + \Magento\ToolkitFramework\Helper\Cli::setOpt($this->_getOpt); + } + + /** + * Tear down after test + * + * @return void + */ + public function tearDown() + { + $this->_getOpt = null; + $this->_object = null; + } + + /** + * Test CLI helper + * + * @return void + */ + public function testCli() + { + $this->assertEquals( + self::TEST_OPTION_VALUE, + \Magento\ToolkitFramework\Helper\Cli::getOption(self::TEST_OPTION_NAME) + ); + $this->assertEquals( + null, + \Magento\ToolkitFramework\Helper\Cli::getOption('xxx') + ); + $this->assertEquals( + 'default', + \Magento\ToolkitFramework\Helper\Cli::getOption('xxx', 'default') + ); + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/ComplexGeneratorTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/ComplexGeneratorTest.php new file mode 100644 index 0000000000000000000000000000000000000000..b128e80b10bdf4dc4acf8906afde8fec3da693fb --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/ComplexGeneratorTest.php @@ -0,0 +1,107 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\ImportExport\Fixture\Complex; + +/** + * Class ComplexGeneratorTest + * + */ +class ComplexGeneratorTest extends \PHPUnit_Framework_TestCase +{ + /** + * Pattern instance + * + * @var \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern + */ + protected $_pattern; + + /** + * Get pattern instance + * + * @return \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern + */ + protected function getPattern() + { + if (!$this->_pattern instanceof \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern) { + $patternData = array( + array( + 'id' => '%s', + 'name' => 'Static', + 'calculated' => function ($index) { + return $index * 10; + }, + ), + array( + 'name' => 'xxx %s' + ), + array( + 'name' => 'yyy %s' + ), + ); + $this->_pattern = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern(); + $this->_pattern->setHeaders(array_keys($patternData[0])); + $this->_pattern->setRowsSet($patternData); + } + return $this->_pattern; + } + + /** + * Test complex generator iterator interface + * + * @return void + */ + public function testIteratorInterface() + { + $model = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Generator($this->getPattern(), 2); + $rows = array(); + foreach ($model as $row) { + $rows[] = $row; + } + $this->assertEquals( + array( + array('id' => '1', 'name' => 'Static', 'calculated' => 10), + array('id' => '', 'name' => 'xxx 1', 'calculated' => ''), + array('id' => '', 'name' => 'yyy 1', 'calculated' => ''), + array('id' => '2', 'name' => 'Static', 'calculated' => 20), + array('id' => '', 'name' => 'xxx 2', 'calculated' => ''), + array('id' => '', 'name' => 'yyy 2', 'calculated' => ''), + ), + $rows + ); + } + + /** + * Test generator getIndex + * + * @return void + */ + public function testGetIndex() + { + $model = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Generator($this->getPattern(), 4); + for ($i = 0; $i < 32; $i++) { + $this->assertEquals($model->getIndex($i), floor($i / $this->getPattern()->getRowsCount()) + 1); + } + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/PatternTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/PatternTest.php new file mode 100644 index 0000000000000000000000000000000000000000..1cb45c58f02963a26cd934a6a6083d06eaffef98 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/PatternTest.php @@ -0,0 +1,116 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\ImportExport\Fixture\Complex; + +/** + * Class PatternTest + * + */ +class PatternTest extends \PHPUnit_Framework_TestCase +{ + /** + * Get pattern object + * + * @param array $patternData + * + * @return \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern + */ + protected function getPattern($patternData) + { + $pattern = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Pattern(); + $pattern->setHeaders(array_keys($patternData[0])); + $pattern->setRowsSet($patternData); + return $pattern; + } + + /** + * Data source for pattern + * + * @return array + */ + public function patternDataPrivider() + { + $result = array( + 0 => array( + array( + array( + 'id' => '%s', + 'name' => 'Static', + 'calculated' => function ($index) { + return $index * 10; + }, + ), + array( + 'name' => 'xxx %s' + ), + array( + 'name' => 'yyy %s' + ), + ), + 'ecpectedCount' => 3, + 'expectedRowsResult' => array( + array('id' => '1', 'name' => 'Static', 'calculated' => 10), + array('id' => '', 'name' => 'xxx 1', 'calculated' => ''), + array('id' => '', 'name' => 'yyy 1', 'calculated' => ''), + ) + ), + 1 => array( + array( + array( + 'id' => '%s', + 'name' => 'Dynamic %s', + 'calculated' => 'calc %s', + ) + ), + 'ecpectedCount' => 1, + 'expectedRowsResult' => array( + array('id' => '1', 'name' => 'Dynamic 1', 'calculated' => 'calc 1'), + ) + ) + ); + return $result; + } + + /** + * Test pattern object + * + * @param array $patternData + * @param int $expectedRowsCount + * @param array $expectedRowsResult + * + * @dataProvider patternDataPrivider + * @test + * + * @return void + */ + public function testPattern($patternData, $expectedRowsCount, $expectedRowsResult) + { + $pattern = $this->getPattern($patternData); + $this->assertEquals($pattern->getRowsCount(), $expectedRowsCount); + foreach ($expectedRowsResult as $key => $expectedRow) { + $this->assertEquals($expectedRow, $pattern->getRow(floor($key / $pattern->getRowsCount()) + 1, $key)); + } + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/GeneratorTest.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/GeneratorTest.php new file mode 100644 index 0000000000000000000000000000000000000000..8c40d1452d13ab5608f3a0158dfe906d5a537e3f --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/GeneratorTest.php @@ -0,0 +1,56 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\ToolkitFramework\ImportExport\Fixture; + +class GeneratorTest extends \PHPUnit_Framework_TestCase +{ + /** + * @test + * + * @return void + */ + public function testIteratorInterface() + { + $pattern = array( + 'id' => '%s', + 'name' => 'Static', + 'calculated' => function ($index) { + return $index * 10; + }, + ); + $model = new \Magento\ToolkitFramework\ImportExport\Fixture\Generator($pattern, 2); + $rows = array(); + foreach ($model as $row) { + $rows[] = $row; + } + $this->assertEquals( + array( + array('id' => '1', 'name' => 'Static', 'calculated' => 10), + array('id' => '2', 'name' => 'Static', 'calculated' => 20), + ), + $rows + ); + } +} diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture1.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture1.php new file mode 100644 index 0000000000000000000000000000000000000000..79b3dfd0e6998c73ad521f649a6a86fef58b01dc --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture1.php @@ -0,0 +1,25 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$this->applied[] = 'fixture1'; diff --git a/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture2.php b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture2.php new file mode 100644 index 0000000000000000000000000000000000000000..ca06f20e3ca63be339fa2b39a85213b8524dc6e6 --- /dev/null +++ b/dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture2.php @@ -0,0 +1,25 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$this->applied[] = 'fixture2'; diff --git a/dev/tools/performance-toolkit/generate.php b/dev/tools/performance-toolkit/generate.php new file mode 100644 index 0000000000000000000000000000000000000000..123df4c51383c67dfcc0c8b618880a7fc49ebf92 --- /dev/null +++ b/dev/tools/performance-toolkit/generate.php @@ -0,0 +1,86 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +$applicationBaseDir = require_once __DIR__ . '/framework/bootstrap.php'; + +try { + $totalStartTime = microtime(true); + + $shell = new Zend_Console_Getopt( + array( + 'profile-s' => 'Profile configuration file', + ) + ); + + \Magento\ToolkitFramework\Helper\Cli::setOpt($shell); + + $args = $shell->getOptions(); + if (empty($args)) { + echo $shell->getUsageMessage(); + exit(0); + } + + $config = \Magento\ToolkitFramework\Config::getInstance(); + $config->loadConfig(\Magento\ToolkitFramework\Helper\Cli::getOption('profile')); + $config->loadLabels(__DIR__ . '/framework/labels.xml'); + + $labels = $config->getLabels(); + + echo 'Generating profile with following params:' . PHP_EOL; + foreach ($labels as $configKey => $label) { + echo ' |- ' . $label . ': ' . $config->getValue($configKey) . PHP_EOL; + } + + $files = \Magento\ToolkitFramework\FixtureSet::getInstance()->getFixtures(); + + $logWriter = new \Zend_Log_Writer_Stream('php://output'); + $logWriter->setFormatter(new \Zend_Log_Formatter_Simple('%message%' . PHP_EOL)); + $logger = new \Zend_Log($logWriter); + + $shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer(), $logger); + + $application = new \Magento\ToolkitFramework\Application($applicationBaseDir, $shell); + $application->bootstrap(); + + foreach ($files as $fixture) { + echo $fixture['action'] . '... '; + $startTime = microtime(true); + $application->applyFixture(__DIR__ . '/fixtures/' . $fixture['file']); + $endTime = microtime(true); + $resultTime = $endTime - $startTime; + echo ' done in ' . gmdate('H:i:s', $resultTime) . PHP_EOL; + } + + $application->reindex(); + $totalEndTime = microtime(true); + $totalResultTime = $totalEndTime - $totalStartTime; + + echo 'Total execution time: ' . gmdate('H:i:s', $totalResultTime) . PHP_EOL; +} catch (\Zend_Console_Getopt_Exception $e) { + fwrite(STDERR, $e->getMessage() . "\n\n" . $e->getUsageMessage() . "\n"); + exit(1); +} catch (\Exception $e) { + fwrite(STDERR, $e->getMessage() . "\n"); + exit(1); +} diff --git a/dev/tools/performance-toolkit/profiles/extra_large.xml b/dev/tools/performance-toolkit/profiles/extra_large.xml new file mode 100644 index 0000000000000000000000000000000000000000..c14ef23d63e0f696c5c59d200b21c34174a5c149 --- /dev/null +++ b/dev/tools/performance-toolkit/profiles/extra_large.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config> + <profile> + <websites>5</websites> <!-- Number of websites to generate --> + <store_groups>5</store_groups> <!--Number of stores--> + <store_views>5</store_views> <!-- Number of store views --> + <simple_products>800000</simple_products> <!-- Simple products count --> + <configurable_products>50000</configurable_products> <!--Configurable products count (each configurable has 3 simple products as options, that are not displayed individually in catalog) --> + <categories>3000</categories> <!-- Number of categories to generate --> + <categories_nesting_level>6</categories_nesting_level> <!-- Nesting level for categories --> + <catalog_price_rules>100</catalog_price_rules> <!-- Number os catalog price rules --> + <cart_price_rules>100</cart_price_rules> <!-- Number of shopping cart price rules --> + <cart_price_rules_floor>5</cart_price_rules_floor> <!-- The price rule condition: minimum products amount in shopping cart for price rule to be aaplied --> + <customers>5000</customers> <!-- Number of customers to generate --> + </profile> +</config> diff --git a/dev/tools/performance-toolkit/profiles/large.xml b/dev/tools/performance-toolkit/profiles/large.xml new file mode 100644 index 0000000000000000000000000000000000000000..945af51fd240093580250778b42296c6f73b348b --- /dev/null +++ b/dev/tools/performance-toolkit/profiles/large.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config> + <profile> + <websites>3</websites> <!-- Number of websites to generate --> + <store_groups>3</store_groups> <!--Number of stores--> + <store_views>3</store_views> <!-- Number of store views --> + <simple_products>400000</simple_products> <!-- Simple products count --> + <configurable_products>25000</configurable_products> <!--Configurable products count (each configurable has 3 simple products as options, that are not displayed individually in catalog) --> + <categories>1000</categories> <!-- Number of categories to generate --> + <categories_nesting_level>3</categories_nesting_level> <!-- Nesting level for categories --> + <catalog_price_rules>50</catalog_price_rules> <!-- Number os catalog price rules --> + <cart_price_rules>50</cart_price_rules> <!-- Number of shopping cart price rules --> + <cart_price_rules_floor>2</cart_price_rules_floor> <!-- The price rule condition: minimum products amount in shopping cart for price rule to be aaplied --> + <customers>2000</customers> <!-- Number of customers to generate --> + </profile> +</config> diff --git a/dev/tools/performance-toolkit/profiles/medium.xml b/dev/tools/performance-toolkit/profiles/medium.xml new file mode 100644 index 0000000000000000000000000000000000000000..980668e06405b81c4d5956a35c5c5cf363461484 --- /dev/null +++ b/dev/tools/performance-toolkit/profiles/medium.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config> + <profile> + <websites>1</websites> <!-- Number of websites to generate --> + <store_groups>2</store_groups> <!--Number of stores--> + <store_views>2</store_views> <!-- Number of store views --> + <simple_products>16000</simple_products> <!-- Simple products count --> + <configurable_products>1000</configurable_products> <!--Configurable products count (each configurable has 3 simple products as options, that are not displayed individually in catalog) --> + <categories>300</categories> <!-- Number of categories to generate --> + <categories_nesting_level>3</categories_nesting_level> <!-- Nesting level for categories --> + <catalog_price_rules>20</catalog_price_rules> <!-- Number os catalog price rules --> + <cart_price_rules>20</cart_price_rules> <!-- Number of shopping cart price rules --> + <cart_price_rules_floor>2</cart_price_rules_floor> <!-- The price rule condition: minimum products amount in shopping cart for price rule to be aaplied --> + <customers>200</customers> <!-- Number of customers to generate --> + </profile> +</config> diff --git a/dev/tools/performance-toolkit/profiles/small.xml b/dev/tools/performance-toolkit/profiles/small.xml new file mode 100644 index 0000000000000000000000000000000000000000..97ccb4577cf3b59fcbde4395c89fd667989fc576 --- /dev/null +++ b/dev/tools/performance-toolkit/profiles/small.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<config> + <profile> + <websites>1</websites> <!-- Number of websites to generate --> + <store_groups>1</store_groups> <!--Number of stores--> + <store_views>1</store_views> <!-- Number of store views --> + <simple_products>800</simple_products> <!-- Simple products count --> + <configurable_products>50</configurable_products> <!--Configurable products count (each configurable has 3 simple products as options, that are not displayed individually in catalog) --> + <categories>30</categories> <!-- Number of categories to generate --> + <categories_nesting_level>3</categories_nesting_level> <!-- Nesting level for categories --> + <catalog_price_rules>10</catalog_price_rules> <!-- Number os catalog price rules --> + <cart_price_rules>10</cart_price_rules> <!-- Number of shopping cart price rules --> + <cart_price_rules_floor>2</cart_price_rules_floor> <!-- The price rule condition: minimum products amount in shopping cart for price rule to be aaplied --> + <customers>20</customers> <!-- Number of customers to generate --> + </profile> +</config> diff --git a/index.php b/index.php index 9aa971b7efdce3969c8b1ba32fdf4340e7a9d259..75e61dbf5afd957d58d4f7305b4b481f48f28dac 100644 --- a/index.php +++ b/index.php @@ -4,8 +4,11 @@ * * Example - run a particular store or website: * -------------------------------------------- - * $extra = ['MAGE_RUN_CODE' => 'website2', 'MAGE_RUN_TYPE' => 'website']; - * $bootstrap = new \Magento\Framework\App\Bootstrap(BP, $_SERVER, $extra); + * $params = $_SERVER; + * $params[StoreManager::PARAM_RUN_CODE] = 'website2'; + * $params[StoreManager::PARAM_RUN_TYPE] = 'website'; + * $bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $params); + * \/** @var \Magento\Framework\App\Http $app *\/ * $app = $bootstrap->createApplication('Magento\Framework\App\Http'); * $bootstrap->run($app); * -------------------------------------------- @@ -33,7 +36,7 @@ */ require __DIR__ . '/app/bootstrap.php'; -$bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER, null); +$bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER); /** @var \Magento\Framework\App\Http $app */ $app = $bootstrap->createApplication('Magento\Framework\App\Http'); $bootstrap->run($app); diff --git a/lib/internal/Magento/Framework/App/Cache/ManagerApp.php b/lib/internal/Magento/Framework/App/Cache/ManagerApp.php new file mode 100644 index 0000000000000000000000000000000000000000..c5f35bded0444bd8bc48801adfc1dbb0af11906e --- /dev/null +++ b/lib/internal/Magento/Framework/App/Cache/ManagerApp.php @@ -0,0 +1,237 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Framework\App\Cache; + +use Magento\Framework\App; +use Magento\Framework\AppInterface; +use Magento\Framework\App\Console\Response; + +/** + * An application for managing cache status + */ +class ManagerApp implements AppInterface +{ + /**#@+ + * Request keys for managing caches + */ + const KEY_TYPES = 'types'; + const KEY_SET = 'set'; + const KEY_CLEAN = 'clean'; + const KEY_FLUSH = 'flush'; + /**#@- */ + + /** + * Cache types list + * + * @var TypeListInterface + */ + private $cacheTypeList; + + /** + * Cache state service + * + * @var StateInterface + */ + private $cacheState; + + /** + * Console response + * + * @var Response + */ + private $response; + + /** + * Cache types pool + * + * @var Type\FrontendPool + */ + private $pool; + + /** + * Requested changes + * + * @var array + */ + private $request; + + /** + * Constructor + * + * @param TypeListInterface $cacheTypeList + * @param StateInterface $cacheState + * @param Response $response + * @param Type\FrontendPool $pool + * @param array $request + */ + public function __construct( + TypeListInterface $cacheTypeList, + StateInterface $cacheState, + Response $response, + Type\FrontendPool $pool, + array $request + ) { + $this->cacheTypeList = $cacheTypeList; + $this->cacheState = $cacheState; + $this->response = $response; + $this->pool = $pool; + $this->request = $request; + } + + /** + * {@inheritdoc} + * @return Response + */ + public function launch() + { + $this->response->terminateOnSend(false); + $types = $this->getRequestedTypes(); + $queue = $this->updateStatus($types); + $this->clean($queue, $types); + return $this->response; + } + + /** + * Maps requested type from request into the current registry of types + * + * @return string[] + */ + private function getRequestedTypes() + { + $requested = isset($this->request[self::KEY_TYPES]) ? explode(',', $this->request[self::KEY_TYPES]) : []; + $result = []; + foreach (array_keys($this->cacheTypeList->getTypes()) as $type) { + if (empty($requested) || in_array($type, $requested)) { + $result[] = $type; + } + } + return $result; + } + + /** + * Updates cache status for the requested types + * + * @param string[] $types + * @return string[] Queue of affected cache types that need cleanup + */ + private function updateStatus($types) + { + if (!isset($this->request[self::KEY_SET])) { + return []; + } + $isEnabled = (bool)(int)$this->request[self::KEY_SET]; + $isUpdated = false; + $cleanQueue = []; + foreach ($types as $type) { + if ($this->cacheState->isEnabled($type) === $isEnabled) { // no need to poke it, if is not going to change + continue; + } + $this->cacheState->setEnabled($type, $isEnabled); + $isUpdated = true; + if ($isEnabled) { + $cleanQueue[] = $type; + } + } + if ($isUpdated) { + $this->cacheState->persist(); + } + return $cleanQueue; + } + + /** + * Cleans up or flushes caches (depending on what was requested) + * + * Types listed at the "required" argument are mandatory to clean. + * But try flush first, as it is more efficient. So if something was requested or required and flushed, then there + * is no need to clean it anymore. + * + * @param string[] $required + * @param string[] $requested + * @return void + */ + private function clean($required, $requested) + { + $flushed = $this->flush($requested); + if (isset($this->request[self::KEY_CLEAN])) { + $types = array_merge($requested, $required); + } else { + $types = $required; + } + foreach ($types as $type) { + $frontend = $this->pool->get($type); + if (in_array($type, $flushed)) { // it was already flushed + continue; + } + $frontend->clean(); + } + } + + /** + * Flushes specified cache storages + * + * Returns array of types which were flushed + * + * @param string[] $types + * @return string[] + */ + private function flush($types) + { + $result = []; + if (isset($this->request[self::KEY_FLUSH])) { + foreach ($types as $type) { + $frontend = $this->pool->get($type); + $backend = $frontend->getBackend(); + if (in_array($backend, $result, true)) { // it was already flushed from another frontend + continue; + } + $backend->clean(); + $result[$type] = $backend; + } + } + return array_keys($result); + } + + /** + * Presents summary about cache status + * + * @return array + */ + public function getStatusSummary() + { + $result = []; + foreach ($this->cacheTypeList->getTypes() as $type) { + $result[$type['id']] = $type['status']; + } + return $result; + } + + /** + * {@inheritdoc} + */ + public function catchException(App\Bootstrap $bootstrap, \Exception $exception) + { + return false; + } +} diff --git a/lib/internal/Magento/Framework/App/README.md b/lib/internal/Magento/Framework/App/README.md new file mode 100644 index 0000000000000000000000000000000000000000..6d56530498afb52e3b39503dd47e9dbfa3b308c2 --- /dev/null +++ b/lib/internal/Magento/Framework/App/README.md @@ -0,0 +1,16 @@ +# App + +**App** library provides a bootstrap of the Magento application and various components that support Magento application. The bootstrap is called from Magento entry point scripts, such as index.php. It uses this bootstrap to perform initialization routines – such as set preference of error handling, initialize autoloader, set profiling options, set default timezone, etc. + + * A few **entry point applications** that are provided in this library: + * HTTP - *\Magento\Framework\App\Http* implements the Magento HTTP application. + * Static Resource - *\Magento\Framework\App\StaticResource* is an application for retrieving static resources (e.g., CSS, JS, images). It allows postponing any actions with a file until it is requested. + * Cron - \Magento\Framework\App\Cron is an application for running some jobs by schedule. + +**Request dispatching** is supported in this library. *FrontController* is used as an interface for application. It accepts *RequestInterface* and sends a *ResponseInterface*. It requests routing with implementations of *RouterInterface* that can be configured as arguments for *RouterList*. Control is passed to *Router\DefaultRouter* when request is not matched by any router. *Router\NoRouteHandlerList* can be used to configure custom NoRoute handlers. After request matching router uses *ActionFactory* to create instances of *ActionInterface* responsible for request processing. *ActionInterface* implementations can use *ResponseFactory* to create instances of *ResponseInterface*. *Action\ActionAbstract* provides some basic behavior for application actions. *Action\Forward* is used for forwarding request to different action within same process. *Action\Redirect* is used to do redirects to different url. Response interfaces provided with this library: + + * \Magento\Framework\App\ResponseInterface - base response interface + * \Magento\Framework\App\Response\HttpInterface - response interface with methods specific for HTTP response + * \Magento\Framework\App\Response\FileInterface - HTTP response interface with methods specific for sending files content via HTTP request + +**Application Deployment Configuration** is supported in this library. It supports basic settings for Magento initializations and cache configuration \ No newline at end of file diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php index d77e3162d14636b9c2e4004afd8a5ad7fbf158aa..2424d2f5d21c16e94ff28eeb2bf0964f9b8e5663 100644 --- a/lib/internal/Magento/Framework/AppInterface.php +++ b/lib/internal/Magento/Framework/AppInterface.php @@ -35,7 +35,7 @@ interface AppInterface /** * Magento version */ - const VERSION = '0.1.0-alpha98'; + const VERSION = '0.1.0-alpha99'; /** * Launch application diff --git a/lib/internal/Magento/Framework/Autoload/IncludePath.php b/lib/internal/Magento/Framework/Autoload/IncludePath.php index 9c01fcad1a05216e91a1812ced032f565771880a..80c38299a8c48c80c80ca89bf853597ae19540cb 100644 --- a/lib/internal/Magento/Framework/Autoload/IncludePath.php +++ b/lib/internal/Magento/Framework/Autoload/IncludePath.php @@ -53,10 +53,7 @@ class IncludePath */ public function getFilePath($class) { - if (strpos($class, self::NS_SEPARATOR) !== false) { - $class = ltrim(str_replace(self::NS_SEPARATOR, '_', $class), '_'); - } - return str_replace('_', '/', $class) . '.php'; + return ltrim(str_replace(array('_',self::NS_SEPARATOR), '/', $class), '/') . '.php'; } /** diff --git a/lib/internal/Magento/Framework/Autoload/README.md b/lib/internal/Magento/Framework/Autoload/README.md new file mode 100644 index 0000000000000000000000000000000000000000..443b184586b58b0e44a1dbfb0b0cc564d76ccff2 --- /dev/null +++ b/lib/internal/Magento/Framework/Autoload/README.md @@ -0,0 +1,3 @@ +# Autoload + +**Autoload** library implements PSR-0 standard of autoloader with capability of class mapping in addition. The key benefit of a Class Map is that it includes files matched to their absolute system paths, which can lead to performance gains. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Code/README.md b/lib/internal/Magento/Framework/Code/README.md new file mode 100644 index 0000000000000000000000000000000000000000..6868b68e8d88129b15abf8bb4134bae4d2a754af --- /dev/null +++ b/lib/internal/Magento/Framework/Code/README.md @@ -0,0 +1,7 @@ +# Code + +**Code** library provides functionalities for processing code, including the following: +* Generating service entities - factories, proxies and interceptors. +* Minifying content +* Class, arguments reader +* Varies validators - arguments, constructor, context aggregation, type duplication diff --git a/lib/internal/Magento/Framework/Controller/README.md b/lib/internal/Magento/Framework/Controller/README.md new file mode 100644 index 0000000000000000000000000000000000000000..ec10676d5262067041adbd1d965f4e6c18e0f0c4 --- /dev/null +++ b/lib/internal/Magento/Framework/Controller/README.md @@ -0,0 +1,7 @@ +# Controller + +**Controller** library is responsible for HTTP response and creating route. + +* **Response** * Adapter for Zend Response class. Needed for DI + +* **Router** * Route Factory \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php index aefd1f9d1209e75475357b2ea78859ad2964fb26..1f61040165e04f8c35b9b51b737f163c43de7665 100644 --- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php +++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php @@ -40,7 +40,6 @@ class Constant implements InterpreterInterface if (!isset($data['value']) || !defined($data['value'])) { throw new \InvalidArgumentException('Constant name is expected.'); } - $constantName = $data['value']; - return constant($constantName); + return constant($data['value']); } } diff --git a/lib/internal/Magento/Framework/Data/Form/AbstractForm.php b/lib/internal/Magento/Framework/Data/Form/AbstractForm.php index 5729b7a4246874a9bcaecc0543a0add8a7040774..60ffc1764f872773f811a1876da4383a9bb123af 100644 --- a/lib/internal/Magento/Framework/Data/Form/AbstractForm.php +++ b/lib/internal/Magento/Framework/Data/Form/AbstractForm.php @@ -31,7 +31,7 @@ use Magento\Framework\Data\Form\Element\Factory; use Magento\Framework\Data\Form\Element\Fieldset; /** - * Abstract class for form, coumn and fieldset + * Abstract class for form, column and fieldset * * @author Magento Core Team <core@magentocommerce.com> */ diff --git a/lib/internal/Magento/Framework/Data/README.md b/lib/internal/Magento/Framework/Data/README.md new file mode 100644 index 0000000000000000000000000000000000000000..b8913069b396b3d5c5fa755c4338a7c658c36764 --- /dev/null +++ b/lib/internal/Magento/Framework/Data/README.md @@ -0,0 +1,39 @@ +# Data + +**Data** library provides support to form, data interpreters and some data structures that support database and layout + +## Form + +**Forms** hold entity data and provide way to render data out. This library provides a list of different type form elements. + +## Data Interpreters + +**Data interpreter** is responsible for computation of effective value, i.e. evaluation of input data. Each individual interpreter recognizes only one particular type of input data. *Magento\Framework\Data\Argument\Interpreter\Composite* is used to dynamically choose which of underlying interpreters to delegate evaluation to. Child interpreters can be registered in it via constructor and later on through the adder method of its public interface. Each sub-interpreter is associated with a unique name during adding to the composite. In order to make a decision of which interpreter to use, input data has to carry an extra metadata – data key carrying name of an interpreter to use. Metadata value is intended for the composite interpreter only, thus it's not passed down to underlying interpreters. Data interpreters are used for handling DI arguments and layout arguments. + +## Supported Data Structures + +### Data Collections + +**Data Collection** is traversable, countable, ordered list. Class *Magento\Framework\Data\Collection* is at the top of the collections hierarchy. Every collection in the system is its descendant, directly or indirectly. + + * Database Data Collections are used to load items from a database. Two fetching strategies are supported in this library: + * Cache fetching strategy - retrieve data from cache + * Query fetching strategy - retrieve data from database + + * Filesystem Data Collection is used to scan a folder for files and/or folders. + +### DataArray + +**DataArray** is data container with array access. + +### Graph + +**Graph** is a graph data structure with some basic validation of nodes and search features. + +### Tree + +**Tree** is a tree data structure. It is used to hold database data. + +### Structure + +**Structure** is a hierarchical data structure of elements. A structure contains elements; elements can be grouped into groups under the structure. It is used in layout. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Event/README.md b/lib/internal/Magento/Framework/Event/README.md new file mode 100644 index 0000000000000000000000000000000000000000..b79de1d8f6b0bda1c2dc41e45cb9f3b0ad63e73c --- /dev/null +++ b/lib/internal/Magento/Framework/Event/README.md @@ -0,0 +1,9 @@ +# Event + +**Event** library provides supports for Magento events. + + * Event manager is responsible for event configuration processing and event dispatching. All client code that dispatches events must ask for \Magento\Framework\Event\Manager in constructor. + * Event config provides interface to retrieve related observers configuration by specified event name. + * Event observer object passes data from the code that fires the event to the observer function. There are two special types of observer objects supported in this library: Cron, and Regex. Each one has its own unique functionality in addition to basic observer functionality. + + diff --git a/lib/internal/Magento/Framework/Exception/README.md b/lib/internal/Magento/Framework/Exception/README.md new file mode 100644 index 0000000000000000000000000000000000000000..4b0d4fbbaf421cd8623ff2383fe9f0fdeeb25d0b --- /dev/null +++ b/lib/internal/Magento/Framework/Exception/README.md @@ -0,0 +1,6 @@ +#Exception + +* Classes that extend the base Exception class represent types of Exceptions. +* All Exception classes extend, directly or indirectly, LocalizedException. Thus, error messages can be localized. +* Several Exception classes extend, directly or indirectly, AbstractAggregateException. This allows them to store ErrorMessage objects. +* The ErrorMessage class stores and renders localized error information. diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php index fd2ddb19e18b543ee005fcb79f19aa043051f8a9..e978ee2350f1c58b5a01587053c8b9981f0b8c8a 100644 --- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php +++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php @@ -245,7 +245,7 @@ class PluginList extends Scoped implements InterceptionPluginList public function getNext($type, $method, $code = '__self') { $this->_loadScopedData(); - if (!array_key_exists($type, $this->_inherited)) { + if (!isset($this->_inherited[$type]) && !array_key_exists($type, $this->_inherited)) { $this->_inheritPlugins($type); } $key = $type . '_' . lcfirst($method) . '_' . $code; diff --git a/lib/internal/Magento/Framework/Locale/README.md b/lib/internal/Magento/Framework/Locale/README.md new file mode 100644 index 0000000000000000000000000000000000000000..0785a09cd518d4ffbb1aeb71d6dabb37c9d358ae --- /dev/null +++ b/lib/internal/Magento/Framework/Locale/README.md @@ -0,0 +1,4 @@ +#Locale +* Contains logic to handle currency and number formatting based on locale. +* Provides access to locale information translated into given languages. +* Manages locale information for a store instance. diff --git a/lib/internal/Magento/Framework/Logger/README.md b/lib/internal/Magento/Framework/Logger/README.md new file mode 100644 index 0000000000000000000000000000000000000000..09eb8ee4505ef1e520742128ba8b5603b76ec71d --- /dev/null +++ b/lib/internal/Magento/Framework/Logger/README.md @@ -0,0 +1,5 @@ +# Logger + +**Logger** provides a standard mechanism to log to system and error logs. + +* **Adapter** will filter out debug information. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Message/README.md b/lib/internal/Magento/Framework/Message/README.md new file mode 100644 index 0000000000000000000000000000000000000000..40ae8358e8b19896b8440669258152595b68b554 --- /dev/null +++ b/lib/internal/Magento/Framework/Message/README.md @@ -0,0 +1,3 @@ +# Message + +**Message** library is responsible for message creation and management. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Model/README.md b/lib/internal/Magento/Framework/Model/README.md new file mode 100644 index 0000000000000000000000000000000000000000..0f5eb1761169f43cbb3f2d4892e35aba4d8ea3c3 --- /dev/null +++ b/lib/internal/Magento/Framework/Model/README.md @@ -0,0 +1,3 @@ +# Model + +**Model** library provides support for MVC models, model context, and storing and retrieving models to the database. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Module/README.md b/lib/internal/Magento/Framework/Module/README.md new file mode 100644 index 0000000000000000000000000000000000000000..ac37b9e5e9156c1edd68785e9c846b40500565f2 --- /dev/null +++ b/lib/internal/Magento/Framework/Module/README.md @@ -0,0 +1,9 @@ +# Module + +Magento\Framework\Module is Magento framework component that allows to build modular applications with Magento Framework. It serves as an add-on to Magento\Framework\App component, and provides following features: + + * configuration reader and format with module versions, dependencies, and state (active/inactive) + * module manager that provides all information about loaded modules + * directory reader, that allows to read configuration files from module + * ability to turn on/off module output in separate configuration application + * module db schema/data installers \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Object/README.md b/lib/internal/Magento/Framework/Object/README.md new file mode 100644 index 0000000000000000000000000000000000000000..624c4e759be418761c27b8f013949b30053e13eb --- /dev/null +++ b/lib/internal/Magento/Framework/Object/README.md @@ -0,0 +1,4 @@ +# Object + +**Object** library contains functionality for mapping, management and the creation of dynamic member objects. +This also includes the objects which merge, read and make available xml configurations. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Factory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Factory.php index 7077e7ae27af77fd1f0adabaed40ae9c620ede36..f0119ed86e1d17bf6b50081923a6e9fb820d99cf 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Factory/Factory.php +++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Factory.php @@ -104,7 +104,7 @@ class Factory implements \Magento\Framework\ObjectManager\Factory foreach ($parameters as $parameter) { list($paramName, $paramType, $paramRequired, $paramDefault) = $parameter; $argument = null; - if (array_key_exists($paramName, $arguments)) { + if (!empty($arguments) && (isset($arguments[$paramName]) || array_key_exists($paramName, $arguments))) { $argument = $arguments[$paramName]; } else if ($paramRequired) { if ($paramType) { @@ -118,22 +118,22 @@ class Factory implements \Magento\Framework\ObjectManager\Factory } else { $argument = $paramDefault; } - if ($paramType && !is_object($argument) && $argument !== $paramDefault) { - if (!is_array($argument) || !isset($argument['instance'])) { + if ($paramType && $argument !== $paramDefault && !is_object($argument)) { + if (!isset($argument['instance']) || !is_array($argument)) { throw new \UnexpectedValueException( 'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType ); } $argumentType = $argument['instance']; - $isShared = (isset($argument['shared']) ? $argument['shared'] :$this->config->isShared($argumentType)); + $isShared = (isset($argument['shared']) ? $argument['shared'] : $this->config->isShared($argumentType)); $argument = $isShared ? $this->objectManager->get($argumentType) : $this->objectManager->create($argumentType); } else if (is_array($argument)) { if (isset($argument['argument'])) { - $argKey = $argument['argument']; - $argument = - isset($this->globalArguments[$argKey]) ? $this->globalArguments[$argKey] : $paramDefault; + $argument = isset($this->globalArguments[$argument['argument']]) + ? $this->globalArguments[$argument['argument']] + : $paramDefault; } else if (!empty($argument)) { $this->parseArray($argument); } diff --git a/lib/internal/Magento/Framework/ObjectManager/README.md b/lib/internal/Magento/Framework/ObjectManager/README.md new file mode 100644 index 0000000000000000000000000000000000000000..5fccda9eaad7530f5b6e631e49e8b8d3544093a6 --- /dev/null +++ b/lib/internal/Magento/Framework/ObjectManager/README.md @@ -0,0 +1,3 @@ +# ObjectManager + +**ObjectManager** library is responsible for constructing objects and injecting dependencies based on module di.xml files. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Phrase/README.md b/lib/internal/Magento/Framework/Phrase/README.md new file mode 100644 index 0000000000000000000000000000000000000000..9024d6c5bb29d3806a979904d50363e4b52d1433 --- /dev/null +++ b/lib/internal/Magento/Framework/Phrase/README.md @@ -0,0 +1,8 @@ +# Phase + +Class *\Magento\Framework\Phrase* calls renderer to make the translation of the text. **Phase** provides *RedererInterface* and a few renderers to support different kinds of needs of translation of the text. Here are list of renderers in this library: + + * Translate render - it is a base renderer that implements text translations. + * Inline render - it adds inline translate part to text translation and returns the strings by a template. + * Placeholder render - it replaces placeholders with parameters for substitution. + * Composite render - it can have several renderers, calls each renderer for processing the text. Array of renderer class names pass into composite render constructor as a parameter. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php index 8af39b9b05afd2d4ecb7fa1951971772cb913cc7..1796209d24e9e56c7674507d747b09d9359aebf9 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php @@ -25,8 +25,9 @@ namespace Magento\Framework\Search\Adapter\Mysql; use Magento\Framework\App\Resource; use Magento\Framework\DB\Select; -use Magento\Framework\Search\RequestInterface; use Magento\Framework\Search\AdapterInterface; +use Magento\Framework\Search\RequestInterface; +use \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder; /** * MySQL Search Adapter @@ -52,19 +53,27 @@ class Adapter implements AdapterInterface */ private $resource; + /** + * @var AggregationBuilder + */ + private $aggregationBuilder; + /** * @param Mapper $mapper * @param ResponseFactory $responseFactory - * @param \Magento\Framework\App\Resource $resource + * @param Resource $resource + * @param AggregationBuilder $aggregationBuilder */ public function __construct( Mapper $mapper, ResponseFactory $responseFactory, - Resource $resource + Resource $resource, + AggregationBuilder $aggregationBuilder ) { $this->mapper = $mapper; $this->responseFactory = $responseFactory; $this->resource = $resource; + $this->aggregationBuilder = $aggregationBuilder; } /** @@ -74,38 +83,24 @@ class Adapter implements AdapterInterface { /** @var Select $query */ $query = $this->mapper->buildQuery($request); + $documents = $this->executeQuery($query); + + $aggregations = $this->aggregationBuilder->build($request, $documents); $response = [ - 'documents' => $this->executeDocuments($query), - 'aggregations' => $this->executeAggregations($query), + 'documents' => $documents, + 'aggregations' => $aggregations, ]; return $this->responseFactory->create($response); } /** * Executes query and return raw response - * @param Select $select * - * @return array - */ - private function executeDocuments(Select $select) - { - return $this->getConnection()->fetchAssoc($select); - } - - /** * @param Select $select * @return array */ - private function executeAggregations(Select $select) - { - return []; - } - - /** - * @return \Magento\Framework\DB\Adapter\AdapterInterface - */ - private function getConnection() + private function executeQuery(Select $select) { - return $this->resource->getConnection(Resource::DEFAULT_READ_RESOURCE); + return $this->resource->getConnection(Resource::DEFAULT_READ_RESOURCE)->fetchAssoc($select); } } diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php new file mode 100644 index 0000000000000000000000000000000000000000..adbeeaa21cf8c71aec319ab7e24ff8a4585a4db2 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php @@ -0,0 +1,128 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation; + +use Magento\Framework\App\Resource; +use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\Container as AggregationContainer; +use Magento\Framework\Search\EntityMetadata; +use Magento\Framework\Search\RequestInterface; +use Magento\Framework\DB\Select; + +class Builder +{ + /** + * @var DataProviderContainer + */ + private $dataProviderContainer; + + /** + * @var Builder\Container + */ + private $aggregationContainer; + + /** + * @var EntityMetadata + */ + private $entityMetadata; + + /** + * @var Resource + */ + private $resource; + + /** + * @param Resource $resource + * @param DataProviderContainer $dataProviderContainer + * @param Builder\Container $aggregationContainer + * @param EntityMetadata $entityMetadata + */ + public function __construct( + Resource $resource, + DataProviderContainer $dataProviderContainer, + AggregationContainer $aggregationContainer, + EntityMetadata $entityMetadata + ) { + $this->dataProviderContainer = $dataProviderContainer; + $this->aggregationContainer = $aggregationContainer; + $this->entityMetadata = $entityMetadata; + $this->resource = $resource; + } + + /** + * @param RequestInterface $request + * @param int[] $documents + * @return array + */ + public function build(RequestInterface $request, array $documents) + { + $entityIds = $this->getEntityIds($documents); + + return $this->processAggregations($request, $entityIds); + } + + /** + * @param array $documents + * @return int[] + */ + private function getEntityIds($documents) + { + $fieldName = $this->entityMetadata->getEntityId(); + $entityIds = []; + foreach ($documents as $document) { + $entityIds[] = $document[$fieldName]; + } + return $entityIds; + } + + /** + * Executes query and return raw response + * + * @param Select $select + * @return array + */ + private function executeQuery(Select $select) + { + return $this->resource->getConnection(Resource::DEFAULT_READ_RESOURCE)->fetchAssoc($select); + } + + /** + * @param RequestInterface $request + * @param int[] $entityIds + * @return array + */ + private function processAggregations(RequestInterface $request, array $entityIds) + { + $aggregations = []; + $buckets = $request->getAggregation(); + $dataProvider = $this->dataProviderContainer->get($request->getIndex()); + foreach ($buckets as $bucket) { + $aggregationBuilder = $this->aggregationContainer->get($bucket->getType()); + + $select = $dataProvider->getDataSet($bucket, $request); + $select = $aggregationBuilder->build($select, $bucket, $entityIds); + $aggregations[$bucket->getName()] = $this->executeQuery($select); + } + return $aggregations; + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..dce4b2a4244c92e553a3f5bacb6284e888232f83 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php @@ -0,0 +1,38 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\Framework\DB\Select; +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; + +interface BucketInterface +{ + /** + * @param Select $baseQuery + * @param RequestBucketInterface $bucket + * @param array $entityIds + * @return Select + */ + public function build(Select $baseQuery, RequestBucketInterface $bucket, array $entityIds); +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php new file mode 100644 index 0000000000000000000000000000000000000000..d5a2901d1b18fa675dca61f7852730c7b15965cd --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php @@ -0,0 +1,49 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +class Container +{ + /** + * @var BucketInterface[] + */ + private $buckets; + + /** + * @param BucketInterface[] $buckets + */ + public function __construct(array $buckets) + { + $this->buckets = $buckets; + } + + /** + * @param string $bucketType + * @return BucketInterface + */ + public function get($bucketType) + { + return $this->buckets[$bucketType]; + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php new file mode 100644 index 0000000000000000000000000000000000000000..a6f7e1884ba1bb1d3aec6fb43b69247cb2365e68 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php @@ -0,0 +1,40 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\Framework\DB\Select; +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; + +class Dynamic implements BucketInterface +{ + /** + * {@inheritdoc} + */ + public function build(Select $baseQuery, RequestBucketInterface $bucket, array $entityIds) + { + $baseQuery->where('main_table.entity_id IN (?)', $entityIds); + $baseQuery->columns(['count' => 'COUNT(*)']); // TODO: Use dynamic algorithms + $baseQuery->group(RequestBucketInterface::FIELD_VALUE); + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php new file mode 100644 index 0000000000000000000000000000000000000000..2db1bd51866e435ddae6c6a0b465882badb2a2b1 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php @@ -0,0 +1,58 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; + +class Metrics +{ + /** + * Available metrics + * + * @var string[] + */ + private $mapMetrics = ['count', 'sum', 'min', 'max', 'avg']; + + /** + * Build metrics for Select->columns + * + * @param RequestBucketInterface $bucket + * @return string[] + */ + public function build(RequestBucketInterface $bucket) + { + $selectAggregations = []; + /** @var \Magento\Framework\Search\Request\Aggregation\Metric[] $metrics */ + $metrics = $bucket->getMetrics(); + + foreach ($metrics as $metric) { + $metricType = $metric->getType(); + if (in_array($metricType, $this->mapMetrics)) { + $selectAggregations[$metricType] = "$metricType(main_table.value)"; + } + } + + return $selectAggregations; + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php new file mode 100644 index 0000000000000000000000000000000000000000..d8c021625932a839ad3fc084e9c1d657fc2ee4e7 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php @@ -0,0 +1,111 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\Framework\App\Resource; +use Magento\Framework\DB\Select; +use Magento\Framework\Search\Request\Aggregation\Range as AggregationRange; +use Magento\Framework\Search\Request\Aggregation\RangeBucket; +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; + +class Range implements BucketInterface +{ + const GREATER_THAN = '>='; + const LOWER_THAN = '<'; + + /** + * @var Metrics + */ + private $metricsBuilder; + /** + * @var Resource + */ + private $resource; + + /** + * @param Metrics $metricsBuilder + * @param Resource $resource + */ + public function __construct(Metrics $metricsBuilder, Resource $resource) + { + $this->metricsBuilder = $metricsBuilder; + $this->resource = $resource; + } + + /** + * {@inheritdoc} + */ + public function build(Select $baseQuery, RequestBucketInterface $bucket, array $entityIds) + { + /** @var RangeBucket $bucket */ + $metrics = $this->metricsBuilder->build($bucket); + + $baseQuery->where('main_table.entity_id IN (?)', $entityIds); + + /** @var Select $fullQuery */ + $fullQuery = $this->getConnection()->select(); + $fullQuery->from(['main_table' => $baseQuery], null); + $fullQuery = $this->generateCase($fullQuery, $bucket->getRanges()); + $fullQuery->columns($metrics); + $fullQuery->group(RequestBucketInterface::FIELD_VALUE); + + return $fullQuery; + } + + /** + * @return \Magento\Framework\DB\Adapter\AdapterInterface + */ + private function getConnection() + { + return $this->resource->getConnection(Resource::DEFAULT_READ_RESOURCE); + } + + /** + * @param Select $select + * @param AggregationRange[] $ranges + * @return Select + */ + private function generateCase(Select $select, array $ranges) + { + $casesResults = []; + $field = RequestBucketInterface::FIELD_VALUE; + foreach ($ranges as $range) { + $from = $range->getFrom(); + $to = $range->getTo(); + if ($from && $to) { + $casesResults = array_merge( + $casesResults, + ["`{$field}` BETWEEN {$from} AND {$to}" => "'{$from}_{$to}'"] + ); + } elseif ($from && !$to) { + $casesResults = array_merge($casesResults, ["`{$field}` >= {$from}" => "'{$from}_*'"]); + } elseif (!$from && $to) { + $casesResults = array_merge($casesResults, ["`{$field}` < {$to}" => "'*_{$to}'"]); + } + } + $cases = $this->getConnection()->getCaseSql('', $casesResults); + $select->columns([RequestBucketInterface::FIELD_VALUE => $cases]); + return $select; + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php new file mode 100644 index 0000000000000000000000000000000000000000..acee91575b2995f98e62167a1040e4465303adad --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php @@ -0,0 +1,57 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder; + +use Magento\Framework\DB\Select; +use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; + +class Term implements BucketInterface +{ + /** + * @var Metrics + */ + private $metricsBuilder; + + /** + * @param Metrics $metricsBuilder + */ + public function __construct(Metrics $metricsBuilder) + { + $this->metricsBuilder = $metricsBuilder; + } + + /** + * {@inheritdoc} + */ + public function build(Select $baseQuery, RequestBucketInterface $bucket, array $entityIds) + { + $metrics = $this->metricsBuilder->build($bucket); + + $baseQuery->where('main_table.entity_id IN (?)', $entityIds); + $baseQuery->columns($metrics); + $baseQuery->group(RequestBucketInterface::FIELD_VALUE); + + return $baseQuery; + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php new file mode 100644 index 0000000000000000000000000000000000000000..305c9f19f83ffbc2af3b82309692e5dba639f653 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php @@ -0,0 +1,49 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation; + +class DataProviderContainer +{ + /** + * @var DataProviderInterface[] + */ + private $dataProvider; + + /** + * @param DataProviderInterface[] $dataProviders + */ + public function __construct(array $dataProviders) + { + $this->dataProvider = $dataProviders; + } + + /** + * @param string $indexName + * @return DataProviderInterface + */ + public function get($indexName) + { + return $this->dataProvider[$indexName]; + } +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..366ba1df1b6d7f6f10dbaaa103558d31cd3265c2 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php @@ -0,0 +1,38 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Adapter\Mysql\Aggregation; + +use Magento\Framework\DB\Select; +use Magento\Framework\Search\Request\BucketInterface; +use Magento\Framework\Search\RequestInterface; + +interface DataProviderInterface +{ + /** + * @param BucketInterface $bucket + * @param RequestInterface $request + * @return Select + */ + public function getDataSet(BucketInterface $bucket, RequestInterface $request); +} diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php index 5c3f84a7612afed22ee25c2c62a10f5fdfe818f2..314060f2d756ecc14356f425425baa9bee24bf2a 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php @@ -38,31 +38,51 @@ class AggregationFactory /** * @param \Magento\Framework\ObjectManager $objectManager */ - public function __construct( - \Magento\Framework\ObjectManager $objectManager - ) { + public function __construct(\Magento\Framework\ObjectManager $objectManager) + { $this->objectManager = $objectManager; } /** * Create Aggregation instance * - * @param mixed $rawAggregation - * @return \Magento\Framework\Search\Aggregation + * @param array $rawAggregation + * @return \Magento\Framework\Search\Response\Aggregation */ - public function create($rawAggregation) + public function create(array $rawAggregation) { $buckets = array(); - foreach ($rawAggregation as $rawBucket) { - /** @var \Magento\Framework\Search\Bucket[] $buckets */ - $buckets[] = $this->objectManager->create( - '\Magento\Framework\Search\Bucket', + foreach ($rawAggregation as $rawBucketName => $rawBucket) { + /** @var \Magento\Framework\Search\Response\Bucket[] $buckets */ + $buckets[$rawBucketName] = $this->objectManager->create( + 'Magento\Framework\Search\Response\Bucket', + [ + 'name' => $rawBucketName, + 'values' => $this->prepareValues((array)$rawBucket) + ] + ); + } + return $this->objectManager->create('\Magento\Framework\Search\Response\Aggregation', ['buckets' => $buckets]); + } + + /** + * Prepare values list + * + * @param array $values + * @return \Magento\Framework\Search\Response\Aggregation\Value[] + */ + private function prepareValues(array $values) + { + $valuesObjects = []; + foreach ($values as $name => $value) { + $valuesObjects[] = $this->objectManager->create( + 'Magento\Framework\Search\Response\Aggregation\Value', [ - $rawBucket['name'], - $rawBucket['value'] + 'value' => $name, + 'metrics' => $value, ] ); } - return $this->objectManager->create('\Magento\Framework\Search\Aggregation', ['buckets' => $buckets]); + return $valuesObjects; } } diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Dimensions.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Dimensions.php index 578e8a34bd3e1920a3230b6e0f6aa2bd5628c249..fec13ce28db5b38e1b28e5bb384111adc69b6440 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Dimensions.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Dimensions.php @@ -29,14 +29,13 @@ use Magento\Framework\Search\Request\Dimension; class Dimensions { - const DEFAULT_DIMENSION_NAME = 'scope'; - const STORE_FIELD_NAME = 'store_id'; /** * @var ScopeResolverInterface */ private $scopeResolver; + /** * @var ConditionManager */ @@ -72,7 +71,7 @@ class Dimensions $field = $dimension->getName(); $value = $dimension->getValue(); - if (self::DEFAULT_DIMENSION_NAME === $field) { + if (Dimension::SCOPE === $field) { $field = self::STORE_FIELD_NAME; $value = $this->scopeResolver->getScope($value)->getId(); } diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php index c8d2d27fef0c328bb7dd6661dd0279e1b4537d29..5106b706053c60ffbd3e4a84b4578e86c7d73f51 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php @@ -34,21 +34,22 @@ class DocumentFactory * @var \Magento\Framework\ObjectManager */ protected $objectManager; + /** * @var \Magento\Framework\Search\EntityMetadata */ - private $entityId; + private $entityMetadata; /** * @param \Magento\Framework\ObjectManager $objectManager - * @param \Magento\Framework\Search\EntityMetadata $entityId + * @param \Magento\Framework\Search\EntityMetadata $entityMetadata */ public function __construct( \Magento\Framework\ObjectManager $objectManager, - \Magento\Framework\Search\EntityMetadata $entityId + \Magento\Framework\Search\EntityMetadata $entityMetadata ) { $this->objectManager = $objectManager; - $this->entityId = $entityId; + $this->entityMetadata = $entityMetadata; } /** @@ -62,7 +63,7 @@ class DocumentFactory /** @var \Magento\Framework\Search\DocumentField[] $fields */ $fields = []; $documentId = null; - $entityId = $this->entityId->getEntityId(); + $entityId = $this->entityMetadata->getEntityId(); foreach ($rawDocument as $rawField) { if ($rawField['name'] == $entityId) { $documentId = $rawField['value']; diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php index 25f71db383e0f2b86d128c918283ac9be3d52d95..28f013cdbc675570e46335e38e3ebed9d4a1a545 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php @@ -23,8 +23,6 @@ */ namespace Magento\Framework\Search\Adapter\Mysql; -use Magento\Framework\Search\QueryResponse; - /** * Response Factory */ @@ -70,7 +68,7 @@ class ResponseFactory * Create Query Response instance * * @param mixed $rawResponse - * @return QueryResponse + * @return \Magento\Framework\Search\Response\QueryResponse */ public function create($rawResponse) { @@ -80,10 +78,10 @@ class ResponseFactory /** @var \Magento\Framework\Search\Document[] $documents */ $documents[] = $this->documentFactory->create($rawDocument); } - /** @var \Magento\Framework\Search\Aggregation $aggregations */ + /** @var \Magento\Framework\Search\Response\Aggregation $aggregations */ $aggregations = $this->aggregationFactory->create($rawResponse['aggregations']); return $this->objectManager->create( - '\Magento\Framework\Search\QueryResponse', + '\Magento\Framework\Search\Response\QueryResponse', [ 'documents' => $documents, 'aggregations' => $aggregations diff --git a/lib/internal/Magento/Framework/Search/AdapterInterface.php b/lib/internal/Magento/Framework/Search/AdapterInterface.php index 33d98c49f52ad216388b6e0fab913181febf0533..82efe0027fd059e58e942440094f6f5c805fec88 100644 --- a/lib/internal/Magento/Framework/Search/AdapterInterface.php +++ b/lib/internal/Magento/Framework/Search/AdapterInterface.php @@ -23,6 +23,8 @@ */ namespace Magento\Framework\Search; +use Magento\Framework\Search\Response\QueryResponse; + /** * Search Adapter interface */ diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Algorithm.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php similarity index 58% rename from app/code/Magento/Catalog/Model/Layer/Filter/Price/Algorithm.php rename to lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php index 672a82467c1987429358fab909f1f570a2e51be1..d85c2bc7bc274fa0db5654ffc9ca11cd0bc4e4ca 100644 --- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Algorithm.php +++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php @@ -21,15 +21,21 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Catalog\Model\Layer\Filter\Price; +namespace Magento\Framework\Search\Dynamic; + /** - * Algorithm for layer price filter + * Algorithm for layer value filter * * @author Magento Core Team <core@magentocommerce.com> */ class Algorithm { + /** + * Minimal possible value + */ + const MIN_POSSIBLE_VALUE = .01; + /** * Rounding factor coefficient */ @@ -54,14 +60,14 @@ class Algorithm const MAX_INTERVALS_NUMBER = 10; /** - * Upper prices limit + * Upper values limit * * @var null|float */ protected $_upperLimit = null; /** - * Lower prices limit + * Lower values limit * * @var null|float */ @@ -82,19 +88,12 @@ class Algorithm protected $_skippedQuantilesUpperLimits = array(); /** - * Total count of prices + * Total count of values * * @var int */ protected $_count = 0; - /** - * Prices model - * - * @var null|\Magento\Catalog\Model\Layer\Filter\Price - */ - protected $_pricesModel = null; - /** * Current quantile interval * @@ -103,39 +102,52 @@ class Algorithm protected $_quantileInterval = array(0, 0); /** - * Prices of current quantile + * Values of current quantile * * @var array */ - protected $_prices = array(); + protected $_values = array(); /** - * Max price + * Max value * * @var float */ - protected $_maxPrice = 0; + protected $_maxValue = 0; /** - * Min price + * Min value * * @var float */ - protected $_minPrice = 0; + protected $_minValue = 0; /** - * Last price query limiter + * Last value query limiter * * @var array [index, value] */ - protected $_lastPriceLimiter = array(null, 0); + protected $_lastValueLimiter = array(null, 0); + + /** + * @var IntervalInterface + */ + private $interval; + + /** + * @param IntervalFactory $intervalFactory + */ + public function __construct(IntervalFactory $intervalFactory) + { + $this->interval = $intervalFactory->create(); + } /** * Set lower and upper limit for algorithm * * @param null|float $lowerLimit * @param null|float $upperLimit - * @return \Magento\Catalog\Model\Layer\Filter\Price\Algorithm + * @return \Magento\Framework\Search\Dynamic\Algorithm */ public function setLimits($lowerLimit = null, $upperLimit = null) { @@ -145,49 +157,7 @@ class Algorithm } /** - * Search first index of price, that satisfy conditions to be 'greater or equal' than $value - * Returns -1 if index was not found - * - * @param float $value - * @param null|float[] $limits search [from, to] - * @return int - */ - protected function _binarySearch($value, $limits = null) - { - if (empty($this->_prices)) { - return -1; - } - - if (!is_array($limits)) { - $limits = array(); - } - if (!isset($limits[0])) { - $limits[0] = 0; - } - if (!isset($limits[1])) { - $limits[1] = count($this->_prices) - 1; - } - - if ($limits[0] > $limits[1] || $this->_prices[$limits[1]] < $value) { - return -1; - } - - if ($limits[1] - $limits[0] <= 1) { - return $this->_prices[$limits[0]] < $value ? $limits[1] : $limits[0]; - } - - $separator = floor(($limits[0] + $limits[1]) / 2); - if ($this->_prices[$separator] < $value) { - $limits[0] = $separator + 1; - } else { - $limits[1] = $separator; - } - - return $this->_binarySearch($value, array($limits[0], $limits[1])); - } - - /** - * Set prices statistics + * Set statistics * * @param float $min * @param float $max @@ -198,11 +168,11 @@ class Algorithm public function setStatistics($min, $max, $standardDeviation, $count) { $this->_count = $count; - $this->_minPrice = $min; - $this->_maxPrice = $max; - $priceRange = $max - $min; - if ($count < 2 || $priceRange <= 0) { - //Same price couldn't be separated with several intervals + $this->_minValue = $min; + $this->_maxValue = $max; + $valueRange = $max - $min; + if ($count < 2 || $valueRange <= 0) { + //Same value couldn't be separated with several intervals $this->_intervalsNumber = 1; return $this; } @@ -210,7 +180,7 @@ class Algorithm if ($standardDeviation <= 0) { $intervalsNumber = pow(10, self::TEN_POWER_ROUNDING_FACTOR); } else { - $intervalsNumber = $priceRange * pow($count, 1 / 3) / (3.5 * $standardDeviation); + $intervalsNumber = $valueRange * pow($count, 1 / 3) / (3.5 * $standardDeviation); } $this->_intervalsNumber = max(ceil($intervalsNumber), self::MIN_INTERVALS_NUMBER); $this->_intervalsNumber = (int)min($this->_intervalsNumber, self::MAX_INTERVALS_NUMBER); @@ -219,246 +189,277 @@ class Algorithm } /** - * Set prices model + * Calculate separators, each contains 'from', 'to' and 'count' * - * @param \Magento\Catalog\Model\Layer\Filter\Price $pricesModel - * @return $this + * @return array */ - public function setPricesModel($pricesModel) + public function calculateSeparators() { - $this->_pricesModel = $pricesModel; - return $this; - } + $result = array(); + $lastCount = 0; + $intervalFirstValue = $this->_minValue; + $lastSeparator = is_null($this->_lowerLimit) ? 0 : $this->_lowerLimit; - /** - * Get amount of segmentation intervals - * - * @return int - */ - public function getIntervalsNumber() - { - if (!is_null($this->_intervalsNumber)) { - return $this->_intervalsNumber; - } + for ($intervalNumber = 1; $intervalNumber < $this->getIntervalsNumber(); ++$intervalNumber) { + $separator = $this->_findValueSeparator($intervalNumber); + if (empty($separator)) { + continue; + } + if ($this->_quantileInterval[0] == 0) { + $intervalFirstValue = $this->_values[0]; + } + $separatorCandidate = false; + $newIntervalFirstValue = $intervalFirstValue; + $newLastSeparator = $lastSeparator; - return 1; - } + $valuesPerInterval = $this->_count / $this->_getCalculatedIntervalsNumber(); + while (!empty($separator) && !array_key_exists($intervalNumber, $result)) { + $separatorsPortion = array_shift($separator); + $bestSeparator = $this->_findBestSeparator($intervalNumber, $separatorsPortion); + if ($bestSeparator && $bestSeparator[2] > 0) { + $isEqualValue = $intervalFirstValue == + $this->_values[$bestSeparator[2] - 1] ? $this->_values[0] : false; + $count = $bestSeparator[2] + $this->_quantileInterval[0] - $lastCount; + $separatorData = array( + 'from' => $isEqualValue !== false ? $isEqualValue : $lastSeparator, + 'to' => $isEqualValue !== false ? $isEqualValue : $bestSeparator[1], + 'count' => $count + ); + if (abs(1 - $count / $valuesPerInterval) <= self::INTERVAL_DEFLECTION_LIMIT) { + $newLastSeparator = $bestSeparator[1]; + $newIntervalFirstValue = $this->_values[$bestSeparator[2]]; + $result[$intervalNumber] = $separatorData; + } elseif (!$separatorCandidate || $bestSeparator[0] < $separatorCandidate[0]) { + $separatorCandidate = array( + $bestSeparator[0], + $separatorData, + $bestSeparator[1], + $this->_values[$bestSeparator[2]] + ); + } + } + } - /** - * Get intervals number with checking skipped quantiles - * - * @return int - */ - protected function _getCalculatedIntervalsNumber() - { - return max(1, $this->getIntervalsNumber() - count($this->_skippedQuantilesUpperLimits)); - } + if (!array_key_exists($intervalNumber, $result) && $separatorCandidate) { + $newLastSeparator = $separatorCandidate[2]; + $newIntervalFirstValue = $separatorCandidate[3]; + $result[$intervalNumber] = $separatorCandidate[1]; + } - /** - * Get quantile - * - * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals - * @return float|null - */ - protected function _getQuantile($quantileNumber) - { - if ($quantileNumber < 1 || $quantileNumber >= $this->getIntervalsNumber()) { - return 0; + if (array_key_exists($intervalNumber, $result)) { + $lastSeparator = $newLastSeparator; + $intervalFirstValue = $newIntervalFirstValue; + $valueIndex = $this->_binarySearch($lastSeparator); + $lastCount += $result[$intervalNumber]['count']; + if ($valueIndex != -1 && $lastSeparator > $this->_lastValueLimiter[1]) { + $this->_lastValueLimiter = array($valueIndex + $this->_quantileInterval[0], $lastSeparator); + } + } } - - return $quantileNumber * $this->_count / $this->getIntervalsNumber() - .5; - } - - /** - * Get quantile interval - * - * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals - * @return null|float[] [floatMin,floatMax] - */ - protected function _getQuantileInterval($quantileNumber) - { - if ($quantileNumber < 1 || $quantileNumber >= $this->getIntervalsNumber()) { - return null; + if ($this->_lastValueLimiter[0] < $this->_count) { + $isEqualValue = $intervalFirstValue == $this->_maxValue ? $intervalFirstValue : false; + $result[$this->getIntervalsNumber()] = array( + 'from' => $isEqualValue ? $isEqualValue : $lastSeparator, + 'to' => $isEqualValue ? $isEqualValue : (is_null($this->_upperLimit) ? '' : $this->_upperLimit), + 'count' => $this->_count - $lastCount + ); } - $quantile = $this->_getQuantile($quantileNumber); - $deflectionLimit = floor($this->_count / 2 / $this->getIntervalsNumber()); - $limits = array( - min(floor($quantile - $deflectionLimit), floor($quantile)), - max(ceil($quantile + $deflectionLimit - 1), ceil($quantile)) - ); - $deflection = self::STANDARD_NORMAL_DISTRIBUTION * sqrt( - $this->_count * $quantileNumber * ($this->getIntervalsNumber() - $quantileNumber) - ) / $this->getIntervalsNumber(); - $left = max(floor($quantile - $deflection - 1), $limits[0], 0); - if (array_key_exists( - $quantileNumber - 1, - $this->_skippedQuantilesUpperLimits - ) && $left > $this->_skippedQuantilesUpperLimits[$quantileNumber - 1] - ) { - $left = $this->_skippedQuantilesUpperLimits[$quantileNumber - 1]; - } - $right = min(ceil($quantile + $deflection), $limits[1], $this->_count - 1); - return array($left, $right); + return array_values($result); } /** - * Merge new round prices with old ones + * Get amount of segmentation intervals * - * @param array &$oldRoundPrices - * @param array &$newRoundPrices - * @return void + * @return int */ - protected function _mergeRoundPrices(&$oldRoundPrices, &$newRoundPrices) + public function getIntervalsNumber() { - foreach ($newRoundPrices as $roundingFactor => $roundPriceValues) { - if (array_key_exists($roundingFactor, $oldRoundPrices)) { - $oldRoundPrices[$roundingFactor] = array_unique( - array_merge($oldRoundPrices[$roundingFactor], $roundPriceValues) - ); - } else { - $oldRoundPrices[$roundingFactor] = $roundPriceValues; - } + if (!is_null($this->_intervalsNumber)) { + return $this->_intervalsNumber; } + + return 1; } /** - * Find price separator for the quantile + * Find value separator for the quantile * * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals * @return array|null */ - protected function _findPriceSeparator($quantileNumber) + protected function _findValueSeparator($quantileNumber) { if ($quantileNumber < 1 || $quantileNumber >= $this->getIntervalsNumber()) { return null; } - $prices = array(); + $values = array(); $quantileInterval = $this->_getQuantileInterval($quantileNumber); - $intervalPricesCount = $quantileInterval[1] - $quantileInterval[0] + 1; + $intervalValuesCount = $quantileInterval[1] - $quantileInterval[0] + 1; $offset = $quantileInterval[0]; - if (!is_null($this->_lastPriceLimiter[0])) { - $offset -= $this->_lastPriceLimiter[0]; + if (!is_null($this->_lastValueLimiter[0])) { + $offset -= $this->_lastValueLimiter[0]; } if ($offset < 0) { - $intervalPricesCount += $offset; - $prices = array_slice( - $this->_prices, - $this->_lastPriceLimiter[0] + $offset - $this->_quantileInterval[0], + $intervalValuesCount += $offset; + $values = array_slice( + $this->_values, + $this->_lastValueLimiter[0] + $offset - $this->_quantileInterval[0], -$offset ); $offset = 0; } - $lowerPrice = $this->_lastPriceLimiter[1]; + $lowerValue = $this->_lastValueLimiter[1]; if (!is_null($this->_lowerLimit)) { - $lowerPrice = max($lowerPrice, $this->_lowerLimit); + $lowerValue = max($lowerValue, $this->_lowerLimit); } - if ($intervalPricesCount >= 0) { - $prices = array_merge( - $prices, - $this->_pricesModel->loadPrices($intervalPricesCount + 1, $offset, $lowerPrice, $this->_upperLimit) + if ($intervalValuesCount >= 0) { + $values = array_merge( + $values, + $this->interval->load($intervalValuesCount + 1, $offset, $lowerValue, $this->_upperLimit) ); } - $lastPrice = $prices[$intervalPricesCount - 1]; - $bestRoundPrice = array(); - if ($lastPrice == $prices[0]) { + $lastValue = $values[$intervalValuesCount - 1]; + $bestRoundValue = array(); + if ($lastValue == $values[0]) { if ($quantileNumber == 1 && $offset) { - $additionalPrices = $this->_pricesModel->loadPreviousPrices( - $lastPrice, - $quantileInterval[0], - $this->_lowerLimit - ); - if ($additionalPrices) { - $quantileInterval[0] -= count($additionalPrices); - $prices = array_merge($additionalPrices, $prices); - $bestRoundPrice = $this->_findRoundPrice( - $prices[0] + \Magento\Catalog\Model\Resource\Layer\Filter\Price::MIN_POSSIBLE_PRICE / 10, - $lastPrice, + $additionalValues = $this->interval->loadPrevious($lastValue, $quantileInterval[0], $this->_lowerLimit); + if ($additionalValues) { + $quantileInterval[0] -= count($additionalValues); + $values = array_merge($additionalValues, $values); + $bestRoundValue = $this->_findRoundValue( + $values[0] + self::MIN_POSSIBLE_VALUE / 10, + $lastValue, false ); } } if ($quantileNumber == $this->getIntervalsNumber() - 1) { - $pricesCount = count($prices); - if ($prices[$pricesCount - 1] > $lastPrice) { - $additionalPrices = array($prices[$pricesCount - 1]); + $valuesCount = count($values); + if ($values[$valuesCount - 1] > $lastValue) { + $additionalValues = array($values[$valuesCount - 1]); } else { - $additionalPrices = $this->_pricesModel->loadNextPrices( - $lastPrice, - $this->_count - $quantileInterval[0] - count($prices), + $additionalValues = $this->interval->loadNext( + $lastValue, + $this->_count - $quantileInterval[0] - count($values), $this->_upperLimit ); } - if ($additionalPrices) { - $quantileInterval[1] = $quantileInterval[0] + count($prices) - 1; - if ($prices[$pricesCount - 1] <= $lastPrice) { - $quantileInterval[1] += count($additionalPrices); - $prices = array_merge($prices, $additionalPrices); + if ($additionalValues) { + $quantileInterval[1] = $quantileInterval[0] + count($values) - 1; + if ($values[$valuesCount - 1] <= $lastValue) { + $quantileInterval[1] += count($additionalValues); + $values = array_merge($values, $additionalValues); } - $upperBestRoundPrice = $this->_findRoundPrice( - $lastPrice + \Magento\Catalog\Model\Resource\Layer\Filter\Price::MIN_POSSIBLE_PRICE / 10, - $prices[count($prices) - 1], + $upperBestRoundValue = $this->_findRoundValue( + $lastValue + self::MIN_POSSIBLE_VALUE / 10, + $values[count($values) - 1], false ); - $this->_mergeRoundPrices($bestRoundPrice, $upperBestRoundPrice); + $this->_mergeRoundValues($bestRoundValue, $upperBestRoundValue); } } } else { - $bestRoundPrice = $this->_findRoundPrice( - $prices[0] + \Magento\Catalog\Model\Resource\Layer\Filter\Price::MIN_POSSIBLE_PRICE / 10, - $lastPrice + $bestRoundValue = $this->_findRoundValue( + $values[0] + self::MIN_POSSIBLE_VALUE / 10, + $lastValue ); } $this->_quantileInterval = $quantileInterval; - $this->_prices = $prices; + $this->_values = $values; - if (empty($bestRoundPrice)) { + if (empty($bestRoundValue)) { $this->_skippedQuantilesUpperLimits[$quantileNumber] = $quantileInterval[1]; - return $bestRoundPrice; + return $bestRoundValue; } - $pricesCount = count($prices); - if ($prices[$pricesCount - 1] > $lastPrice) { - $this->_lastPriceLimiter = array($quantileInterval[0] + $pricesCount - 1, $prices[$pricesCount - 1]); + $valuesCount = count($values); + if ($values[$valuesCount - 1] > $lastValue) { + $this->_lastValueLimiter = array($quantileInterval[0] + $valuesCount - 1, $values[$valuesCount - 1]); } - ksort($bestRoundPrice, SORT_NUMERIC); - foreach ($bestRoundPrice as $index => &$bestRoundPriceValues) { - if (empty($bestRoundPriceValues)) { - unset($bestRoundPrice[$index]); + ksort($bestRoundValue, SORT_NUMERIC); + foreach ($bestRoundValue as $index => &$bestRoundValueValues) { + if (empty($bestRoundValueValues)) { + unset($bestRoundValue[$index]); } else { - sort($bestRoundPriceValues); + sort($bestRoundValueValues); } } - return array_reverse($bestRoundPrice); + return array_reverse($bestRoundValue); + } + + /** + * Get quantile interval + * + * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals + * @return null|float[] [floatMin,floatMax] + */ + protected function _getQuantileInterval($quantileNumber) + { + if ($quantileNumber < 1 || $quantileNumber >= $this->getIntervalsNumber()) { + return null; + } + $quantile = $this->_getQuantile($quantileNumber); + $deflectionLimit = floor($this->_count / 2 / $this->getIntervalsNumber()); + $limits = array( + min(floor($quantile - $deflectionLimit), floor($quantile)), + max(ceil($quantile + $deflectionLimit - 1), ceil($quantile)) + ); + + $sqrtParam = $this->_count * $quantileNumber * ($this->getIntervalsNumber() - $quantileNumber); + $deflection = self::STANDARD_NORMAL_DISTRIBUTION * sqrt($sqrtParam) / $this->getIntervalsNumber(); + $left = max(floor($quantile - $deflection - 1), $limits[0], 0); + if (array_key_exists($quantileNumber - 1, $this->_skippedQuantilesUpperLimits) + && $left > $this->_skippedQuantilesUpperLimits[$quantileNumber - 1] + ) { + $left = $this->_skippedQuantilesUpperLimits[$quantileNumber - 1]; + } + $right = min(ceil($quantile + $deflection), $limits[1], $this->_count - 1); + return array($left, $right); + } + + /** + * Get quantile + * + * @param int $quantileNumber should be from 1 to n-1 where n is number of intervals + * @return float|null + */ + protected function _getQuantile($quantileNumber) + { + if ($quantileNumber < 1 || $quantileNumber >= $this->getIntervalsNumber()) { + return 0; + } + + return $quantileNumber * $this->_count / $this->getIntervalsNumber() - .5; } /** - * Find max rounding factor with given price range + * Find max rounding factor with given value range * - * @param float $lowerPrice - * @param float $upperPrice + * @param float $lowerValue + * @param float $upperValue * @param bool $returnEmpty whether empty result is acceptable * @param null|float $roundingFactor if given, checks for range to contain the factor * @return false|array */ - protected function _findRoundPrice($lowerPrice, $upperPrice, $returnEmpty = true, $roundingFactor = null) + protected function _findRoundValue($lowerValue, $upperValue, $returnEmpty = true, $roundingFactor = null) { - $lowerPrice = round($lowerPrice, 3); - $upperPrice = round($upperPrice, 3); + $lowerValue = round($lowerValue, 3); + $upperValue = round($upperValue, 3); if (!is_null($roundingFactor)) { - // Can't separate if prices are equal - if ($lowerPrice >= $upperPrice) { - if ($lowerPrice > $upperPrice || $returnEmpty) { + // Can't separate if values are equal + if ($lowerValue >= $upperValue) { + if ($lowerValue > $upperValue || $returnEmpty) { return false; } } // round is used for such examples: (1194.32 / 0.02) or (5 / 100000) - $lowerDivision = ceil(round($lowerPrice / $roundingFactor, self::TEN_POWER_ROUNDING_FACTOR + 3)); - $upperDivision = floor(round($upperPrice / $roundingFactor, self::TEN_POWER_ROUNDING_FACTOR + 3)); + $lowerDivision = ceil(round($lowerValue / $roundingFactor, self::TEN_POWER_ROUNDING_FACTOR + 3)); + $upperDivision = floor(round($upperValue / $roundingFactor, self::TEN_POWER_ROUNDING_FACTOR + 3)); $result = array(); if ($upperDivision <= 0 || $upperDivision - $lowerDivision > 10) { @@ -475,24 +476,24 @@ class Algorithm $result = array(); $tenPower = pow(10, self::TEN_POWER_ROUNDING_FACTOR); $roundingFactorCoefficients = array(10, 5, 2); - while ($tenPower >= \Magento\Catalog\Model\Resource\Layer\Filter\Price::MIN_POSSIBLE_PRICE) { - if ($tenPower == \Magento\Catalog\Model\Resource\Layer\Filter\Price::MIN_POSSIBLE_PRICE) { + while ($tenPower >= self::MIN_POSSIBLE_VALUE) { + if ($tenPower == self::MIN_POSSIBLE_VALUE) { $roundingFactorCoefficients[] = 1; } foreach ($roundingFactorCoefficients as $roundingFactorCoefficient) { $roundingFactorCoefficient *= $tenPower; - $roundPrices = $this->_findRoundPrice( - $lowerPrice, - $upperPrice, + $roundValues = $this->_findRoundValue( + $lowerValue, + $upperValue, $returnEmpty, $roundingFactorCoefficient ); - if ($roundPrices) { + if ($roundValues) { $index = round( $roundingFactorCoefficient / - \Magento\Catalog\Model\Resource\Layer\Filter\Price::MIN_POSSIBLE_PRICE + self::MIN_POSSIBLE_VALUE ); - $result[$index] = $roundPrices; + $result[$index] = $roundValues; } } $tenPower /= 10; @@ -501,20 +502,50 @@ class Algorithm return empty($result) ? array(1 => array()) : $result; } + /** + * Merge new round values with old ones + * + * @param array &$oldRoundValues + * @param array &$newRoundValues + * @return void + */ + protected function _mergeRoundValues(&$oldRoundValues, &$newRoundValues) + { + foreach ($newRoundValues as $roundingFactor => $roundValueValues) { + if (array_key_exists($roundingFactor, $oldRoundValues)) { + $oldRoundValues[$roundingFactor] = array_unique( + array_merge($oldRoundValues[$roundingFactor], $roundValueValues) + ); + } else { + $oldRoundValues[$roundingFactor] = $roundValueValues; + } + } + } + + /** + * Get intervals number with checking skipped quantiles + * + * @return int + */ + protected function _getCalculatedIntervalsNumber() + { + return max(1, $this->getIntervalsNumber() - count($this->_skippedQuantilesUpperLimits)); + } + /** * Get separator nearest to quantile among the separators * * @param int $quantileNumber * @param array $separators - * @return array|false [deflection, separatorPrice, $priceIndex] + * @return array|false [deflection, separatorValue, $valueIndex] */ protected function _findBestSeparator($quantileNumber, $separators) { $result = false; $i = 0; - $pricesCount = count($this->_prices); - while ($i < $pricesCount && !empty($separators)) { + $valuesCount = count($this->_values); + while ($i < $valuesCount && !empty($separators)) { $i = $this->_binarySearch($separators[0], array($i)); if ($i == -1) { break; @@ -525,7 +556,7 @@ class Algorithm $deflection = abs( $quantileNumber * $this->_count - ($this->_quantileInterval[0] + - $i) * $this->_getCalculatedIntervalsNumber() + $i) * $this->_getCalculatedIntervalsNumber() ); if (!$result || $deflection < $result[0]) { $result = array($deflection, $separator, $i); @@ -536,82 +567,44 @@ class Algorithm } /** - * Calculate separators, each contains 'from', 'to' and 'count' + * Search first index of value, that satisfy conditions to be 'greater or equal' than $value + * Returns -1 if index was not found * - * @return array + * @param float $value + * @param null|float[] $limits search [from, to] + * @return int */ - public function calculateSeparators() + protected function _binarySearch($value, $limits = null) { - $result = array(); - $lastCount = 0; - $intervalFirstPrice = $this->_minPrice; - $lastSeparator = is_null($this->_lowerLimit) ? 0 : $this->_lowerLimit; - - for ($i = 1; $i < $this->getIntervalsNumber(); ++$i) { - $separator = $this->_findPriceSeparator($i); - if (empty($separator)) { - continue; - } - if ($this->_quantileInterval[0] == 0) { - $intervalFirstPrice = $this->_prices[0]; - } - $separatorCandidate = false; - $newIntervalFirstPrice = $intervalFirstPrice; - $newLastSeparator = $lastSeparator; + if (empty($this->_values)) { + return -1; + } - $pricesPerInterval = $this->_count / $this->_getCalculatedIntervalsNumber(); - while (!empty($separator) && !array_key_exists($i, $result)) { - $separatorsPortion = array_shift($separator); - $bestSeparator = $this->_findBestSeparator($i, $separatorsPortion); - if ($bestSeparator && $bestSeparator[2] > 0) { - $isEqualPrice = $intervalFirstPrice == - $this->_prices[$bestSeparator[2] - 1] ? $this->_prices[0] : false; - $count = $bestSeparator[2] + $this->_quantileInterval[0] - $lastCount; - $separatorData = array( - 'from' => $isEqualPrice !== false ? $isEqualPrice : $lastSeparator, - 'to' => $isEqualPrice !== false ? $isEqualPrice : $bestSeparator[1], - 'count' => $count - ); - if (abs(1 - $count / $pricesPerInterval) <= self::INTERVAL_DEFLECTION_LIMIT) { - $newLastSeparator = $bestSeparator[1]; - $newIntervalFirstPrice = $this->_prices[$bestSeparator[2]]; - $result[$i] = $separatorData; - } elseif (!$separatorCandidate || $bestSeparator[0] < $separatorCandidate[0]) { - $separatorCandidate = array( - $bestSeparator[0], - $separatorData, - $bestSeparator[1], - $this->_prices[$bestSeparator[2]] - ); - } - } - } + if (!is_array($limits)) { + $limits = array(); + } + if (!isset($limits[0])) { + $limits[0] = 0; + } + if (!isset($limits[1])) { + $limits[1] = count($this->_values) - 1; + } - if (!array_key_exists($i, $result) && $separatorCandidate) { - $newLastSeparator = $separatorCandidate[2]; - $newIntervalFirstPrice = $separatorCandidate[3]; - $result[$i] = $separatorCandidate[1]; - } + if ($limits[0] > $limits[1] || $this->_values[$limits[1]] < $value) { + return -1; + } - if (array_key_exists($i, $result)) { - $lastSeparator = $newLastSeparator; - $intervalFirstPrice = $newIntervalFirstPrice; - $priceIndex = $this->_binarySearch($lastSeparator); - $lastCount += $result[$i]['count']; - if ($priceIndex != -1 && $lastSeparator > $this->_lastPriceLimiter[1]) { - $this->_lastPriceLimiter = array($priceIndex + $this->_quantileInterval[0], $lastSeparator); - } - } + if ($limits[1] - $limits[0] <= 1) { + return $this->_values[$limits[0]] < $value ? $limits[1] : $limits[0]; } - if ($this->_lastPriceLimiter[0] < $this->_count) { - $isEqualPrice = $intervalFirstPrice == $this->_maxPrice ? $intervalFirstPrice : false; - $result[$this->getIntervalsNumber()] = array( - 'from' => $isEqualPrice ? $isEqualPrice : $lastSeparator, - 'to' => $isEqualPrice ? $isEqualPrice : (is_null($this->_upperLimit) ? '' : $this->_upperLimit), - 'count' => $this->_count - $lastCount - ); + + $separator = floor(($limits[0] + $limits[1]) / 2); + if ($this->_values[$separator] < $value) { + $limits[0] = $separator + 1; + } else { + $limits[1] = $separator; } - return array_values($result); + return $this->_binarySearch($value, array($limits[0], $limits[1])); } } diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..350fbf584f605a10abc7a5e548561b64dd4e6017 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php @@ -0,0 +1,80 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Dynamic; + +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\App\ScopeInterface; +use Magento\Framework\ObjectManager; + +class IntervalFactory +{ + /** + * @var string + */ + private $interval; + + /** + * @var ObjectManager + */ + private $objectManager; + + /** + * @param ObjectManager $objectManager + * @param ScopeConfigInterface $scopeConfig + * @param string $configPath + * @param string[] $intervals + * @param string $scope + */ + public function __construct( + ObjectManager $objectManager, + ScopeConfigInterface $scopeConfig, + $configPath, + $intervals, + $scope = ScopeInterface::SCOPE_DEFAULT + ) { + $this->objectManager = $objectManager; + $configValue = $scopeConfig->getValue($configPath, $scope); + if (isset($intervals[$configValue])) { + $this->interval = $intervals[$configValue]; + } else { + throw new \LogicException("Interval not found by config {$configValue}"); + } + } + + /** + * Create interval + * + * @return IntervalInterface + */ + public function create() + { + $interval = $this->objectManager->create($this->interval); + if (!$interval instanceof IntervalInterface) { + throw new \LogicException( + 'Interval not instance of interface \Magento\Framework\Search\Dynamic\IntervalInterface' + ); + } + return $interval; + } +} diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..18bfdbdcc44a84f8389b7b79624e9d2636f57f3c --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php @@ -0,0 +1,52 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Dynamic; + +interface IntervalInterface +{ + /** + * @param int $limit + * @param null|int $offset + * @param null|int $lower + * @param null|int $upper + * @return array + */ + public function load($limit, $offset = null, $lower = null, $upper = null); + + /** + * @param float $data + * @param int $index + * @param null|int $lower + * @return array + */ + public function loadPrevious($data, $index, $lower = null); + + /** + * @param float $data + * @param int $rightIndex + * @param null|int $upper + * @return array + */ + public function loadNext($data, $rightIndex, $upper = null); +} diff --git a/lib/internal/Magento/Framework/Search/Request.php b/lib/internal/Magento/Framework/Search/Request.php index 939805ff3ba3f79aea72906e1dd31748e84844aa..a93c4a889e5bf62bc1227687ced04936303aa293 100644 --- a/lib/internal/Magento/Framework/Search/Request.php +++ b/lib/internal/Magento/Framework/Search/Request.php @@ -86,8 +86,8 @@ class Request implements RequestInterface QueryInterface $query, $from = null, $size = null, - array $dimensions = null, - array $buckets = null + array $dimensions = [], + array $buckets = [] ) { $this->name = $name; $this->index = $indexName; @@ -115,13 +115,21 @@ class Request implements RequestInterface } /** - * @return Dimension[] + * {@inheritdoc} */ public function getDimensions() { return $this->dimensions; } + /** + * {@inheritdoc} + */ + public function getScopeDimension() + { + return $this->dimensions[Dimension::SCOPE]; + } + /** * {@inheritdoc} */ diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php new file mode 100644 index 0000000000000000000000000000000000000000..47e3fba30765efa83cf382492333e6ed84603d69 --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php @@ -0,0 +1,101 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Request\Aggregation; + +use Magento\Framework\Search\Request\BucketInterface; + +/** + * Dynamic Buckets + */ +class DynamicBucket implements BucketInterface +{ + /** + * @var string + */ + protected $name; + + /** + * @var string + */ + protected $field; + + /** + * @var array + */ + protected $method; + + /** + * @param string $name + * @param string $field + * @param string $method + */ + public function __construct($name, $field, $method) + { + $this->name = $name; + $this->field = $field; + $this->method = $method; + } + + /** + * {@inheritdoc} + */ + public function getType() + { + return BucketInterface::TYPE_TERM; + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return $this->name; + } + + /** + * {@inheritdoc} + */ + public function getField() + { + return $this->field; + } + + /** + * Get method + * + * @return string + */ + public function getMethod() + { + return $this->method; + } + + /** + * {@inheritdoc} + */ + public function getMetrics() + { + return []; + } +} diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php index f4b8b8461932b45d4e1702c4655dd1c2b1bc3a94..1877f378ae2f7b0518871b2b249fcab099739ca9 100644 --- a/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php +++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/RangeBucket.php @@ -81,9 +81,7 @@ class RangeBucket implements BucketInterface } /** - * Get Field - * - * @return string + * {@inheritdoc} */ public function getField() { @@ -91,9 +89,7 @@ class RangeBucket implements BucketInterface } /** - * Get Metrics - * - * @return array + * {@inheritdoc} */ public function getMetrics() { diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php index 650c93b49107f4c0459a9b374423657ce0318e93..7d9507a3412b79512731ecc5babefe07e70f62a4 100644 --- a/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php +++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/TermBucket.php @@ -74,9 +74,7 @@ class TermBucket implements BucketInterface } /** - * Get Field - * - * @return string + * {@inheritdoc} */ public function getField() { @@ -84,9 +82,7 @@ class TermBucket implements BucketInterface } /** - * Get Metrics - * - * @return array + * {@inheritdoc} */ public function getMetrics() { diff --git a/lib/internal/Magento/Framework/Search/Request/BucketInterface.php b/lib/internal/Magento/Framework/Search/Request/BucketInterface.php index eb060564761a6dffcbdbf84f2ed55a6247f9257d..8cc784619ce09644975158aea0a0f53eb7791b5b 100644 --- a/lib/internal/Magento/Framework/Search/Request/BucketInterface.php +++ b/lib/internal/Magento/Framework/Search/Request/BucketInterface.php @@ -35,6 +35,10 @@ interface BucketInterface const TYPE_RANGE = 'rangeBucket'; + const TYPE_DYNAMIC = 'dynamicBucket'; + + const FIELD_VALUE = 'value'; + /**#@-*/ /** @@ -44,6 +48,20 @@ interface BucketInterface */ public function getType(); + /** + * Get Field + * + * @return string + */ + public function getField(); + + /** + * Get Metrics + * + * @return array + */ + public function getMetrics(); + /** * Get Name * diff --git a/lib/internal/Magento/Framework/Search/Request/Builder.php b/lib/internal/Magento/Framework/Search/Request/Builder.php index 304003e2c8d7677ae7ec86854aa3cc1a45d41314..edb5ed2d532716771a7158f0edac83764a0e5829 100644 --- a/lib/internal/Magento/Framework/Search/Request/Builder.php +++ b/lib/internal/Magento/Framework/Search/Request/Builder.php @@ -197,17 +197,21 @@ class Builder 'from' => $data['from'], 'size' => $data['size'], 'query' => $mapper->getRootQuery(), - 'dimensions' => array_map( - function ($data) { - return $this->objectManager->create( - 'Magento\Framework\Search\Request\Dimension', - $data - ); - }, - isset($data['dimensions']) ? $data['dimensions'] : [] - ), + 'dimensions' => $this->buildDimensions(isset($data['dimensions']) ? $data['dimensions'] : []), 'buckets' => $mapper->getBuckets() ] ); } + + private function buildDimensions(array $dimensionsData) + { + $dimensions = []; + foreach ($dimensionsData as $dimensionData) { + $dimensions[$dimensionData['name']] = $this->objectManager->create( + 'Magento\Framework\Search\Request\Dimension', + $dimensionData + ); + } + return $dimensions; + } } diff --git a/lib/internal/Magento/Framework/Search/Request/Dimension.php b/lib/internal/Magento/Framework/Search/Request/Dimension.php index e391198ac0284a8e87826b0bdde64e93c9a28472..8403b12b09804153e6c63ffb697b56bca7122cbf 100644 --- a/lib/internal/Magento/Framework/Search/Request/Dimension.php +++ b/lib/internal/Magento/Framework/Search/Request/Dimension.php @@ -30,4 +30,5 @@ use Magento\Framework\Search\AbstractKeyValuePair; */ class Dimension extends AbstractKeyValuePair { + const SCOPE = 'scope'; } diff --git a/lib/internal/Magento/Framework/Search/Request/Mapper.php b/lib/internal/Magento/Framework/Search/Request/Mapper.php index 0fc5ca6623cf85bc76116c4678f4c33c83baab8d..1fa47063b6c69f640e95909cc39c823a7b1b3e22 100644 --- a/lib/internal/Magento/Framework/Search/Request/Mapper.php +++ b/lib/internal/Magento/Framework/Search/Request/Mapper.php @@ -331,12 +331,11 @@ class Mapper { $buckets = array(); foreach ($this->aggregations as $bucketData) { - $arguments = - [ - 'name' => $bucketData['name'], - 'field' => $bucketData['field'], - 'metrics' => $this->mapMetrics($bucketData['metric']) - ]; + $arguments = [ + 'name' => $bucketData['name'], + 'field' => $bucketData['field'], + 'metrics' => $this->mapMetrics($bucketData) + ]; switch ($bucketData['type']) { case BucketInterface::TYPE_TERM: $bucket = $this->objectManager->create( @@ -349,7 +348,16 @@ class Mapper 'Magento\Framework\Search\Request\Aggregation\RangeBucket', array_merge( $arguments, - ['ranges' => $this->mapRanges($bucketData['range'])] + ['ranges' => $this->mapRanges($bucketData)] + ) + ); + break; + case BucketInterface::TYPE_DYNAMIC: + $bucket = $this->objectManager->create( + 'Magento\Framework\Search\Request\Aggregation\DynamicBucket', + array_merge( + $arguments, + ['method' => $bucketData['method']] ) ); break; @@ -364,19 +372,22 @@ class Mapper /** * Build Metric[] from array * - * @param array $metrics + * @param array $bucketData * @return array */ - private function mapMetrics(array $metrics) + private function mapMetrics(array $bucketData) { - $metricObjects = array(); - foreach ($metrics as $metric) { - $metricObjects[] = $this->objectManager->create( - 'Magento\Framework\Search\Request\Aggregation\Metric', - [ - 'type' => $metric['type'] - ] - ); + $metricObjects = []; + if (isset($bucketData['metric'])) { + $metrics = $bucketData['metric']; + foreach ($metrics as $metric) { + $metricObjects[] = $this->objectManager->create( + 'Magento\Framework\Search\Request\Aggregation\Metric', + [ + 'type' => $metric['type'] + ] + ); + } } return $metricObjects; } @@ -384,20 +395,23 @@ class Mapper /** * Build Range[] from array * - * @param array $ranges + * @param array $bucketData * @return array */ - private function mapRanges(array $ranges) + private function mapRanges(array $bucketData) { $rangeObjects = array(); - foreach ($ranges as $range) { - $rangeObjects[] = $this->objectManager->create( - 'Magento\Framework\Search\Request\Aggregation\Range', - [ - 'from' => $range['from'], - 'to' => $range['to'] - ] - ); + if (isset($bucketData['range'])) { + $ranges = $bucketData['range']; + foreach ($ranges as $range) { + $rangeObjects[] = $this->objectManager->create( + 'Magento\Framework\Search\Request\Aggregation\Range', + [ + 'from' => $range['from'], + 'to' => $range['to'] + ] + ); + } } return $rangeObjects; } diff --git a/lib/internal/Magento/Framework/Search/RequestInterface.php b/lib/internal/Magento/Framework/Search/RequestInterface.php index 5de079c302e0d0474b8e3cdbe5559a05b038d7a2..45634b932efcbed0b838944d2446042c1466965b 100644 --- a/lib/internal/Magento/Framework/Search/RequestInterface.php +++ b/lib/internal/Magento/Framework/Search/RequestInterface.php @@ -47,10 +47,19 @@ interface RequestInterface public function getIndex(); /** + * Get all dimensions + * * @return Dimension[] */ public function getDimensions(); + /** + * Get scope dimension + * + * @return Dimension + */ + public function getScopeDimension(); + /** * Get Aggregation Buckets * diff --git a/lib/internal/Magento/Framework/Search/Aggregation.php b/lib/internal/Magento/Framework/Search/Response/Aggregation.php similarity index 96% rename from lib/internal/Magento/Framework/Search/Aggregation.php rename to lib/internal/Magento/Framework/Search/Response/Aggregation.php index 8c5f8ca7fb5a250a1151ab263413c81ae594d1fe..405e69b5e8653f5a472014a6c9cb72e4184d465d 100644 --- a/lib/internal/Magento/Framework/Search/Aggregation.php +++ b/lib/internal/Magento/Framework/Search/Response/Aggregation.php @@ -21,7 +21,7 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Framework\Search; +namespace Magento\Framework\Search\Response; /** * Faceted data @@ -67,7 +67,7 @@ class Aggregation implements \IteratorAggregate /** * Get Document field names * - * @return array + * @return string[] */ public function getBucketNames() { diff --git a/setup/module/Magento/Setup/src/Controller/Install/ClearProgressController.php b/lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php similarity index 60% rename from setup/module/Magento/Setup/src/Controller/Install/ClearProgressController.php rename to lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php index 351483669c178e9179b6af59c4aff47da8d5768b..e342bd25a2cdd17c57d6c48830a17affd9303ed0 100644 --- a/setup/module/Magento/Setup/src/Controller/Install/ClearProgressController.php +++ b/lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php @@ -21,35 +21,47 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Setup\Controller\Install; +namespace Magento\Framework\Search\Response\Aggregation; -use Magento\Setup\Model\WebLogger; -use Zend\Mvc\Controller\AbstractActionController; -use Zend\View\Model\JsonModel; - -class ClearProgressController extends AbstractActionController +class Value { /** - * @param JsonModel $view - * @param WebLogger $logger + * @var string|array + */ + private $value; + + /** + * @var array + */ + private $metrics; + + /** + * @param string|array $value + * @param array $metrics */ - public function __construct( - JsonModel $view, - WebLogger $logger - ) { - $this->json = $view; - $this->logger = $logger; + public function __construct($value, $metrics) + { + $this->value = $value; + $this->metrics = $metrics; + } + + /** + * Get aggregation + * + * @return string|array + */ + public function getValue() + { + return $this->value; } /** - * Clears installation log + * Get metrics * - * @return JsonModel + * @return array */ - public function indexAction() + public function getMetrics() { - $this->logger->clear(); - $this->json->setVariable('success', true); - return $this->json; + return $this->metrics; } } diff --git a/lib/internal/Magento/Framework/Search/Response/Bucket.php b/lib/internal/Magento/Framework/Search/Response/Bucket.php new file mode 100644 index 0000000000000000000000000000000000000000..0b254adcf718ea3b13db682537c9616da459f7ee --- /dev/null +++ b/lib/internal/Magento/Framework/Search/Response/Bucket.php @@ -0,0 +1,76 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Framework\Search\Response; + +use Magento\Framework\Search\Response\Aggregation\Value; + +/** + * Facet Bucket + */ +class Bucket +{ + /** + * Field name + * + * @var string + */ + protected $name; + + /** + * Field values + * + * @var mixed + */ + protected $values; + + /** + * @param string $name + * @param Value[] $values + */ + public function __construct($name, $values) + { + $this->name = $name; + $this->values = $values; + } + + /** + * Get field name + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Get field values + * + * @return Value[] + */ + public function getValues() + { + return $this->values; + } +} diff --git a/lib/internal/Magento/Framework/Search/QueryResponse.php b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php similarity index 93% rename from lib/internal/Magento/Framework/Search/QueryResponse.php rename to lib/internal/Magento/Framework/Search/Response/QueryResponse.php index b3188a55599202bd1273016dac3c5e1c946d0835..5ed4daa062b9e3fe8b44a70683cc01b0d197a223 100644 --- a/lib/internal/Magento/Framework/Search/QueryResponse.php +++ b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php @@ -21,7 +21,10 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Framework\Search; +namespace Magento\Framework\Search\Response; + +use Magento\Framework\Search\Document; +use Magento\Framework\Search\ResponseInterface; /** * Search Response diff --git a/lib/internal/Magento/Framework/Search/etc/requests.xsd b/lib/internal/Magento/Framework/Search/etc/requests.xsd index 34efc893da986ff2070868c29429ca9e9eeb6790..12eb0dfc85c8b32a7c4aff21a74b0fd55c0458ab 100644 --- a/lib/internal/Magento/Framework/Search/etc/requests.xsd +++ b/lib/internal/Magento/Framework/Search/etc/requests.xsd @@ -28,19 +28,19 @@ <xs:complexType name="request"> <xs:sequence> <xs:element type="dimensions" name="dimensions" minOccurs="0" maxOccurs="1"/> - <xs:element type="queries" name="queries" minOccurs="1"> + <xs:element type="queries" name="queries" minOccurs="1" maxOccurs="1"> <xs:key name="queryName"> <xs:selector xpath="query" /> <xs:field xpath="@name" /> </xs:key> </xs:element> - <xs:element type="filters" name="filters" minOccurs="0"> + <xs:element type="filters" name="filters" minOccurs="0" maxOccurs="1"> <xs:key name="filterName"> <xs:selector xpath="filter" /> <xs:field xpath="@name" /> </xs:key> </xs:element> - <xs:element type="aggregation" name="aggregation" minOccurs="0"> + <xs:element type="aggregations" name="aggregations" minOccurs="0" maxOccurs="1"> <xs:key name="aggregationName"> <xs:selector xpath="bucket" /> <xs:field xpath="@name" /> @@ -104,9 +104,7 @@ <xs:element name="queryReference" minOccurs="1" maxOccurs="unbounded"> <xs:complexType> <xs:complexContent> - <xs:extension base="queryReference"> - <xs:attribute ref="clause" use="required" /> - </xs:extension> + <xs:extension base="queryReference" /> </xs:complexContent> </xs:complexType> </xs:element> @@ -166,6 +164,15 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="wildcardFilter"> + <xs:complexContent> + <xs:extension base="filter"> + <xs:attribute type="xs:string" name="field" use="required" /> + <xs:attribute type="xs:string" name="value" use="required" /> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="rangeFilter"> <xs:complexContent> <xs:extension base="filter"> @@ -180,15 +187,7 @@ <xs:complexContent> <xs:extension base="filter"> <xs:sequence> - <xs:element name="filterReference" minOccurs="1" maxOccurs="unbounded"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="filterReference"> - <xs:attribute ref="clause" use="required" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element type="filterReference" name="filterReference" minOccurs="1" maxOccurs="unbounded" /> </xs:sequence> </xs:extension> </xs:complexContent> @@ -203,7 +202,7 @@ --> <xs:complexType name="bucket" abstract="true"> <xs:sequence> - <xs:element type="metrics" name="metrics" /> + <xs:element type="metrics" name="metrics" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <xs:attribute type="xs:string" name="name" use="required" /> <xs:attribute type="xs:string" name="field" use="required" /> @@ -220,12 +219,20 @@ <xs:complexContent> <xs:extension base="bucket"> <xs:sequence> - <xs:element type="ranges" name="ranges" minOccurs="1" /> + <xs:element type="ranges" name="ranges" minOccurs="1" maxOccurs="1" /> </xs:sequence> </xs:extension> </xs:complexContent> </xs:complexType> + <xs:complexType name="dynamicBucket"> + <xs:complexContent> + <xs:extension base="bucket"> + <xs:attribute type="xs:string" name="method" use="required" /> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="metrics"> <xs:sequence> <xs:element type="metric" name="metric" maxOccurs="unbounded" minOccurs="0" /> @@ -241,7 +248,7 @@ </xs:simpleContent> </xs:complexType> - <xs:complexType name="aggregation"> + <xs:complexType name="aggregations"> <xs:choice maxOccurs="unbounded" minOccurs="1"> <xs:element type="bucket" name="bucket" /> </xs:choice> @@ -250,6 +257,7 @@ <xs:complexType name="queryReference"> <xs:simpleContent> <xs:extension base="xs:string"> + <xs:attribute ref="clause" use="required" /> <xs:attribute type="xs:string" name="ref" use="required" /> </xs:extension> </xs:simpleContent> @@ -258,6 +266,7 @@ <xs:complexType name="filterReference"> <xs:simpleContent> <xs:extension base="xs:string"> + <xs:attribute ref="clause" use="required" /> <xs:attribute type="xs:string" name="ref" use="required" /> </xs:extension> </xs:simpleContent> diff --git a/lib/internal/Magento/Framework/Search/etc/search_request.xsd b/lib/internal/Magento/Framework/Search/etc/search_request.xsd index d36bb85bec9326dfbefb0c4f3d95c05e96e22b34..31d04de951c9ff43f4fc4ad08cfe45d421f3e7e0 100644 --- a/lib/internal/Magento/Framework/Search/etc/search_request.xsd +++ b/lib/internal/Magento/Framework/Search/etc/search_request.xsd @@ -28,7 +28,7 @@ <xs:complexType name="requests"> <xs:sequence> - <xs:element type="request" name="request" maxOccurs="unbounded"> + <xs:element type="request" name="request" minOccurs="0" maxOccurs="unbounded"> <xs:keyref name="queryReference" refer="queryName"> <xs:selector xpath=".//queryReference"/> <xs:field xpath="@ref"/> diff --git a/lib/internal/Magento/Framework/Service/Data/AbstractExtensibleObjectBuilder.php b/lib/internal/Magento/Framework/Service/Data/AbstractExtensibleObjectBuilder.php index 2607389e112293552993a988af81775eef7a9295..7aa57d0252b968ebaf57f2ce74c6bdb8be041039 100644 --- a/lib/internal/Magento/Framework/Service/Data/AbstractExtensibleObjectBuilder.php +++ b/lib/internal/Magento/Framework/Service/Data/AbstractExtensibleObjectBuilder.php @@ -41,9 +41,9 @@ abstract class AbstractExtensibleObjectBuilder extends AbstractSimpleObjectBuild protected $metadataService; /** - * @var MetadataObjectInterface[] + * @var string[] */ - protected $customAttributesMetadata; + protected $customAttributesCodes = null; /** * @param \Magento\Framework\Service\Data\ObjectFactory $objectFactory @@ -110,16 +110,18 @@ abstract class AbstractExtensibleObjectBuilder extends AbstractSimpleObjectBuild */ protected function getCustomAttributesCodes() { + if (!is_null($this->customAttributesCodes)) { + return $this->customAttributesCodes; + } $attributeCodes = []; $dataObjectClassName = $this->_getDataObjectType(); - if (empty($this->customAttributesMetadata)) { - $this->customAttributesMetadata = $this->metadataService->getCustomAttributesMetadata($dataObjectClassName); - } - if (is_array($this->customAttributesMetadata)) { - foreach ($this->customAttributesMetadata as $attribute) { + $customAttributesMetadata = $this->metadataService->getCustomAttributesMetadata($dataObjectClassName); + if (is_array($customAttributesMetadata)) { + foreach ($customAttributesMetadata as $attribute) { $attributeCodes[] = $attribute->getAttributeCode(); } } + $this->customAttributesCodes = $attributeCodes; return $attributeCodes; } diff --git a/lib/internal/Magento/Framework/Session/README.md b/lib/internal/Magento/Framework/Session/README.md new file mode 100644 index 0000000000000000000000000000000000000000..3a5f3b32bcf74c13c66c682c8a98c9df98026121 --- /dev/null +++ b/lib/internal/Magento/Framework/Session/README.md @@ -0,0 +1,5 @@ +#Session + +* **SessionManager** Manages active sessions and session metadata. +* **SaveHandler** Supports filesystem and database storage of session data. +* **Config** manages server's session-related configurations. diff --git a/lib/internal/Magento/Framework/Shell.php b/lib/internal/Magento/Framework/Shell.php index c9965aad5d2a2b22ba12153b6be39b725daaee01..9aa386094d12ac6c000b5cb2374e59d0510761e9 100644 --- a/lib/internal/Magento/Framework/Shell.php +++ b/lib/internal/Magento/Framework/Shell.php @@ -24,6 +24,7 @@ namespace Magento\Framework; use Magento\Framework\Shell\CommandRendererInterface; +use Magento\Framework\Exception; /** * Shell command line wrapper encapsulates command execution and arguments escaping @@ -66,12 +67,18 @@ class Shell implements ShellInterface { $command = $this->commandRenderer->render($command, $arguments); $this->log($command); + + $disabled = explode(',', ini_get('disable_functions')); + if (in_array('exec', $disabled)) { + throw new Exception("exec function is disabled."); + } + exec($command, $output, $exitCode); $output = implode(PHP_EOL, $output); $this->log($output); if ($exitCode) { $commandError = new \Exception($output, $exitCode); - throw new \Magento\Framework\Exception("Command `{$command}` returned non-zero exit code.", 0, $commandError); + throw new Exception("Command `{$command}` returned non-zero exit code.", 0, $commandError); } return $output; } diff --git a/lib/internal/Magento/Framework/Translate/README.md b/lib/internal/Magento/Framework/Translate/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7513869c3a565358596a39cd307284178bce907b --- /dev/null +++ b/lib/internal/Magento/Framework/Translate/README.md @@ -0,0 +1,14 @@ +# Translate + +Magento provides an *Inline Translation* tool that allows inline editing of phrsses that are passed through translation mechanism. The phrases are edited by the end-user stored in database dictionaries. **Translate** library provides framework to support inline translation. The following components are provided in this library for inline translation: + + * Parser - Parser parses and saves edited translation, and replaces html body with translation wrapping + * *ParserInterface, ParserFactory* + * Provider - Provider returns instance of inline translate class + * *ProviderInterface* and a *Provider* + * Configuration - It can configure inline translation to be active or inactive or to allow client ip or not. + * *ConfigInterface* + * State - It can disable, enable, suspend and resume inline translation. + * *StateInterface* and a *State* class + * Resource - It stores and retrieve translation array + * *ResourceInterface* \ No newline at end of file diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php index 24b217b509c93f93c4ed2179662dac0c958c7990..0c99415c885bfd470e666bce3ae72f32e70afbee 100644 --- a/lib/internal/Magento/Framework/View/Asset/Repository.php +++ b/lib/internal/Magento/Framework/View/Asset/Repository.php @@ -69,6 +69,11 @@ class Repository */ private $fileContext; + /** + * @var null|array + */ + private $defaults = null; + /** * @param \Magento\Framework\UrlInterface $baseUrl * @param \Magento\Framework\View\DesignInterface $design @@ -98,11 +103,9 @@ class Repository */ public function updateDesignParams(array &$params) { - $defaults = $this->design->getDesignParams(); - // Set area if (empty($params['area'])) { - $params['area'] = $defaults['area']; + $params['area'] = $this->getDefaultParameter('area'); } // Set themeModel @@ -112,7 +115,7 @@ class Repository $theme = $params['themeId']; } elseif (isset($params['theme'])) { $theme = $params['theme']; - } elseif (empty($params['themeModel']) && $area !== $defaults['area']) { + } elseif (empty($params['themeModel']) && $area !== $this->getDefaultParameter('area')) { $theme = $this->design->getConfigurationDesignTheme($area); } @@ -122,10 +125,9 @@ class Repository throw new \UnexpectedValueException("Could not find theme '$theme' for area '$area'"); } } elseif (empty($params['themeModel'])) { - $params['themeModel'] = $defaults['themeModel']; + $params['themeModel'] = $this->getDefaultParameter('themeModel'); } - // Set module if (!array_key_exists('module', $params)) { $params['module'] = false; @@ -133,11 +135,23 @@ class Repository // Set locale if (empty($params['locale'])) { - $params['locale'] = $defaults['locale']; + $params['locale'] = $this->getDefaultParameter('locale'); } return $this; } + /** + * Get default design parameter + * + * @param string $name + * @return mixed + */ + private function getDefaultParameter($name) + { + $this->defaults = $this->design->getDesignParams(); + return $this->defaults[$name]; + } + /** * Create a file asset that's subject of fallback system * diff --git a/app/code/Magento/Core/etc/body.xsd b/lib/internal/Magento/Framework/View/Layout/etc/body.xsd similarity index 100% rename from app/code/Magento/Core/etc/body.xsd rename to lib/internal/Magento/Framework/View/Layout/etc/body.xsd diff --git a/app/code/Magento/Core/etc/layouts.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd similarity index 95% rename from app/code/Magento/Core/etc/layouts.xsd rename to lib/internal/Magento/Framework/View/Layout/etc/elements.xsd index 805c6d4b7a19380c6c61a9611cd610c02e8ab25e..2ff980dabb6fef798ed8645ba3ab7e6f789edc26 100644 --- a/app/code/Magento/Core/etc/layouts.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd @@ -25,7 +25,7 @@ --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:redefine schemaLocation="../../../../../lib/internal/Magento/Framework/Data/etc/argument/types.xsd"> + <xs:redefine schemaLocation="../../../Data/etc/argument/types.xsd"> <xs:complexType name="argumentType" abstract="true" mixed="true"> <xs:complexContent> <xs:extension base="argumentType"> @@ -75,21 +75,6 @@ </xs:complexContent> </xs:complexType> - <xs:complexType name="layoutType"> - <xs:annotation> - <xs:documentation> - Layout Type definition - </xs:documentation> - </xs:annotation> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="referenceContainer" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="container" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="update" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="remove" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="move" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="updaterType"> <xs:annotation> <xs:documentation> diff --git a/app/code/Magento/Core/etc/head.xsd b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd similarity index 100% rename from app/code/Magento/Core/etc/head.xsd rename to lib/internal/Magento/Framework/View/Layout/etc/head.xsd diff --git a/app/code/Magento/Core/etc/html.xsd b/lib/internal/Magento/Framework/View/Layout/etc/html.xsd similarity index 100% rename from app/code/Magento/Core/etc/html.xsd rename to lib/internal/Magento/Framework/View/Layout/etc/html.xsd diff --git a/lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd b/lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd new file mode 100644 index 0000000000000000000000000000000000000000..0ae076eb249c03c37406cd28e8d0c01d88a13934 --- /dev/null +++ b/lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:include schemaLocation="elements.xsd"/> + + <xs:complexType name="genericLayout"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="referenceContainer" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="container" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="block" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="referenceBlock" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="update" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="remove" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="move" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="layout" type="genericLayout"> + <xs:unique name="blockKey"> + <xs:selector xpath=".//block"/> + <xs:field xpath="@name"/> + </xs:unique> + <xs:unique name="containerKey"> + <xs:selector xpath=".//container"/> + <xs:field xpath="@name"/> + </xs:unique> + </xs:element> +</xs:schema> diff --git a/app/code/Magento/Core/etc/layout_merged.xsd b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd similarity index 98% rename from app/code/Magento/Core/etc/layout_merged.xsd rename to lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd index dafd895b0407c638cd8157907e2486ef9d86ab4f..c3c0226b0cd6f6b970a27c862cb16f83603a9cb9 100644 --- a/app/code/Magento/Core/etc/layout_merged.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd @@ -24,7 +24,7 @@ */ --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:include schemaLocation="layouts.xsd"/> + <xs:include schemaLocation="elements.xsd"/> <xs:element name="layout"> <xs:annotation> diff --git a/app/code/Magento/Core/etc/page.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd similarity index 98% rename from app/code/Magento/Core/etc/page.xsd rename to lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd index 24f8128d42224dcf791403ecaadf5833a355ea00..00c942b4050309ebd8b97d1a2438de96e3382f6f 100644 --- a/app/code/Magento/Core/etc/page.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd @@ -24,7 +24,7 @@ */ --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:include schemaLocation="layouts.xsd"/> + <xs:include schemaLocation="elements.xsd"/> <xs:include schemaLocation="head.xsd"/> <xs:include schemaLocation="body.xsd"/> <xs:include schemaLocation="html.xsd"/> diff --git a/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd new file mode 100644 index 0000000000000000000000000000000000000000..a4ae10ab874a6d516e1b392622372c899ad208d4 --- /dev/null +++ b/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:include schemaLocation="elements.xsd"/> + + <xs:complexType name="pageLayoutType"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="referenceContainer" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="container" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="update" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="remove" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="move" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="layout" type="pageLayoutType"> + <xs:unique name="containerKey"> + <xs:selector xpath=".//container"/> + <xs:field xpath="@name"/> + </xs:unique> + </xs:element> +</xs:schema> diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 3474d1778fd7b7ac4ea31680a7b242f5c9d78577..cbdc9d20d6f7d3f1faa90ac35fe839e0263abe5e 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -2,7 +2,7 @@ "name": "magento/framework", "description": "N/A", "type": "magento2-library", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "require": { "php": "~5.4.11|~5.5.0", "ext-spl": "*", diff --git a/lib/internal/Zend/Stdlib/AbstractOptions.php b/lib/internal/Zend/Stdlib/AbstractOptions.php deleted file mode 100644 index 86e69c3d51c2f3de1d6bf7fbb6376c03c2e47722..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/AbstractOptions.php +++ /dev/null @@ -1,150 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Traversable; - -/** - * @category Zend - * @package Zend_Stdlib - */ -abstract class AbstractOptions implements ParameterObjectInterface -{ - /** - * We use the __ prefix to avoid collisions with properties in - * user-implementations. - * - * @var bool - */ - protected $__strictMode__ = true; - - /** - * @param array|Traversable|null $options - * @return AbstractOptions - * @throws Exception\InvalidArgumentException - */ - public function __construct($options = null) - { - if (null !== $options) { - $this->setFromArray($options); - } - } - - /** - * @param array|Traversable $options - * @throws Exception\InvalidArgumentException - * @return void - */ - public function setFromArray($options) - { - if (!is_array($options) && !$options instanceof Traversable) { - throw new Exception\InvalidArgumentException(sprintf( - 'Parameter provided to %s must be an array or Traversable', - __METHOD__ - )); - } - - foreach ($options as $key => $value) { - $this->__set($key, $value); - } - } - - /** - * Cast to array - * - * @return array - */ - public function toArray() - { - $array = array(); - $transform = function($letters) { - $letter = array_shift($letters); - return '_' . strtolower($letter); - }; - foreach ($this as $key => $value) { - if ($key === '__strictMode__') continue; - $normalizedKey = preg_replace_callback('/([A-Z])/', $transform, $key); - $array[$normalizedKey] = $value; - } - return $array; - } - - /** - * @see ParameterObject::__set() - * @param string $key - * @param mixed $value - * @throws Exception\BadMethodCallException - * @return void - */ - public function __set($key, $value) - { - $setter = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))); - if ($this->__strictMode__ && !method_exists($this, $setter)) { - throw new Exception\BadMethodCallException( - 'The option "' . $key . '" does not ' - . 'have a matching ' . $setter . ' setter method ' - . 'which must be defined' - ); - } elseif (!$this->__strictMode__ && !method_exists($this, $setter)) { - return; - } - $this->{$setter}($value); - } - - /** - * @see ParameterObject::__get() - * @param string $key - * @throws Exception\BadMethodCallException - * @return mixed - */ - public function __get($key) - { - $getter = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))); - if (!method_exists($this, $getter)) { - throw new Exception\BadMethodCallException( - 'The option "' . $key . '" does not ' - . 'have a matching ' . $getter . ' getter method ' - . 'which must be defined' - ); - } - return $this->{$getter}(); - } - - /** - * @see ParameterObject::__isset() - * @param string $key - * @return boolean - */ - public function __isset($key) - { - return null !== $this->__get($key); - } - - /** - * @see ParameterObject::__unset() - * @param string $key - * @return void - * @throws Exception\InvalidArgumentException - */ - public function __unset($key) - { - try { - $this->__set($key, null); - } catch (\InvalidArgumentException $e) { - throw new Exception\InvalidArgumentException( - 'The class property $' . $key . ' cannot be unset as' - . ' NULL is an invalid value for it', - 0, - $e - ); - } - } -} diff --git a/lib/internal/Zend/Stdlib/ArraySerializableInterface.php b/lib/internal/Zend/Stdlib/ArraySerializableInterface.php deleted file mode 100644 index 20dd4633c6d1ff302f180df97edab98def874755..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ArraySerializableInterface.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -interface ArraySerializableInterface -{ - /** - * Exchange internal values from provided array - * - * @param array $array - * @return void - */ - public function exchangeArray(array $array); - - /** - * Return an array representation of the object - * - * @return array - */ - public function getArrayCopy(); -} diff --git a/lib/internal/Zend/Stdlib/ArrayStack.php b/lib/internal/Zend/Stdlib/ArrayStack.php deleted file mode 100644 index 013ff262d34d9c264f6768b4dd1df8087e4fe20d..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ArrayStack.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use ArrayIterator; -use ArrayObject; - -/** - * ArrayObject that acts as a stack with regards to iteration - * - * @category Zend - * @package Zend_Stdlib - */ -class ArrayStack extends ArrayObject -{ - /** - * Retrieve iterator - * - * Retrieve an array copy of the object, reverse its order, and return an - * ArrayIterator with that reversed array. - * - * @return ArrayIterator - */ - public function getIterator() - { - $array = $this->getArrayCopy(); - return new ArrayIterator(array_reverse($array)); - } -} diff --git a/lib/internal/Zend/Stdlib/ArrayUtils.php b/lib/internal/Zend/Stdlib/ArrayUtils.php deleted file mode 100644 index 1ec57dabdc1008c7a2ec45a468a386f9b247ffac..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ArrayUtils.php +++ /dev/null @@ -1,249 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Traversable; - -/** - * Utility class for testing and manipulation of PHP arrays. - * - * Declared abstract, as we have no need for instantiation. - * - * @category Zend - * @package Zend_Stdlib - */ -abstract class ArrayUtils -{ - /** - * Test whether an array contains one or more string keys - * - * @param mixed $value - * @param bool $allowEmpty Should an empty array() return true - * @return bool - */ - public static function hasStringKeys($value, $allowEmpty = false) - { - if (!is_array($value)) { - return false; - } - - if (!$value) { - return $allowEmpty; - } - - return count(array_filter(array_keys($value), 'is_string')) > 0; - } - - /** - * Test whether an array contains one or more integer keys - * - * @param mixed $value - * @param bool $allowEmpty Should an empty array() return true - * @return bool - */ - public static function hasIntegerKeys($value, $allowEmpty = false) - { - if (!is_array($value)) { - return false; - } - - if (!$value) { - return $allowEmpty; - } - - return count(array_filter(array_keys($value), 'is_int')) > 0; - } - - /** - * Test whether an array contains one or more numeric keys. - * - * A numeric key can be one of the following: - * - an integer 1, - * - a string with a number '20' - * - a string with negative number: '-1000' - * - a float: 2.2120, -78.150999 - * - a string with float: '4000.99999', '-10.10' - * - * @param mixed $value - * @param bool $allowEmpty Should an empty array() return true - * @return bool - */ - public static function hasNumericKeys($value, $allowEmpty = false) - { - if (!is_array($value)) { - return false; - } - - if (!$value) { - return $allowEmpty; - } - - return count(array_filter(array_keys($value), 'is_numeric')) > 0; - } - - /** - * Test whether an array is a list - * - * A list is a collection of values assigned to continuous integer keys - * starting at 0 and ending at count() - 1. - * - * For example: - * <code> - * $list = array( 'a','b','c','d' ); - * $list = array( - * 0 => 'foo', - * 1 => 'bar', - * 2 => array( 'foo' => 'baz' ), - * ); - * </code> - * - * @param mixed $value - * @param bool $allowEmpty Is an empty list a valid list? - * @return bool - */ - public static function isList($value, $allowEmpty = false) - { - if (!is_array($value)) { - return false; - } - - if (!$value) { - return $allowEmpty; - } - - return (array_values($value) === $value); - } - - /** - * Test whether an array is a hash table. - * - * An array is a hash table if: - * - * 1. Contains one or more non-integer keys, or - * 2. Integer keys are non-continuous or misaligned (not starting with 0) - * - * For example: - * <code> - * $hash = array( - * 'foo' => 15, - * 'bar' => false, - * ); - * $hash = array( - * 1995 => 'Birth of PHP', - * 2009 => 'PHP 5.3.0', - * 2012 => 'PHP 5.4.0', - * ); - * $hash = array( - * 'formElement, - * 'options' => array( 'debug' => true ), - * ); - * </code> - * - * @param mixed $value - * @param bool $allowEmpty Is an empty array() a valid hash table? - * @return bool - */ - public static function isHashTable($value, $allowEmpty = false) - { - if (!is_array($value)) { - return false; - } - - if (!$value) { - return $allowEmpty; - } - - return (array_values($value) !== $value); - } - - /** - * Convert an iterator to an array. - * - * Converts an iterator to an array. The $recursive flag, on by default, - * hints whether or not you want to do so recursively. - * - * @param array|Traversable $iterator The array or Traversable object to convert - * @param bool $recursive Recursively check all nested structures - * @throws Exception\InvalidArgumentException if $iterator is not an array or a Traversable object - * @return array - */ - public static function iteratorToArray($iterator, $recursive = true) - { - if (!is_array($iterator) && !$iterator instanceof Traversable) { - throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable object'); - } - - if (!$recursive) { - if (is_array($iterator)) { - return $iterator; - } - - return iterator_to_array($iterator); - } - - if (method_exists($iterator, 'toArray')) { - return $iterator->toArray(); - } - - $array = array(); - foreach ($iterator as $key => $value) { - if (is_scalar($value)) { - $array[$key] = $value; - continue; - } - - if ($value instanceof Traversable) { - $array[$key] = static::iteratorToArray($value, $recursive); - continue; - } - - if (is_array($value)) { - $array[$key] = static::iteratorToArray($value, $recursive); - continue; - } - - $array[$key] = $value; - } - - return $array; - } - - /** - * Merge two arrays together. - * - * If an integer key exists in both arrays, the value from the second array - * will be appended the the first array. If both values are arrays, they - * are merged together, else the value of the second array overwrites the - * one of the first array. - * - * @param array $a - * @param array $b - * @return array - */ - public static function merge(array $a, array $b) - { - foreach ($b as $key => $value) { - if (array_key_exists($key, $a)) { - if (is_int($key)) { - $a[] = $value; - } elseif (is_array($value) && is_array($a[$key])) { - $a[$key] = self::merge($a[$key], $value); - } else { - $a[$key] = $value; - } - } else { - $a[$key] = $value; - } - } - - return $a; - } -} diff --git a/lib/internal/Zend/Stdlib/CallbackHandler.php b/lib/internal/Zend/Stdlib/CallbackHandler.php deleted file mode 100644 index 7e1f19df71168ebc64f3f84374274078d385e8b8..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/CallbackHandler.php +++ /dev/null @@ -1,303 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Closure; -use ReflectionClass; -use WeakRef; - -/** - * CallbackHandler - * - * A handler for a event, event, filterchain, etc. Abstracts PHP callbacks, - * primarily to allow for lazy-loading and ensuring availability of default - * arguments (currying). - * - * @category Zend - * @package Zend_Stdlib - */ -class CallbackHandler -{ - /** - * @var string|array|callable PHP callback to invoke - */ - protected $callback; - - /** - * Callback metadata, if any - * @var array - */ - protected $metadata; - - /** - * PHP version is greater as 5.4rc1? - * @var boolean - */ - protected static $isPhp54; - - /** - * Is pecl/weakref extension installed? - * @var boolean - */ - protected static $hasWeakRefExtension; - - /** - * Constructor - * - * @param string|array|object|callable $callback PHP callback - * @param array $metadata Callback metadata - */ - public function __construct($callback, array $metadata = array()) - { - $this->metadata = $metadata; - $this->registerCallback($callback); - } - - /** - * Registers the callback provided in the constructor - * - * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed, - * this method provides additional behavior. - * - * If a callback is a functor, or an array callback composing an object - * instance, this method will pass the object to a WeakRef instance prior - * to registering the callback. - * - * @param callable $callback - * @throws Exception\InvalidCallbackException - * @return void - */ - protected function registerCallback($callback) - { - if (!is_callable($callback)) { - throw new Exception\InvalidCallbackException('Invalid callback provided; not callable'); - } - - if (null === self::$hasWeakRefExtension) { - self::$hasWeakRefExtension = class_exists('WeakRef'); - } - - // If pecl/weakref is not installed, simply store the callback and return - if (!self::$hasWeakRefExtension) { - $this->callback = $callback; - return; - } - - // If WeakRef exists, we want to use it. - - // If we have a non-closure object, pass it to WeakRef, and then - // register it. - if (is_object($callback) && !$callback instanceof Closure) { - $this->callback = new WeakRef($callback); - return; - } - - // If we have a string or closure, register as-is - if (!is_array($callback)) { - $this->callback = $callback; - return; - } - - list($target, $method) = $callback; - - // If we have an array callback, and the first argument is not an - // object, register as-is - if (!is_object($target)) { - $this->callback = $callback; - return; - } - - // We have an array callback with an object as the first argument; - // pass it to WeakRef, and then register the new callback - $target = new WeakRef($target); - $this->callback = array($target, $method); - } - - /** - * Retrieve registered callback - * - * @return callable - */ - public function getCallback() - { - $callback = $this->callback; - - // String callbacks -- simply return - if (is_string($callback)) { - return $callback; - } - - // WeakRef callbacks -- pull it out of the object and return it - if ($callback instanceof WeakRef) { - return $callback->get(); - } - - // Non-WeakRef object callback -- return it - if (is_object($callback)) { - return $callback; - } - - // Array callback with WeakRef object -- retrieve the object first, and - // then return - list($target, $method) = $callback; - if ($target instanceof WeakRef) { - return array($target->get(), $method); - } - - // Otherwise, return it - return $callback; - } - - /** - * Invoke handler - * - * @param array $args Arguments to pass to callback - * @return mixed - */ - public function call(array $args = array()) - { - $callback = $this->getCallback(); - - // WeakRef object will return null if the real object was disposed - if (null === $callback) { - return null; - } - - // Minor performance tweak, if the callback gets called more than once - if (!isset(self::$isPhp54)) { - self::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>='); - } - - $argCount = count($args); - - if (self::$isPhp54 && is_string($callback)) { - $result = $this->validateStringCallbackFor54($callback); - - if ($result !== true && $argCount <= 3) { - $callback = $result; - // Minor performance tweak, if the callback gets called more - // than once - $this->callback = $result; - } - } - - // Minor performance tweak; use call_user_func() until > 3 arguments - // reached - switch ($argCount) { - case 0: - if (self::$isPhp54) { - return $callback(); - } - return call_user_func($callback); - case 1: - if (self::$isPhp54) { - return $callback(array_shift($args)); - } - return call_user_func($callback, array_shift($args)); - case 2: - $arg1 = array_shift($args); - $arg2 = array_shift($args); - if (self::$isPhp54) { - return $callback($arg1, $arg2); - } - return call_user_func($callback, $arg1, $arg2); - case 3: - $arg1 = array_shift($args); - $arg2 = array_shift($args); - $arg3 = array_shift($args); - if (self::$isPhp54) { - return $callback($arg1, $arg2, $arg3); - } - return call_user_func($callback, $arg1, $arg2, $arg3); - default: - return call_user_func_array($callback, $args); - } - } - - /** - * Invoke as functor - * - * @return mixed - */ - public function __invoke() - { - return $this->call(func_get_args()); - } - - /** - * Get all callback metadata - * - * @return array - */ - public function getMetadata() - { - return $this->metadata; - } - - /** - * Retrieve a single metadatum - * - * @param string $name - * @return mixed - */ - public function getMetadatum($name) - { - if (array_key_exists($name, $this->metadata)) { - return $this->metadata[$name]; - } - return null; - } - - /** - * Validate a static method call - * - * Validates that a static method call in PHP 5.4 will actually work - * - * @param string $callback - * @return true|array - * @throws Exception\InvalidCallbackException if invalid - */ - protected function validateStringCallbackFor54($callback) - { - if (!strstr($callback, '::')) { - return true; - } - - list($class, $method) = explode('::', $callback, 2); - - if (!class_exists($class)) { - throw new Exception\InvalidCallbackException(sprintf( - 'Static method call "%s" refers to a class that does not exist', - $callback - )); - } - - $r = new ReflectionClass($class); - if (!$r->hasMethod($method)) { - throw new Exception\InvalidCallbackException(sprintf( - 'Static method call "%s" refers to a method that does not exist', - $callback - )); - } - $m = $r->getMethod($method); - if (!$m->isStatic()) { - throw new Exception\InvalidCallbackException(sprintf( - 'Static method call "%s" refers to a method that is not static', - $callback - )); - } - - // returning a non boolean value may not be nice for a validate method, - // but that allows the usage of a static string callback without using - // the call_user_func function. - return array($class, $method); - } -} diff --git a/lib/internal/Zend/Stdlib/DispatchableInterface.php b/lib/internal/Zend/Stdlib/DispatchableInterface.php deleted file mode 100644 index 150005f84c1d788858156880d57a2277a030a5e2..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/DispatchableInterface.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Zend\Stdlib\RequestInterface as Request; -use Zend\Stdlib\ResponseInterface as Response; - -/** - * @category Zend - * @package Zend_Stdlib - */ -interface DispatchableInterface -{ - /** - * Dispatch a request - * - * @param Request $request - * @param null|Response $response - * @return Response|mixed - */ - public function dispatch(Request $request, Response $response = null); -} diff --git a/lib/internal/Zend/Stdlib/ErrorHandler.php b/lib/internal/Zend/Stdlib/ErrorHandler.php deleted file mode 100644 index 91dcf311992f8e087d311f3920a50d1922fa3a76..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ErrorHandler.php +++ /dev/null @@ -1,107 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use ErrorException; - -/** - * ErrorHandler that can be used to catch internal PHP errors - * and convert to a ErrorException instance. - * - * @category Zend - * @package Zend_Stdlib - */ -abstract class ErrorHandler -{ - /** - * Flag to mark started - * - * @var boolean - */ - protected static $started = false; - - /** - * All errors as one instance of ErrorException - * using the previous exception support. - * - * @var null|ErrorException - */ - protected static $errorException = null; - - /** - * If the error handler has been started. - * - * @return boolean - */ - public static function started() - { - return static::$started; - } - - /** - * Starting the error handler - * - * @param int $errorLevel - * @throws Exception\LogicException If already started - */ - public static function start($errorLevel = \E_WARNING) - { - if (static::started() === true) { - throw new Exception\LogicException('ErrorHandler already started'); - } - - static::$started = true; - static::$errorException = null; - - set_error_handler(array(get_called_class(), 'addError'), $errorLevel); - } - - /** - * Stopping the error handler - * - * @param boolean $throw Throw the ErrorException if any - * @return null|ErrorException - * @throws Exception\LogicException If not started before - * @throws ErrorException If an error has been catched and $throw is true - */ - public static function stop($throw = false) - { - if (static::started() === false) { - throw new Exception\LogicException('ErrorHandler not started'); - } - - $errorException = static::$errorException; - - static::$started = false; - static::$errorException = null; - restore_error_handler(); - - if ($errorException && $throw) { - throw $errorException; - } - - return $errorException; - } - - /** - * Add an error to the stack. - * - * @param int $errno - * @param string $errstr - * @param string $errfile - * @param int $errline - * @return void - */ - public static function addError($errno, $errstr = '', $errfile = '', $errline = 0) - { - static::$errorException = new ErrorException($errstr, 0, $errno, $errfile, $errline, static::$errorException); - } -} diff --git a/lib/internal/Zend/Stdlib/Exception/BadMethodCallException.php b/lib/internal/Zend/Stdlib/Exception/BadMethodCallException.php deleted file mode 100644 index b2c90a933f4a45185b488d98fd15e9ac796ca193..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Exception/BadMethodCallException.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Exception; - -/** - * Bad method call exception - * - * @category Zend - * @package Zend_Stdlib - * @subpackage Exception - */ -class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Exception/DomainException.php b/lib/internal/Zend/Stdlib/Exception/DomainException.php deleted file mode 100644 index c735fda3106f860c611b0b2297b7326c42386e0c..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Exception/DomainException.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Exception; - -/** - * Domain exception - * - * @category Zend - * @package Zend_Stdlib - * @subpackage Exception - */ -class DomainException extends \DomainException implements ExceptionInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Exception/ExceptionInterface.php b/lib/internal/Zend/Stdlib/Exception/ExceptionInterface.php deleted file mode 100644 index c09b03763dafadc32b380656dbe66f83f22c01e3..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Exception/ExceptionInterface.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Exception; - -/** - * Exception marker interface - * - * @category Zend - * @package Zend_Stdlib - * @subpackage Exception - */ -interface ExceptionInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Exception/InvalidArgumentException.php b/lib/internal/Zend/Stdlib/Exception/InvalidArgumentException.php deleted file mode 100644 index 2cdfd38be1d438ff698819df1b19d280ece0086f..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Exception/InvalidArgumentException.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Exception; - -/** - * Invalid Argument Exception - * - * @category Zend - * @package Zend_Stdlib - * @subpackage Exception - */ -class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Exception/InvalidCallbackException.php b/lib/internal/Zend/Stdlib/Exception/InvalidCallbackException.php deleted file mode 100644 index cd08a315d3483cb69a4bc778141f8914c3afd65c..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Exception/InvalidCallbackException.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Exception; - -/** - * Invalid callback exception - * - * @category Zend - * @package Zend_Stdlib - * @subpackage Exception - */ -class InvalidCallbackException extends DomainException implements ExceptionInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Exception/LogicException.php b/lib/internal/Zend/Stdlib/Exception/LogicException.php deleted file mode 100644 index 5a23e3ff1a08209b67bd8dfc32ecdaebb90ea8c8..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Exception/LogicException.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Exception; - -/** - * Logic exception - * - * @category Zend - * @package Zend_Stdlib - * @subpackage Exception - */ -class LogicException extends \LogicException implements ExceptionInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Glob.php b/lib/internal/Zend/Stdlib/Glob.php deleted file mode 100644 index 09679c2c759ad0f6877014e10089d63de915d827..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Glob.php +++ /dev/null @@ -1,197 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * Wrapper for glob with fallback if GLOB_BRACE is not available. - * - * @category Zend - * @package Zend_Stdlib - */ -abstract class Glob -{ - /**#@+ - * Glob constants. - */ - const GLOB_MARK = 0x01; - const GLOB_NOSORT = 0x02; - const GLOB_NOCHECK = 0x04; - const GLOB_NOESCAPE = 0x08; - const GLOB_BRACE = 0x10; - const GLOB_ONLYDIR = 0x20; - const GLOB_ERR = 0x40; - /**#@-*/ - - /** - * Find pathnames matching a pattern. - * - * @see http://docs.php.net/glob - * @param string $pattern - * @param integer $flags - * @param boolean $forceFallback - * @return array|false - */ - public static function glob($pattern, $flags, $forceFallback = false) - { - if (!defined('GLOB_BRACE') || $forceFallback) { - return self::fallbackGlob($pattern, $flags); - } else { - return self::systemGlob($pattern, $flags); - } - } - - /** - * Use the glob function provided by the system. - * - * @param string $pattern - * @param integer $flags - * @return array|false - */ - protected static function systemGlob($pattern, $flags) - { - if ($flags) { - $flagMap = array( - self::GLOB_MARK => GLOB_MARK, - self::GLOB_NOSORT => GLOB_NOSORT, - self::GLOB_NOCHECK => GLOB_NOCHECK, - self::GLOB_NOESCAPE => GLOB_NOESCAPE, - self::GLOB_BRACE => GLOB_BRACE, - self::GLOB_ONLYDIR => GLOB_ONLYDIR, - self::GLOB_ERR => GLOB_ERR, - ); - - $globFlags = 0; - - foreach ($flagMap as $internalFlag => $globFlag) { - if ($flags & $internalFlag) { - $globFlags |= $globFlag; - } - } - } else { - $globFlags = 0; - } - - return glob($pattern, $globFlags); - } - - /** - * Expand braces manually, then use the system glob. - * - * @param string $pattern - * @param integer $flags - * @return array|false - */ - protected static function fallbackGlob($pattern, $flags) - { - if (!$flags & self::GLOB_BRACE) { - return self::systemGlob($pattern, $flags); - } - - $flags &= ~self::GLOB_BRACE; - $length = strlen($pattern); - $paths = array(); - - if ($flags & self::GLOB_NOESCAPE) { - $begin = strpos($pattern, '{'); - } else { - $begin = 0; - - while (true) { - if ($begin === $length) { - $begin = false; - break; - } elseif ($pattern[$begin] === '\\' && ($begin + 1) < $length) { - $begin++; - } elseif ($pattern[$begin] === '{') { - break; - } - - $begin++; - } - } - - if ($begin === false) { - return self::systemGlob($pattern, $flags); - } - - $next = self::nextBraceSub($pattern, $begin + 1, $flags); - - if ($next === null) { - return self::systemGlob($pattern, $flags); - } - - $rest = $next; - - while ($pattern[$rest] !== '}') { - $rest = self::nextBraceSub($pattern, $rest + 1, $flags); - - if ($rest === null) { - return self::systemGlob($pattern, $flags); - } - } - - $p = $begin + 1; - - while (true) { - $subPattern = substr($pattern, 0, $begin) - . substr($pattern, $p, $next - $p) - . substr($pattern, $rest + 1); - - $result = self::fallbackGlob($subPattern, $flags | self::GLOB_BRACE); - - if ($result) { - $paths = array_merge($paths, $result); - } - - if ($pattern[$next] === '}') { - break; - } - - $p = $next + 1; - $next = self::nextBraceSub($pattern, $p, $flags); - } - - return array_unique($paths); - } - - /** - * Find the end of the sub-pattern in a brace expression. - * - * @param string $pattern - * @param integer $begin - * @param integer $flags - * @return integer|null - */ - protected static function nextBraceSub($pattern, $begin, $flags) - { - $length = strlen($pattern); - $depth = 0; - $current = $begin; - - while ($current < $length) { - if (!$flags & self::GLOB_NOESCAPE && $pattern[$current] === '\\') { - if (++$current === $length) { - break; - } - - $current++; - } else { - if (($pattern[$current] === '}' && $depth-- === 0) || ($pattern[$current] === ',' && $depth === 0)) { - break; - } elseif ($pattern[$current++] === '{') { - $depth++; - } - } - } - - return ($current < $length ? $current : null); - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/AbstractHydrator.php b/lib/internal/Zend/Stdlib/Hydrator/AbstractHydrator.php deleted file mode 100644 index 4b320f18f1898107921e6be4670d39968ccb194f..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/AbstractHydrator.php +++ /dev/null @@ -1,117 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -use ArrayObject; -use Zend\Stdlib\Hydrator\StrategyEnabledInterface; -use Zend\Stdlib\Hydrator\Strategy\StrategyInterface; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInterface -{ - /** - * The list with strategies that this hydrator has. - * - * @var ArrayObject - */ - protected $strategies; - - /** - * Initializes a new instance of this class. - */ - public function __construct() - { - $this->strategies = new ArrayObject(); - } - - /** - * Gets the strategy with the given name. - * - * @param string $name The name of the strategy to get. - * @return StrategyInterface - */ - public function getStrategy($name) - { - return $this->strategies[$name]; - } - - /** - * Checks if the strategy with the given name exists. - * - * @param string $name The name of the strategy to check for. - * @return bool - */ - public function hasStrategy($name) - { - return array_key_exists($name, $this->strategies); - } - - /** - * Adds the given strategy under the given name. - * - * @param string $name The name of the strategy to register. - * @param StrategyInterface $strategy The strategy to register. - * @return HydratorInterface - */ - public function addStrategy($name, StrategyInterface $strategy) - { - $this->strategies[$name] = $strategy; - return $this; - } - - /** - * Removes the strategy with the given name. - * - * @param string $name The name of the strategy to remove. - * @return HydratorInterface - */ - public function removeStrategy($name) - { - unset($this->strategies[$name]); - return $this; - } - - /** - * Converts a value for extraction. If no strategy exists the plain value is returned. - * - * @param string $name The name of the strategy to use. - * @param mixed $value The value that should be converted. - * @return mixed - */ - public function extractValue($name, $value) - { - if ($this->hasStrategy($name)) { - $strategy = $this->getStrategy($name); - $value = $strategy->extract($value); - } - return $value; - } - - /** - * Converts a value for hydration. If no strategy exists the plain value is returned. - * - * @param string $name The name of the strategy to use. - * @param mixed $value The value that should be converted. - * @return mixed - */ - public function hydrateValue($name, $value) - { - if ($this->hasStrategy($name)) { - $strategy = $this->getStrategy($name); - $value = $strategy->hydrate($value); - } - return $value; - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/ArraySerializable.php b/lib/internal/Zend/Stdlib/Hydrator/ArraySerializable.php deleted file mode 100644 index 3b6cb18e23d445a1e55739b113c44212a96249ec..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/ArraySerializable.php +++ /dev/null @@ -1,77 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -use Zend\Stdlib\Exception; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -class ArraySerializable extends AbstractHydrator -{ - - /** - * Extract values from the provided object - * - * Extracts values via the object's getArrayCopy() method. - * - * @param object $object - * @return array - * @throws Exception\BadMethodCallException for an $object not implementing getArrayCopy() - */ - public function extract($object) - { - if (!is_callable(array($object, 'getArrayCopy'))) { - throw new Exception\BadMethodCallException(sprintf( - '%s expects the provided object to implement getArrayCopy()', __METHOD__ - )); - } - - $self = $this; - $data = $object->getArrayCopy(); - array_walk($data, function(&$value, $name) use ($self) { - $value = $self->extractValue($name, $value); - }); - return $data; - } - - /** - * Hydrate an object - * - * Hydrates an object by passing $data to either its exchangeArray() or - * populate() method. - * - * @param array $data - * @param object $object - * @return object - * @throws Exception\BadMethodCallException for an $object not implementing exchangeArray() or populate() - */ - public function hydrate(array $data, $object) - { - $self = $this; - array_walk($data, function(&$value, $name) use ($self) { - $value = $self->hydrateValue($name, $value); - }); - - if (is_callable(array($object, 'exchangeArray'))) { - $object->exchangeArray($data); - } elseif (is_callable(array($object, 'populate'))) { - $object->populate($data); - } else { - throw new Exception\BadMethodCallException(sprintf( - '%s expects the provided object to implement exchangeArray() or populate()', __METHOD__ - )); - } - return $object; - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/ClassMethods.php b/lib/internal/Zend/Stdlib/Hydrator/ClassMethods.php deleted file mode 100644 index ad565f88de53f38c47d9447af271e57b6e60b509..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/ClassMethods.php +++ /dev/null @@ -1,118 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -use Zend\Stdlib\Exception; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -class ClassMethods extends AbstractHydrator -{ - /** - * Flag defining whether array keys are underscore-separated (true) or camel case (false) - * @var boolean - */ - protected $underscoreSeparatedKeys; - - /** - * Define if extract values will use camel case or name with underscore - * @param boolean $underscoreSeparatedKeys - */ - public function __construct($underscoreSeparatedKeys = true) - { - parent::__construct(); - $this->underscoreSeparatedKeys = $underscoreSeparatedKeys; - } - - /** - * Extract values from an object with class methods - * - * Extracts the getter/setter of the given $object. - * - * @param object $object - * @return array - * @throws Exception\BadMethodCallException for a non-object $object - */ - public function extract($object) - { - if (!is_object($object)) { - throw new Exception\BadMethodCallException(sprintf( - '%s expects the provided $object to be a PHP object)', __METHOD__ - )); - } - - $transform = function($letters) { - $letter = array_shift($letters); - return '_' . strtolower($letter); - }; - $attributes = array(); - $methods = get_class_methods($object); - - foreach ($methods as $method) { - if (!preg_match('/^(get|has|is)[A-Z]\w*/', $method)) { - continue; - } - - $attribute = $method; - if (preg_match('/^get/', $method)) { - $attribute = substr($method, 3); - $attribute = lcfirst($attribute); - } - - if ($this->underscoreSeparatedKeys) { - $attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute); - } - $attributes[$attribute] = $this->extractValue($attribute, $object->$method()); - } - - return $attributes; - } - - /** - * Hydrate an object by populating getter/setter methods - * - * Hydrates an object by getter/setter methods of the object. - * - * @param array $data - * @param object $object - * @return object - * @throws Exception\BadMethodCallException for a non-object $object - */ - public function hydrate(array $data, $object) - { - if (!is_object($object)) { - throw new Exception\BadMethodCallException(sprintf( - '%s expects the provided $object to be a PHP object)', __METHOD__ - )); - } - - $transform = function($letters) { - $letter = substr(array_shift($letters), 1, 1); - return ucfirst($letter); - }; - - foreach ($data as $property => $value) { - if ($this->underscoreSeparatedKeys) { - $property = preg_replace_callback('/(_[a-z])/', $transform, $property); - } - $method = 'set' . ucfirst($property); - if (method_exists($object, $method)) { - $value = $this->hydrateValue($property, $value); - - $object->$method($value); - } - } - return $object; - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/HydratorInterface.php b/lib/internal/Zend/Stdlib/Hydrator/HydratorInterface.php deleted file mode 100644 index d014b3fdc0448985d153c2fba28414c9524f4e4a..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/HydratorInterface.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -interface HydratorInterface -{ - /** - * Extract values from an object - * - * @param object $object - * @return array - */ - public function extract($object); - - /** - * Hydrate $object with the provided $data. - * - * @param array $data - * @param object $object - * @return object - */ - public function hydrate(array $data, $object); -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/ObjectProperty.php b/lib/internal/Zend/Stdlib/Hydrator/ObjectProperty.php deleted file mode 100644 index 2416de8a588f9c418b7fc32e6a14038b24470032..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/ObjectProperty.php +++ /dev/null @@ -1,69 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -use Zend\Stdlib\Exception; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -class ObjectProperty extends AbstractHydrator -{ - /** - * Extract values from an object - * - * Extracts the accessible non-static properties of the given $object. - * - * @param object $object - * @return array - * @throws Exception\BadMethodCallException for a non-object $object - */ - public function extract($object) - { - if (!is_object($object)) { - throw new Exception\BadMethodCallException(sprintf( - '%s expects the provided $object to be a PHP object)', __METHOD__ - )); - } - - $self = $this; - $data = get_object_vars($object); - array_walk($data, function(&$value, $name) use ($self) { - $value = $self->extractValue($name, $value); - }); - return $data; - } - - /** - * Hydrate an object by populating public properties - * - * Hydrates an object by setting public properties of the object. - * - * @param array $data - * @param object $object - * @return object - * @throws Exception\BadMethodCallException for a non-object $object - */ - public function hydrate(array $data, $object) - { - if (!is_object($object)) { - throw new Exception\BadMethodCallException(sprintf( - '%s expects the provided $object to be a PHP object)', __METHOD__ - )); - } - foreach ($data as $property => $value) { - $object->$property = $this->hydrateValue($property, $value); - } - return $object; - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/Reflection.php b/lib/internal/Zend/Stdlib/Hydrator/Reflection.php deleted file mode 100644 index e9d1d66fc01af878082a3f73d9e2936080da4ca3..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/Reflection.php +++ /dev/null @@ -1,95 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -use ReflectionClass; -use Zend\Stdlib\Exception; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -class Reflection extends AbstractHydrator -{ - /** - * Simple in-memory array cache of ReflectionProperties used. - * @var array - */ - protected static $reflProperties = array(); - - /** - * Extract values from an object - * - * @param object $object - * @return array - */ - public function extract($object) - { - $result = array(); - foreach (self::getReflProperties($object) as $property) { - $propertyName = $property->getName(); - - $value = $property->getValue($object); - $result[$propertyName] = $this->extractValue($propertyName, $value); - } - - return $result; - } - - /** - * Hydrate $object with the provided $data. - * - * @param array $data - * @param object $object - * @return object - */ - public function hydrate(array $data, $object) - { - $reflProperties = self::getReflProperties($object); - foreach ($data as $key => $value) { - if (isset($reflProperties[$key])) { - $reflProperties[$key]->setValue($object, $this->hydrateValue($key, $value)); - } - } - return $object; - } - - /** - * Get a reflection properties from in-memory cache and lazy-load if - * class has not been loaded. - * - * @static - * @param string|object $input - * @throws Exception\InvalidArgumentException - * @return array - */ - protected static function getReflProperties($input) - { - if (is_object($input)) { - $input = get_class($input); - } elseif (!is_string($input)) { - throw new Exception\InvalidArgumentException('Input must be a string or an object.'); - } - - if (!isset(self::$reflProperties[$input])) { - $reflClass = new ReflectionClass($input); - $reflProperties = $reflClass->getProperties(); - - foreach ($reflProperties as $property) { - $property->setAccessible(true); - self::$reflProperties[$input][$property->getName()] = $property; - } - } - - return self::$reflProperties[$input]; - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php b/lib/internal/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php deleted file mode 100644 index 0bdc2e761e6d1ee8feb89004e4d67865e6defcf4..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator\Strategy; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -class DefaultStrategy implements StrategyInterface -{ - /** - * Converts the given value so that it can be extracted by the hydrator. - * - * @param mixed $value The original value. - * @return mixed Returns the value that should be extracted. - */ - public function extract($value) - { - return $value; - } - - /** - * Converts the given value so that it can be hydrated by the hydrator. - * - * @param mixed $value The original value. - * @return mixed Returns the value that should be hydrated. - */ - public function hydrate($value) - { - return $value; - } -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php b/lib/internal/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php deleted file mode 100644 index 56d576247f50004ba3329ee3f7431e06be90d847..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator\Strategy; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -interface StrategyInterface -{ - /** - * Converts the given value so that it can be extracted by the hydrator. - * - * @param mixed $value The original value. - * @return mixed Returns the value that should be extracted. - */ - public function extract($value); - - /** - * Converts the given value so that it can be hydrated by the hydrator. - * - * @param mixed $value The original value. - * @return mixed Returns the value that should be hydrated. - */ - public function hydrate($value); -} diff --git a/lib/internal/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php b/lib/internal/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php deleted file mode 100644 index 413b48fe8b2cff34ac9968fd3cac47382db598d6..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php +++ /dev/null @@ -1,54 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib\Hydrator; - -use Zend\Stdlib\Hydrator\Strategy\StrategyInterface; - -/** - * @category Zend - * @package Zend_Stdlib - * @subpackage Hydrator - */ -interface StrategyEnabledInterface -{ - /** - * Adds the given strategy under the given name. - * - * @param string $name The name of the strategy to register. - * @param StrategyInterface $strategy The strategy to register. - * @return HydratorInterface - */ - public function addStrategy($name, StrategyInterface $strategy); - - /** - * Gets the strategy with the given name. - * - * @param string $name The name of the strategy to get. - * @return StrategyInterface - */ - public function getStrategy($name); - - /** - * Checks if the strategy with the given name exists. - * - * @param string $name The name of the strategy to check for. - * @return bool - */ - public function hasStrategy($name); - - /** - * Removes the strategy with the given name. - * - * @param string $name The name of the strategy to remove. - * @return HydratorInterface - */ - public function removeStrategy($name); -} diff --git a/lib/internal/Zend/Stdlib/Message.php b/lib/internal/Zend/Stdlib/Message.php deleted file mode 100644 index 0ac4e992ba4746dc63706e7ba14ef0c44c3a8d91..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Message.php +++ /dev/null @@ -1,124 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Traversable; - -/** - * @category Zend - * @package Zend_Stdlib - */ -class Message implements MessageInterface -{ - /** - * @var array - */ - protected $metadata = array(); - - /** - * @var string - */ - protected $content = ''; - - /** - * Set message metadata - * - * Non-destructive setting of message metadata; always adds to the metadata, never overwrites - * the entire metadata container. - * - * @param string|int|array|Traversable $spec - * @param mixed $value - * @throws Exception\InvalidArgumentException - * @return Message - */ - public function setMetadata($spec, $value = null) - { - if (is_scalar($spec)) { - $this->metadata[$spec] = $value; - return $this; - } - if (!is_array($spec) && !$spec instanceof Traversable) { - throw new Exception\InvalidArgumentException(sprintf( - 'Expected a string, array, or Traversable argument in first position; received "%s"', - (is_object($spec) ? get_class($spec) : gettype($spec)) - )); - } - foreach ($spec as $key => $value) { - $this->metadata[$key] = $value; - } - return $this; - } - - /** - * Retrieve all metadata or a single metadatum as specified by key - * - * @param null|string|int $key - * @param null|mixed $default - * @throws Exception\InvalidArgumentException - * @return mixed - */ - public function getMetadata($key = null, $default = null) - { - if (null === $key) { - return $this->metadata; - } - - if (!is_scalar($key)) { - throw new Exception\InvalidArgumentException('Non-scalar argument provided for key'); - } - - if (array_key_exists($key, $this->metadata)) { - return $this->metadata[$key]; - } - - return $default; - } - - /** - * Set message content - * - * @param mixed $value - * @return Message - */ - public function setContent($value) - { - $this->content = $value; - return $this; - } - - /** - * Get message content - * - * @return mixed - */ - public function getContent() - { - return $this->content; - } - - /** - * @return string - */ - public function toString() - { - $request = ''; - foreach ($this->getMetadata() as $key => $value) { - $request .= sprintf( - "%s: %s\r\n", - (string) $key, - (string) $value - ); - } - $request .= "\r\n" . $this->getContent(); - return $request; - } - -} diff --git a/lib/internal/Zend/Stdlib/MessageInterface.php b/lib/internal/Zend/Stdlib/MessageInterface.php deleted file mode 100644 index d947c7769c8656a5dd6cc083fcc847629d5e1bc2..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/MessageInterface.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -interface MessageInterface -{ - /** - * Set metadata - * - * @param string|int|array|\Traversable $spec - * @param mixed $value - */ - public function setMetadata($spec, $value = null); - - /** - * Get metadata - * - * @param null|string|int $key - * @return mixed - */ - public function getMetadata($key = null); - - /** - * Set content - * - * @param mixed $content - * @return mixed - */ - public function setContent($content); - - /** - * Get content - * - * @return mixed - */ - public function getContent(); - -} diff --git a/lib/internal/Zend/Stdlib/ParameterObjectInterface.php b/lib/internal/Zend/Stdlib/ParameterObjectInterface.php deleted file mode 100644 index d173fe4436524ed714a79d3857a0328b85601b02..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ParameterObjectInterface.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -interface ParameterObjectInterface -{ - /** - * @param string $key - * @param mixed $value - * @return void - */ - public function __set($key, $value); - - /** - * @param string $key - * @return mixed - */ - public function __get($key); - - /** - * @param string $key - * @return boolean - */ - public function __isset($key); - - /** - * @param string $key - * @return void - */ - public function __unset($key); -} diff --git a/lib/internal/Zend/Stdlib/Parameters.php b/lib/internal/Zend/Stdlib/Parameters.php deleted file mode 100644 index c88ac159a9e4f8e77668d974bef5faf2b8b1e612..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Parameters.php +++ /dev/null @@ -1,120 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use ArrayObject; - -/** - * @category Zend - * @package Zend_Stdlib - */ -class Parameters extends ArrayObject implements ParametersInterface -{ - /** - * Constructor - * - * Enforces that we have an array, and enforces parameter access to array - * elements. - * - * @param array $values - */ - public function __construct(array $values = null) - { - if (null === $values) { - $values = array(); - } - parent::__construct($values, ArrayObject::ARRAY_AS_PROPS); - } - - /** - * Populate from native PHP array - * - * @param array $values - * @return void - */ - public function fromArray(array $values) - { - $this->exchangeArray($values); - } - - /** - * Populate from query string - * - * @param string $string - * @return void - */ - public function fromString($string) - { - $array = array(); - parse_str($string, $array); - $this->fromArray($array); - } - - /** - * Serialize to native PHP array - * - * @return array - */ - public function toArray() - { - return $this->getArrayCopy(); - } - - /** - * Serialize to query string - * - * @return string - */ - public function toString() - { - return http_build_query($this); - } - - /** - * Retrieve by key - * - * Returns null if the key does not exist. - * - * @param string $name - * @return mixed - */ - public function offsetGet($name) - { - if (isset($this[$name])) { - return parent::offsetGet($name); - } - return null; - } - - /** - * @param string $name - * @param mixed $default optional default value - * @return mixed - */ - public function get($name, $default = null) - { - if (isset($this[$name])) { - return parent::offsetGet($name); - } - return $default; - } - - /** - * @param string $name - * @param mixed $value - * @return Parameters - */ - public function set($name, $value) - { - $this[$name] = $value; - return $this; - } -} diff --git a/lib/internal/Zend/Stdlib/ParametersInterface.php b/lib/internal/Zend/Stdlib/ParametersInterface.php deleted file mode 100644 index 3c3889c786cf272fa6f8c03e2bfa359cf7272425..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ParametersInterface.php +++ /dev/null @@ -1,90 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use ArrayAccess; -use Countable; -use Serializable; -use Traversable; - -/* - * Basically, an ArrayObject. You could simply define something like: - * class QueryParams extends ArrayObject implements Parameters {} - * and have 90% of the functionality - * - * @category Zend - * @package Zend_Stdlib - */ -interface ParametersInterface extends ArrayAccess, Countable, Serializable, Traversable -{ - /** - * Constructor - * - * @param array $values - */ - public function __construct(array $values = null); - - /** - * From array - * - * Allow deserialization from standard array - * - * @param array $values - * @return mixed - */ - public function fromArray(array $values); - - /** - * From string - * - * Allow deserialization from raw body; e.g., for PUT requests - * - * @param $string - * @return mixed - */ - public function fromString($string); - - /** - * To array - * - * Allow serialization back to standard array - * - * @return mixed - */ - public function toArray(); - - /** - * To string - * - * Allow serialization to query format; e.g., for PUT or POST requests - * - * @return mixed - */ - public function toString(); - - /** - * Get - * - * @param string $name - * @param mixed|null $default - * @return mixed - */ - public function get($name, $default = null); - - /** - * Set - * - * @param string $name - * @param mixed $value - * @return ParametersInterface - */ - public function set($name, $value); -} diff --git a/lib/internal/Zend/Stdlib/PriorityQueue.php b/lib/internal/Zend/Stdlib/PriorityQueue.php deleted file mode 100644 index ecb8fbd317b1d18d24c446cacdb9d28fdf7e6fd7..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/PriorityQueue.php +++ /dev/null @@ -1,303 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Countable; -use IteratorAggregate; -use Serializable; - -/** - * Re-usable, serializable priority queue implementation - * - * SplPriorityQueue acts as a heap; on iteration, each item is removed from the - * queue. If you wish to re-use such a queue, you need to clone it first. This - * makes for some interesting issues if you wish to delete items from the queue, - * or, as already stated, iterate over it multiple times. - * - * This class aggregates items for the queue itself, but also composes an - * "inner" iterator in the form of an SplPriorityQueue object for performing - * the actual iteration. - * - * @category Zend - * @package Zend_Stdlib - */ -class PriorityQueue implements Countable, IteratorAggregate, Serializable -{ - const EXTR_DATA = 0x00000001; - const EXTR_PRIORITY = 0x00000002; - const EXTR_BOTH = 0x00000003; - - /** - * Inner queue class to use for iteration - * @var string - */ - protected $queueClass = 'Zend\Stdlib\SplPriorityQueue'; - - /** - * Actual items aggregated in the priority queue. Each item is an array - * with keys "data" and "priority". - * @var array - */ - protected $items = array(); - - /** - * Inner queue object - * @var SplPriorityQueue - */ - protected $queue; - - /** - * Insert an item into the queue - * - * Priority defaults to 1 (low priority) if none provided. - * - * @param mixed $data - * @param int $priority - * @return PriorityQueue - */ - public function insert($data, $priority = 1) - { - $priority = (int) $priority; - $this->items[] = array( - 'data' => $data, - 'priority' => $priority, - ); - $this->getQueue()->insert($data, $priority); - return $this; - } - - /** - * Remove an item from the queue - * - * This is different than {@link extract()}; its purpose is to dequeue an - * item. - * - * This operation is potentially expensive, as it requires - * re-initialization and re-population of the inner queue. - * - * Note: this removes the first item matching the provided item found. If - * the same item has been added multiple times, it will not remove other - * instances. - * - * @param mixed $datum - * @return boolean False if the item was not found, true otherwise. - */ - public function remove($datum) - { - $found = false; - foreach ($this->items as $key => $item) { - if ($item['data'] === $datum) { - $found = true; - break; - } - } - if ($found) { - unset($this->items[$key]); - $this->queue = null; - $queue = $this->getQueue(); - foreach ($this->items as $item) { - $queue->insert($item['data'], $item['priority']); - } - return true; - } - return false; - } - - /** - * Is the queue empty? - * - * @return bool - */ - public function isEmpty() - { - return (0 === $this->count()); - } - - /** - * How many items are in the queue? - * - * @return int - */ - public function count() - { - return count($this->items); - } - - /** - * Peek at the top node in the queue, based on priority. - * - * @return mixed - */ - public function top() - { - return $this->getIterator()->top(); - } - - /** - * Extract a node from the inner queue and sift up - * - * @return mixed - */ - public function extract() - { - return $this->getQueue()->extract(); - } - - /** - * Retrieve the inner iterator - * - * SplPriorityQueue acts as a heap, which typically implies that as items - * are iterated, they are also removed. This does not work for situations - * where the queue may be iterated multiple times. As such, this class - * aggregates the values, and also injects an SplPriorityQueue. This method - * retrieves the inner queue object, and clones it for purposes of - * iteration. - * - * @return SplPriorityQueue - */ - public function getIterator() - { - $queue = $this->getQueue(); - return clone $queue; - } - - /** - * Serialize the data structure - * - * @return string - */ - public function serialize() - { - return serialize($this->items); - } - - /** - * Unserialize a string into a PriorityQueue object - * - * Serialization format is compatible with {@link Zend\Stdlib\SplPriorityQueue} - * - * @param string $data - * @return void - */ - public function unserialize($data) - { - foreach (unserialize($data) as $item) { - $this->insert($item['data'], $item['priority']); - } - } - - /** - * Serialize to an array - * - * By default, returns only the item data, and in the order registered (not - * sorted). You may provide one of the EXTR_* flags as an argument, allowing - * the ability to return priorities or both data and priority. - * - * @param int $flag - * @return array - */ - public function toArray($flag = self::EXTR_DATA) - { - switch ($flag) { - case self::EXTR_BOTH: - return $this->items; - break; - case self::EXTR_PRIORITY: - return array_map(function($item) { - return $item['priority']; - }, $this->items); - case self::EXTR_DATA: - default: - return array_map(function($item) { - return $item['data']; - }, $this->items); - } - } - - /** - * Specify the internal queue class - * - * Please see {@link getIterator()} for details on the necessity of an - * internal queue class. The class provided should extend SplPriorityQueue. - * - * @param string $class - * @return PriorityQueue - */ - public function setInternalQueueClass($class) - { - $this->queueClass = (string) $class; - return $this; - } - - /** - * Does the queue contain the given datum? - * - * @param mixed $datum - * @return bool - */ - public function contains($datum) - { - foreach ($this->items as $item) { - if ($item['data'] === $datum) { - return true; - } - } - return false; - } - - /** - * Does the queue have an item with the given priority? - * - * @param int $priority - * @return bool - */ - public function hasPriority($priority) - { - foreach ($this->items as $item) { - if ($item['priority'] === $priority) { - return true; - } - } - return false; - } - - /** - * Get the inner priority queue instance - * - * @throws \DomainException - * @return SplPriorityQueue - */ - protected function getQueue() - { - if (null === $this->queue) { - $this->queue = new $this->queueClass(); - if (!$this->queue instanceof \SplPriorityQueue) { - throw new \DomainException(sprintf( - 'PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"', - get_class($this->queue) - )); - } - } - return $this->queue; - } - - /** - * Add support for deep cloning - * - * @return void - */ - public function __clone() - { - if (null !== $this->queue) { - $this->queue = clone $this->queue; - } - } -} diff --git a/lib/internal/Zend/Stdlib/Request.php b/lib/internal/Zend/Stdlib/Request.php deleted file mode 100644 index d230069e69d3d009d2352b8ff930435ce93df61a..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Request.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -class Request extends Message implements RequestInterface -{ - // generic request implementation -} diff --git a/lib/internal/Zend/Stdlib/RequestInterface.php b/lib/internal/Zend/Stdlib/RequestInterface.php deleted file mode 100644 index 1dd0748a6e27b5264778059ac8dad2bdacdf2173..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/RequestInterface.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -interface RequestInterface extends MessageInterface -{ -} diff --git a/lib/internal/Zend/Stdlib/Response.php b/lib/internal/Zend/Stdlib/Response.php deleted file mode 100644 index b15dfd0846bbe809bca221bcf455a8e41c1a4393..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/Response.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -class Response extends Message implements ResponseInterface -{ - // generic response implementation -} diff --git a/lib/internal/Zend/Stdlib/ResponseInterface.php b/lib/internal/Zend/Stdlib/ResponseInterface.php deleted file mode 100644 index 6ad4002ba81700eded8506c39ad27219245dabba..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/ResponseInterface.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -/** - * @category Zend - * @package Zend_Stdlib - */ -interface ResponseInterface extends MessageInterface -{ - -} diff --git a/lib/internal/Zend/Stdlib/SplPriorityQueue.php b/lib/internal/Zend/Stdlib/SplPriorityQueue.php deleted file mode 100644 index 690b6f6c4d5aba0f7064ce317d48032611d64bf2..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/SplPriorityQueue.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Serializable; - -/** - * Serializable version of SplPriorityQueue - * - * Also, provides predictable heap order for datums added with the same priority - * (i.e., they will be emitted in the same order they are enqueued). - * - * @category Zend - * @package Zend_Stdlib - */ -class SplPriorityQueue extends \SplPriorityQueue implements Serializable -{ - /** - * @var int Seed used to ensure queue order for items of the same priority - */ - protected $serial = PHP_INT_MAX; - - /** - * Insert a value with a given priority - * - * Utilizes {@var $serial} to ensure that values of equal priority are - * emitted in the same order in which they are inserted. - * - * @param mixed $datum - * @param mixed $priority - * @return void - */ - public function insert($datum, $priority) - { - if (!is_array($priority)) { - $priority = array($priority, $this->serial--); - } - parent::insert($datum, $priority); - } - - - /** - * Serialize to an array - * - * Array will be priority => data pairs - * - * @return array - */ - public function toArray() - { - $array = array(); - foreach (clone $this as $item) { - $array[] = $item; - } - return $array; - } - - - /** - * Serialize - * - * @return string - */ - public function serialize() - { - $clone = clone $this; - $clone->setExtractFlags(self::EXTR_BOTH); - - $data = array(); - foreach ($clone as $item) { - $data[] = $item; - } - - return serialize($data); - } - - /** - * Deserialize - * - * @param string $data - * @return void - */ - public function unserialize($data) - { - foreach (unserialize($data) as $item) { - $this->insert($item['data'], $item['priority']); - } - } -} diff --git a/lib/internal/Zend/Stdlib/SplQueue.php b/lib/internal/Zend/Stdlib/SplQueue.php deleted file mode 100644 index e753201d8da79f96e17d601c20f82094a9d486d2..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/SplQueue.php +++ /dev/null @@ -1,59 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Serializable; - -/** - * Serializable version of SplQueue - * - * @category Zend - * @package Zend_Stdlib - */ -class SplQueue extends \SplQueue implements Serializable -{ - /** - * Return an array representing the queue - * - * @return array - */ - public function toArray() - { - $array = array(); - foreach ($this as $item) { - $array[] = $item; - } - return $array; - } - - /** - * Serialize - * - * @return string - */ - public function serialize() - { - return serialize($this->toArray()); - } - - /** - * Unserialize - * - * @param string $data - * @return void - */ - public function unserialize($data) - { - foreach (unserialize($data) as $item) { - $this->push($item); - } - } -} diff --git a/lib/internal/Zend/Stdlib/SplStack.php b/lib/internal/Zend/Stdlib/SplStack.php deleted file mode 100644 index be3c76a420f516bddc991c5689ae4b9d38501452..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/SplStack.php +++ /dev/null @@ -1,59 +0,0 @@ -<?php -/** - * Zend Framework (http://framework.zend.com/) - * - * @link http://github.com/zendframework/zf2 for the canonical source repository - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Stdlib - */ - -namespace Zend\Stdlib; - -use Serializable; - -/** - * Serializable version of SplStack - * - * @category Zend - * @package Zend_Stdlib - */ -class SplStack extends \SplStack implements Serializable -{ - /** - * Serialize to an array representing the stack - * - * @return array - */ - public function toArray() - { - $array = array(); - foreach ($this as $item) { - $array[] = $item; - } - return $array; - } - - /** - * Serialize - * - * @return string - */ - public function serialize() - { - return serialize($this->toArray()); - } - - /** - * Unserialize - * - * @param string $data - * @return void - */ - public function unserialize($data) - { - foreach (unserialize($data) as $item) { - $this->unshift($item); - } - } -} diff --git a/lib/internal/Zend/Stdlib/composer.json b/lib/internal/Zend/Stdlib/composer.json deleted file mode 100644 index ce7b30a3d1f3aa35c587b401229d364c60d1e489..0000000000000000000000000000000000000000 --- a/lib/internal/Zend/Stdlib/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "zendframework/zend-stdlib", - "description": " ", - "license": "BSD-3-Clause", - "keywords": [ - "zf2", - "stdlib" - ], - "autoload": { - "psr-0": { - "Zend\\Stdlib\\": "" - } - }, - "target-dir": "Zend/Stdlib", - "suggest": { - "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler" - }, - "require": { - "php": ">=5.3.3" - } -} diff --git a/lib/web/extjs/resources/css/ytheme-magento.css b/lib/web/extjs/resources/css/ytheme-magento.css index 33a5e29089849905c55f9e564be0798f5de6cf7d..fbe247a40d82d5bf725210984e950cdb1b6883af 100644 --- a/lib/web/extjs/resources/css/ytheme-magento.css +++ b/lib/web/extjs/resources/css/ytheme-magento.css @@ -628,4 +628,7 @@ input.l-tcb { } .ext-ie .x-tree { position:static !important; -} \ No newline at end of file +} +.no-active-category a span { + color: #aaa !important; +} diff --git a/lib/web/mage/components.js b/lib/web/mage/components.js index 83ba3566d72b1c8c8a4ed72ddb5ee12a6b0597ba..406574f29e80d9e69bbf96503275479ca3d604b2 100644 --- a/lib/web/mage/components.js +++ b/lib/web/mage/components.js @@ -41,7 +41,7 @@ define([], function() { //Catalog\view\frontend\templates\js\components.phtml tabs: 'mage/tabs', - catalogSearch: 'Magento_CatalogSearch/form-mini', + quickSearch: 'Magento_Search/form-mini', compareItems: 'Magento_Catalog/js/compare', compareList: 'Magento_Catalog/js/list', fileOption: 'Magento_Catalog/js/file-option', diff --git a/setup/config/autoload/global.php b/setup/config/autoload/global.php index 27854c20cabf8e465634d361ce747c46339936ed..25c82bad048642a8f880e69da20e115230f0d7a9 100644 --- a/setup/config/autoload/global.php +++ b/setup/config/autoload/global.php @@ -34,21 +34,10 @@ return [ 'config' => '/app/etc/', 'framework' => '/lib/internal/Magento/Framework/', 'permissions' => [ - 'etc' => [ - 'path' => 'app/etc', - ], - 'var' => [ - 'path' => 'var', - ], - 'cache' => [ - 'path' => 'var/cache', - ], - 'log' => [ - 'path' => 'var/log', - ], - 'session' => [ - 'path' => 'var/session', - ], + 'etc' => ['path' => 'app/etc'], // this is needed for installation only + 'var' => ['path' => 'var'], // to set maintenance mode, as well as for normal application runtime + 'media' => ['path' => 'pub/media'], // for normal application runtime + 'static' => ['path' => 'pub/static'] // for runtime, but actually depends on mode ], ], ], diff --git a/setup/module/Magento/Setup/config/di.config.php b/setup/module/Magento/Setup/config/di.config.php index d0db93929f4e3e4f064722feaa1e89387a73de23..0b113cc7518acdae3903e9402f451b4b74e96581 100644 --- a/setup/module/Magento/Setup/config/di.config.php +++ b/setup/module/Magento/Setup/config/di.config.php @@ -39,6 +39,7 @@ return [ 'Magento\Setup\Controller\Install\StartController', 'Magento\Setup\Controller\IndexController', 'Magento\Setup\Controller\LandingController', + 'Magento\Setup\Controller\LicenseController', 'Magento\Setup\Controller\EnvironmentController', 'Magento\Setup\Controller\UserController', 'Magento\Setup\Controller\ConsoleController', @@ -59,8 +60,6 @@ return [ 'Zend\EventManager\EventManagerInterface' => 'EventManager', 'Zend\ServiceManager\ServiceLocatorInterface' => 'ServiceManager', 'Magento\Setup\Module\Dependency\ManagerInterface' => 'Magento\Setup\Module\Dependency\Manager', - 'Magento\Setup\Module\Setup\Connection\AdapterInterface' => - 'Magento\Setup\Module\Setup\Connection\Adapter', 'Magento\Setup\Module\Resource\ResourceInterface' => 'Magento\Setup\Module\Resource\Resource', 'Magento\Setup\Module\ModuleListInterface' => 'Magento\Setup\Module\ModuleList', ] diff --git a/setup/module/Magento/Setup/config/languages.config.php b/setup/module/Magento/Setup/config/languages.config.php index ae122dbccf2d4c5843430dbd86432a83b5717464..2eee2f40e6767ba9201b23130a8949be7bba4d18 100644 --- a/setup/module/Magento/Setup/config/languages.config.php +++ b/setup/module/Magento/Setup/config/languages.config.php @@ -23,8 +23,5 @@ */ return [ - 'languages' => [ - 'en_US' => 'United State', - 'ua_UK' => 'Ukrainian', - ] + 'languages' => [] ]; diff --git a/setup/module/Magento/Setup/config/router.config.php b/setup/module/Magento/Setup/config/router.config.php index f4df0510301db0e0826647e2cebbda05dd8143d6..de5d3e706f20dd86105ec9ee96f8bf79d386c479 100644 --- a/setup/module/Magento/Setup/config/router.config.php +++ b/setup/module/Magento/Setup/config/router.config.php @@ -35,7 +35,7 @@ return [ 'setup' => [ 'type' => 'setup', 'options' => [ - 'regex' => '\b(?<lang>[\w]+).*\/(?<controller>[\w-\/]+)$', + 'regex' => '\b.*\/(?<controller>[\w-\/]+)$', 'defaults' => [ '__NAMESPACE__' => 'Magento\Setup\Controller', 'action' => 'index', diff --git a/setup/module/Magento/Setup/config/states.config.php b/setup/module/Magento/Setup/config/states.config.php index ea5d176294a49f131ee65e2b3b6c0e0b85d433e7..da1c77c0507fc6d4288ceead093ee63543065275 100644 --- a/setup/module/Magento/Setup/config/states.config.php +++ b/setup/module/Magento/Setup/config/states.config.php @@ -29,6 +29,15 @@ return [ 'step' => 0, 'views' => ['root' => []] ], + [ + 'id' => 'root.license', + 'url' => 'license', + 'templateUrl' => 'license', + 'title' => 'License', + 'main' => true, + 'nav-bar' => false, + 'order' => -1, + ], [ 'id' => 'root.landing', 'url' => 'landing', diff --git a/setup/module/Magento/Setup/lang/en_US.mo b/setup/module/Magento/Setup/lang/en_US.mo deleted file mode 100644 index 46ea5277212f0e15b38389d04c094cbaa6731f82..0000000000000000000000000000000000000000 Binary files a/setup/module/Magento/Setup/lang/en_US.mo and /dev/null differ diff --git a/setup/module/Magento/Setup/lang/en_US.po b/setup/module/Magento/Setup/lang/en_US.po deleted file mode 100644 index 923e9ac0953601d7b867a0abf3700559c326d92f..0000000000000000000000000000000000000000 --- a/setup/module/Magento/Setup/lang/en_US.po +++ /dev/null @@ -1,280 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: Magento Setup Tool\n" -"POT-Creation-Date: 2014-07-01 16:53+0300\n" -"PO-Revision-Date: 2014-07-01 16:53+0300\n" -"Last-Translator: Andriy Nasinnyk <anasinnyk@ebay.com>\n" -"Language-Team: Magento South <DL-Magento-South@ebay.com>\n" -"Language: en\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop;translate\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: /home/nas/projects/magento2/setup/module/Magento/" -"Setup\n" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:1 -msgid "A 404 error occurred" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:10 -msgid "The requested controller was unable to dispatch the request." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:13 -msgid "" -"The requested controller could not be mapped to an existing controller class." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:16 -msgid "The requested controller was not dispatchable." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:19 -msgid "The requested URL could not be matched by routing." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:22 -msgid "We cannot determine at this time why a 404 was generated." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:34 -msgid "Controller" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:41 -#, php-format -msgid "resolves to %s" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:53 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:8 -msgid "Additional information" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:56 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:80 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:11 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:35 -msgid "File" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:60 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:84 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:15 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:39 -msgid "Message" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:64 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:88 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:19 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:43 -msgid "Stack trace" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:74 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:29 -msgid "Previous exceptions" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:103 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:58 -msgid "No Exception available" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:1 -msgid "An error occurred" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/layout/layout.phtml:6 -msgid "Magento Setup Tool" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check.phtml:8 -msgid "" -"Let's check your environment for the corrent PHP version, PHP extensions, " -"file permissions and compatibility." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check.phtml:10 -msgid "Start Readiness Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:2 -msgid "Magento" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:4 -msgid "Version x.x.x" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:8 -msgid "" -"Welcome to Magento Admin, your online store headquarters.\n" -" Click 'Agree and Set Up Magento' or read <a href=\"#/getting-start" -"\">Getting Start</a> to learn more." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:13 -msgid "Choose a language:" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:21 -msgid "Terms & Agreement" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:24 -msgid "Agree and Set Up Magento" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:23 -msgid "Completed! You need to resolve these issues to continue." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:24 -msgid "Completed!" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:28 -msgid "" -"We're making sure your server environment is ready for Magento to be " -"installed." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:34 -msgid "Checking PHP Version..." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:39 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:50 -msgid "PHP Version Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:41 -msgid "Your PHP version is correct ({{version.data.current}})." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:46 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:153 -msgid "Need Help?" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:47 -msgid "PHP Documentation" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:53 -msgid "" -"Your PHP version is {{version.data.current}}. The required PHP version is " -"{{version.data.required}}." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:55 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:80 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:105 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:137 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:162 -msgid "More detail" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:56 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:81 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:106 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:138 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:163 -msgid "Less detail" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:60 -msgid "" -"Donwload and install PHP version {{version.data.required}} from <a href=" -"\"http://www.php.net\" target=\"_blank\">www.php.net</a> using this <a href=" -"\"http://www.php.net/docs.php\" target=\"_blank\">PHP Documentation</a>." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:61 -msgid "If you need more help please call your hosting provider." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:70 -msgid "Checking PHP Extensions..." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:75 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:100 -msgid "PHP Extensions Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:78 -msgid "" -"You meet {{extensions.data.current.length}} out of {{extensions.data." -"required.length}} PHP extensions requirements." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:88 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:116 -msgid "PHP Extension {{name}}." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:97 -msgid "PHP Extension Help" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:103 -msgid "" -"{{extensions.data.required.length - extensions.data.current.length}} missing " -"PHP extensions." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:109 -msgid "" -"The best way to resolve this is to install the correct missing extensions. " -"The exact fix depends on our server, your host, and other system variables.</" -"br>Our <a href=\"#\">PHP Extension Help</a> can get you started." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:110 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:167 -msgid "If you need more help, please call your hosting provider." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:127 -msgid "Checking File Permissions..." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:132 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:157 -msgid "File Permission Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:135 -msgid "" -"You meet {{permissions.data.current.length}} out of {{permissions.data." -"required.length}} file permission requirements." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:145 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:173 -msgid "\"{{name}}\" directory permission." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:154 -msgid "File Permission Help" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:160 -msgid "" -"{{permissions.data.required.length - permissions.data.current.length}} file " -"permission not met." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:166 -msgid "" -"The best way to resolve this is to allow write permissions for the following " -"Magento directories. The exact fix depends on your server, your host, and " -"other system variables.</br>Our <a href=\"#\">File Permission Help</a> can " -"get you started." -msgstr "" diff --git a/setup/module/Magento/Setup/lang/ua_UK.mo b/setup/module/Magento/Setup/lang/ua_UK.mo deleted file mode 100644 index b251f529126c891936138b6e4fb46e86b8366b8d..0000000000000000000000000000000000000000 Binary files a/setup/module/Magento/Setup/lang/ua_UK.mo and /dev/null differ diff --git a/setup/module/Magento/Setup/lang/ua_UK.po b/setup/module/Magento/Setup/lang/ua_UK.po deleted file mode 100644 index b601e17bc96b524bd0d7aad4dd9d69612e29b913..0000000000000000000000000000000000000000 --- a/setup/module/Magento/Setup/lang/ua_UK.po +++ /dev/null @@ -1,280 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: Magento Setup Tool\n" -"POT-Creation-Date: 2014-07-01 16:53+0300\n" -"PO-Revision-Date: 2014-07-01 16:58+0300\n" -"Last-Translator: Andriy Nasinnyk <anasinnyk@ebay.com>\n" -"Language-Team: Magento South <DL-Magento-South@ebay.com>\n" -"Language: en\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop;translate\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: /home/nas/projects/magento2/setup/module/Magento/" -"Setup\n" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:1 -msgid "A 404 error occurred" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:10 -msgid "The requested controller was unable to dispatch the request." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:13 -msgid "" -"The requested controller could not be mapped to an existing controller class." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:16 -msgid "The requested controller was not dispatchable." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:19 -msgid "The requested URL could not be matched by routing." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:22 -msgid "We cannot determine at this time why a 404 was generated." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:34 -msgid "Controller" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:41 -#, php-format -msgid "resolves to %s" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:53 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:8 -msgid "Additional information" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:56 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:80 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:11 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:35 -msgid "File" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:60 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:84 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:15 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:39 -msgid "Message" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:64 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:88 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:19 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:43 -msgid "Stack trace" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:74 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:29 -msgid "Previous exceptions" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/404.phtml:103 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:58 -msgid "No Exception available" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/error/index.phtml:1 -msgid "An error occurred" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/layout/layout.phtml:6 -msgid "Magento Setup Tool" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check.phtml:8 -msgid "" -"Let's check your environment for the corrent PHP version, PHP extensions, " -"file permissions and compatibility." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check.phtml:10 -msgid "Start Readiness Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:2 -msgid "Magento" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:4 -msgid "Version x.x.x" -msgstr "ВерÑÑ–Ñ x.x.x" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:8 -msgid "" -"Welcome to Magento Admin, your online store headquarters.\n" -" Click 'Agree and Set Up Magento' or read <a href=\"#/getting-start" -"\">Getting Start</a> to learn more." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:13 -msgid "Choose a language:" -msgstr "Оберіть мову:" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:21 -msgid "Terms & Agreement" -msgstr "Умови викориÑтаннÑ" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/landing.phtml:24 -msgid "Agree and Set Up Magento" -msgstr "ПогодитиÑÑŒ та вÑтановити Magento" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:23 -msgid "Completed! You need to resolve these issues to continue." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:24 -msgid "Completed!" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:28 -msgid "" -"We're making sure your server environment is ready for Magento to be " -"installed." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:34 -msgid "Checking PHP Version..." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:39 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:50 -msgid "PHP Version Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:41 -msgid "Your PHP version is correct ({{version.data.current}})." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:46 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:153 -msgid "Need Help?" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:47 -msgid "PHP Documentation" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:53 -msgid "" -"Your PHP version is {{version.data.current}}. The required PHP version is " -"{{version.data.required}}." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:55 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:80 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:105 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:137 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:162 -msgid "More detail" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:56 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:81 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:106 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:138 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:163 -msgid "Less detail" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:60 -msgid "" -"Donwload and install PHP version {{version.data.required}} from <a href=" -"\"http://www.php.net\" target=\"_blank\">www.php.net</a> using this <a href=" -"\"http://www.php.net/docs.php\" target=\"_blank\">PHP Documentation</a>." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:61 -msgid "If you need more help please call your hosting provider." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:70 -msgid "Checking PHP Extensions..." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:75 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:100 -msgid "PHP Extensions Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:78 -msgid "" -"You meet {{extensions.data.current.length}} out of {{extensions.data." -"required.length}} PHP extensions requirements." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:88 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:116 -msgid "PHP Extension {{name}}." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:97 -msgid "PHP Extension Help" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:103 -msgid "" -"{{extensions.data.required.length - extensions.data.current.length}} missing " -"PHP extensions." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:109 -msgid "" -"The best way to resolve this is to install the correct missing extensions. " -"The exact fix depends on our server, your host, and other system variables.</" -"br>Our <a href=\"#\">PHP Extension Help</a> can get you started." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:110 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:167 -msgid "If you need more help, please call your hosting provider." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:127 -msgid "Checking File Permissions..." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:132 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:157 -msgid "File Permission Check" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:135 -msgid "" -"You meet {{permissions.data.current.length}} out of {{permissions.data." -"required.length}} file permission requirements." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:145 -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:173 -msgid "\"{{name}}\" directory permission." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:154 -msgid "File Permission Help" -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:160 -msgid "" -"{{permissions.data.required.length - permissions.data.current.length}} file " -"permission not met." -msgstr "" - -#: /home/nas/projects/magento2/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml:166 -msgid "" -"The best way to resolve this is to allow write permissions for the following " -"Magento directories. The exact fix depends on your server, your host, and " -"other system variables.</br>Our <a href=\"#\">File Permission Help</a> can " -"get you started." -msgstr "" diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php index 6156a74e862216fa41820218ce24e4d1947a42b2..4bc41436f3ed613031a234e612e3b288d8de6604 100644 --- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php +++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php @@ -34,7 +34,7 @@ use Zend\Console\Request as ConsoleRequest; use Zend\EventManager\EventManagerInterface; use Zend\Stdlib\RequestInterface as Request; use Zend\Mvc\Controller\AbstractActionController; -use \Magento\Setup\Model\UserConfigurationData as UserConfig; +use Magento\Setup\Model\UserConfigurationData as UserConfig; use Magento\Setup\Model\AdminAccount; /** @@ -179,19 +179,21 @@ class ConsoleController extends AbstractActionController . ' [--' . UserConfig::KEY_USE_SEF_URL . '=]' . ' [--' . UserConfig::KEY_IS_SECURE . '=]' . ' [--' . UserConfig::KEY_BASE_URL_SECURE . '=]' - . ' [--' . UserConfig::KEY_IS_SECURE_ADMIN . '=]'; + . ' [--' . UserConfig::KEY_IS_SECURE_ADMIN . '=]' + . ' [--' . UserConfig::KEY_ADMIN_USE_SECURITY_KEY . '=]'; $adminUser = '--' . AdminAccount::KEY_USERNAME . '=' . ' --' . AdminAccount::KEY_PASSWORD . '=' . ' --' . AdminAccount::KEY_EMAIL . '=' . ' --' . AdminAccount::KEY_FIRST_NAME . '=' . ' --' . AdminAccount::KEY_LAST_NAME . '='; + $salesConfig = '[--' . Installer::SALES_ORDER_INCREMENT_PREFIX . '=]'; return [ self::CMD_INSTALL => [ - 'route' => self::CMD_INSTALL . ' ' . $deployConfig . ' ' . $userConfig - . ' ' . $adminUser, - 'usage' => $deployConfig . "\n" - . $userConfig . "\n" - . $adminUser, + 'route' => self::CMD_INSTALL + . " {$deployConfig} {$userConfig} {$adminUser} {$salesConfig}" + . ' [--' . Installer::CLEANUP_DB . ']', + 'usage' => "{$deployConfig} {$userConfig} {$adminUser} {$salesConfig}" + . ' [--' . Installer::CLEANUP_DB . ']', 'usage_short' => self::CMD_INSTALL . ' <options>', 'usage_desc' => 'Install Magento application', ], @@ -343,6 +345,8 @@ class ConsoleController extends AbstractActionController /** * Installs user configuration + * + * @return void */ public function installUserConfigAction() { @@ -353,6 +357,8 @@ class ConsoleController extends AbstractActionController /** * Installs admin user + * + * @return void */ public function installAdminUserAction() { @@ -381,7 +387,8 @@ class ConsoleController extends AbstractActionController default: if (isset($details[$type])) { if ($details[$type]['usage']) { - return "\nAvailable parameters:\n{$details[$type]['usage']}\n"; + $formatted = $this->formatCliUsage($details[$type]['usage']); + return "\nAvailable parameters:\n{$formatted}\n"; } return "\nThis command has no parameters.\n"; } @@ -389,6 +396,30 @@ class ConsoleController extends AbstractActionController } } + /** + * Formats output of "usage" into more readable format by grouping required/optional parameters and wordwrapping + * + * @param string $text + * @return string + */ + private function formatCliUsage($text) + { + $result = []; + foreach (explode(' ', $text) as $value) { + if (empty($value)) { + continue; + } + if (strpos($value, '[') === 0) { + $group = 'optional'; + } else { + $group = 'required'; + } + $result[$group][] = $value; + } + + return wordwrap(implode(' ', $result['required']) . "\n" . implode(' ', $result['optional']), 120); + } + /** * Convert an array to string * diff --git a/setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php b/setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php index fb1420583a7de0d5d83bb636733b3095f1faee80..fe79bfa6347d04f10c0bfde781055adb48fcb83b 100644 --- a/setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php +++ b/setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php @@ -23,38 +23,56 @@ */ namespace Magento\Setup\Controller\Data; -use Magento\Setup\Model\Installer; +use Magento\Setup\Model\InstallerFactory; use Zend\Mvc\Controller\AbstractActionController; +use Zend\Stdlib\ResponseInterface as Response; use Zend\View\Model\JsonModel; use Zend\Json\Json; +use Magento\Setup\Model\WebLogger; class DatabaseController extends AbstractActionController { /** + * JSON response object + * * @var JsonModel */ - protected $jsonModel; + private $jsonResponse; /** - * @param JsonModel $jsonModel + * Installer service factory + * + * @var \Magento\Setup\Model\InstallerFactory */ - public function __construct(JsonModel $jsonModel) - { - $this->jsonModel = $jsonModel; + private $installerFactory; + /** + * Constructor + * + * @param JsonModel $response + * @param InstallerFactory $installerFactory + */ + public function __construct(JsonModel $response, InstallerFactory $installerFactory) + { + $this->jsonResponse = $response; + $this->installerFactory = $installerFactory; } /** + * Result of checking DB credentials + * * @return JsonModel */ public function indexAction() { $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY); try { - Installer::checkDatabaseConnection($params['name'], $params['host'], $params['user'], $params['password']); - return $this->jsonModel->setVariables(['success' => true]); + $installer = $this->installerFactory->create(new WebLogger); + $password = isset($params['password']) ? $params['password'] : ''; + $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password); + return $this->jsonResponse->setVariables(['success' => true]); } catch (\Exception $e) { - return $this->jsonModel->setVariables(['success' => false]); + return $this->jsonResponse->setVariables(['success' => false]); } } diff --git a/setup/module/Magento/Setup/src/Controller/IndexController.php b/setup/module/Magento/Setup/src/Controller/IndexController.php index 170908af01459cc419b07588f2de5e22ebb8cb17..34053313152b022303b01a6aaac776b6449c211a 100644 --- a/setup/module/Magento/Setup/src/Controller/IndexController.php +++ b/setup/module/Magento/Setup/src/Controller/IndexController.php @@ -47,10 +47,6 @@ class IndexController extends AbstractActionController */ public function indexAction() { - if (!$this->params()->fromRoute('lang')) { - $this->redirect()->toUrl('en_US/index'); - } - return $this->view; } } diff --git a/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php b/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php index 622e82ff192fd949a7db7a35297bdedd452d0a91..4c083b4edd005272c755352b5090f968ad502cd9 100644 --- a/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php +++ b/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php @@ -23,70 +23,68 @@ */ namespace Magento\Setup\Controller\Install; -use Magento\Setup\Module\ModuleListInterface; use Magento\Setup\Model\WebLogger; use Zend\Mvc\Controller\AbstractActionController; use Zend\View\Model\JsonModel; +use Magento\Setup\Model\Installer\ProgressFactory; class ProgressController extends AbstractActionController { /** - * How many times installer will loop through the list of modules - */ - const MODULE_LOOPS_COUNT = 2; - - /** - * The number of additional log messages in the code - */ - const ADDITIONAL_LOG_MESSAGE_COUNT = 15; - - /** + * JSON response + * * @var \Zend\View\Model\JsonModel */ protected $json; /** + * Web logger + * * @var WebLogger */ protected $logger; - protected $moduleList; + /** + * Progress indicator factory + * + * @var ProgressFactory + */ + protected $progressFactory; /** + * Constructor + * * @param JsonModel $view - * @param ModuleListInterface $moduleList * @param WebLogger $logger + * @param ProgressFactory $progressFactory */ public function __construct( JsonModel $view, - ModuleListInterface $moduleList, - WebLogger $logger + WebLogger $logger, + ProgressFactory $progressFactory ) { - $this->moduleList = $moduleList; $this->logger = $logger; $this->json = $view; + $this->progressFactory = $progressFactory; } /** + * Checks progress of installation + * * @return JsonModel */ public function indexAction() { - $moduleCount = count($this->moduleList->getModules()); - $log = $this->logger->get(); - $progress = 0; - if (!empty($log)) { - $progress = round( - (count($log) * 100)/($moduleCount * self::MODULE_LOOPS_COUNT + self::ADDITIONAL_LOG_MESSAGE_COUNT) - ); + $percent = 0; + $success = false; + try { + $progress = $this->progressFactory->createFromLog($this->logger); + $percent = sprintf('%d', $progress->getRatio() * 100); + $success = true; + $contents = $this->logger->get(); + } catch (\Exception $e) { + $contents = [(string)$e]; } - - return $this->json->setVariables( - array( - 'progress' => $progress, - 'success' => !$this->logger->hasError(), - 'console' => $log - ) - ); + return $this->json->setVariables(['progress' => $percent, 'success' => $success, 'console' => $contents]); } } diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install/StartController.php index 17a1ca3e05b29910b2e0864877d3659e65e49ca6..6a2fab062c636dfab3b369509fd7cc33d9c7ef6e 100644 --- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php +++ b/setup/module/Magento/Setup/src/Controller/Install/StartController.php @@ -25,6 +25,7 @@ namespace Magento\Setup\Controller\Install; use Magento\Setup\Module\Setup\Config; +use Magento\Setup\Module\Setup\ConfigFactory as DeploymentConfigFactory; use Zend\Mvc\Controller\AbstractActionController; use Magento\Setup\Model\WebLogger; use Zend\Json\Json; @@ -59,21 +60,29 @@ class StartController extends AbstractActionController */ private $installer; + /** + * @var DeploymentConfigFactory + */ + private $deploymentConfigFactory; + /** * Default Constructor * * @param JsonModel $view * @param WebLogger $logger * @param InstallerFactory $installerFactory + * @param DeploymentConfigFactory $deploymentConfigFactory */ public function __construct( JsonModel $view, WebLogger $logger, - InstallerFactory $installerFactory + InstallerFactory $installerFactory, + DeploymentConfigFactory $deploymentConfigFactory ) { $this->json = $view; $this->log = $logger; $this->installer = $installerFactory->create($logger); + $this->deploymentConfigFactory = $deploymentConfigFactory; } /** @@ -90,7 +99,9 @@ class StartController extends AbstractActionController $this->importUserConfigForm(), $this->importAdminUserForm() ); - $config = $this->installer->install($data); + $this->installer->install($data); + $config = $this->deploymentConfigFactory->create(); + $config->loadFromFile(); $this->json->setVariable('key', $config->get(Config::KEY_ENCRYPTION_KEY)); $this->json->setVariable('success', true); } catch(\Exception $e) { diff --git a/setup/module/Magento/Setup/src/Controller/LandingController.php b/setup/module/Magento/Setup/src/Controller/LandingController.php index 249741150416d9ba20d5cce0a7f7832019e8e1d4..4a8670cd2ce2953a4aa2d5d6a077de3f499715ee 100644 --- a/setup/module/Magento/Setup/src/Controller/LandingController.php +++ b/setup/module/Magento/Setup/src/Controller/LandingController.php @@ -27,7 +27,9 @@ namespace Magento\Setup\Controller; use Zend\Mvc\Controller\AbstractActionController; use Zend\View\Model\ViewModel; use Zend\ServiceManager\ServiceLocatorInterface; -use \Magento\Setup\Model\Location; +use Magento\Setup\Model\Location; +use Composer\Json\JsonFile; +use Magento\Config\ConfigFactory as SystemConfigFactory; class LandingController extends AbstractActionController { @@ -46,15 +48,28 @@ class LandingController extends AbstractActionController */ protected $location; + /** + * @var array + */ + protected $composerJson; + /** * @param Location $location * @param ServiceLocatorInterface $serviceLocator * @param ViewModel $view + * @param SystemConfigFactory $systemConfigFactory */ - public function __construct(Location $location, ServiceLocatorInterface $serviceLocator, ViewModel $view) - { - $this->location =$location; + public function __construct( + Location $location, + ServiceLocatorInterface $serviceLocator, + ViewModel $view, + SystemConfigFactory $systemConfigFactory + ) { + $this->location = $location; $this->view = $view; + $config = $systemConfigFactory->create(); + $jsonFile = new JsonFile($config->getMagentoBasePath() . '/composer.json'); + $this->composerJson = $jsonFile->read(); } /** @@ -65,6 +80,7 @@ class LandingController extends AbstractActionController $this->view->setTerminal(true); $this->view->setVariable('languages', $this->serviceLocator->get('config')['languages']); $this->view->setVariable('location', $this->location->getLocationCode()); + $this->view->setVariable('version', $this->composerJson['version']); return $this->view; } } diff --git a/setup/module/Magento/Setup/src/Controller/LicenseController.php b/setup/module/Magento/Setup/src/Controller/LicenseController.php new file mode 100644 index 0000000000000000000000000000000000000000..d05300999b6be6dc18205ab69d5989fcff0a9c74 --- /dev/null +++ b/setup/module/Magento/Setup/src/Controller/LicenseController.php @@ -0,0 +1,79 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +namespace Magento\Setup\Controller; + +use Zend\Mvc\Controller\AbstractActionController; +use Zend\View\Model\ViewModel; +use Magento\Setup\Model\License; + +/** + * Class LicenseController + * + * @package Magento\Setup\Controller + */ +class LicenseController extends AbstractActionController +{ + /** + * View object + * + * @var \Zend\View\Model\ViewModel + */ + protected $view; + + /** + * Licence Model + * + * @var License + */ + protected $license; + + /** + * Constructor + * + * @param License $license + * @param ViewModel $view + */ + public function __construct(License $license, ViewModel $view) + { + $this->license = $license; + $this->view = $view; + } + + /** + * Displays license + * + * @return ViewModel + */ + public function indexAction() + { + $contents = $this->license->getContents(); + if ($contents === false) { + $this->view->setTemplate('error/404'); + $this->view->setVariable('message', 'Cannot find license file.'); + } else { + $this->view->setVariable('license', $contents); + } + return $this->view; + } +} diff --git a/setup/module/Magento/Setup/src/Model/ConsoleLogger.php b/setup/module/Magento/Setup/src/Model/ConsoleLogger.php index 9d034a559ffe60fe5533d267da45d897819c5ae5..429e3f486600fe01b553d9550614f3bdbf35470d 100644 --- a/setup/module/Magento/Setup/src/Model/ConsoleLogger.php +++ b/setup/module/Magento/Setup/src/Model/ConsoleLogger.php @@ -25,6 +25,8 @@ namespace Magento\Setup\Model; use Zend\Console\Console; +use Zend\Console\ColorInterface; + /** * Console Logger * @@ -49,35 +51,34 @@ class ConsoleLogger implements LoggerInterface } /** - * Logs success message - * - * @param string $message - * @return void + * {@inheritdoc} */ public function logSuccess($message) { - $this->console->writeLine("[SUCCESS]" . ($message ? ": $message" : ''), 11); + $this->console->writeLine("[SUCCESS]" . ($message ? ": $message" : ''), ColorInterface::LIGHT_GREEN); } /** - * Logs error message - * - * @param \Exception $e - * @return void + * {@inheritdoc} */ public function logError(\Exception $e) { - $this->console->writeLine("[ERROR]: " . $e, 10); + $this->console->writeLine("[ERROR]: " . $e, ColorInterface::LIGHT_RED); } /** - * Logs message to log writer - * - * @param string $message - * @return void + * {@inheritdoc} */ public function log($message) { - $this->console->writeLine($message, 13); + $this->console->writeLine($message, ColorInterface::LIGHT_BLUE); + } + + /** + * {@inheritdoc} + */ + public function logMeta($message) + { + $this->console->writeLine($message, ColorInterface::GRAY); } } diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php index a6521aac6df4c136a12456c21a1823209544a9e4..daa309a00b49fe89db5ecca8b2cdd32f352e26f7 100644 --- a/setup/module/Magento/Setup/src/Model/Installer.php +++ b/setup/module/Magento/Setup/src/Model/Installer.php @@ -24,16 +24,43 @@ namespace Magento\Setup\Model; -use Zend\Stdlib\Parameters; use Magento\Setup\Module\Setup\ConfigFactory as DeploymentConfigFactory; use Magento\Config\ConfigFactory as SystemConfigFactory; +use Magento\Config\Config as SystemConfig; use Magento\Setup\Module\Setup\Config; use Magento\Setup\Module\SetupFactory; use Magento\Setup\Module\ModuleListInterface; +use Magento\Store\Model\Store; use Magento\Framework\Math\Random; +use Magento\Setup\Module\Setup\ConnectionFactory; +use Zend\Db\Sql\Sql; +use Magento\Framework\Shell; +use Magento\Framework\Shell\CommandRenderer; +use Symfony\Component\Process\PhpExecutableFinder; +/** + * Class Installer contains the logic to install Magento application. + * + */ class Installer { + /** + * Parameter indicating command whether to cleanup database in the install routine + */ + const CLEANUP_DB = 'cleanup_database'; + + /** + * Parameter to specify an order_increment_prefix + */ + const SALES_ORDER_INCREMENT_PREFIX = 'sales_order_increment_prefix'; + + /**#@+ + * Formatting for progress log + */ + const PROGRESS_LOG_RENDER = '[Progress: %d / %d]'; + const PROGRESS_LOG_REGEX = '/\[Progress: (\d+) \/ (\d+)\]/s'; + /**#@- */ + /** * File permissions checker * @@ -65,9 +92,9 @@ class Installer /** * System configuration factory * - * @var SystemConfigFactory + * @var SystemConfig */ - private $systemConfigFactory; + private $systemConfig; /** * Admin account factory @@ -88,9 +115,39 @@ class Installer * * @var Random */ - protected $random; + private $random; + + /** + * DB connection factory + * + * @var ConnectionFactory + */ + private $connectionFactory; + + /** + * Shell executor + * + * @var Shell + */ + private $shell; + + /** + * Shell command renderer + * + * @var CommandRenderer + */ + private $shellRenderer; + + /** + * Progress indicator + * + * @var Installer\Progress + */ + private $progress; /** + * Constructor + * * @param FilePermissions $filePermissions * @param DeploymentConfigFactory $deploymentConfigFactory * @param SetupFactory $setupFactory @@ -99,6 +156,7 @@ class Installer * @param AdminAccountFactory $adminAccountFactory * @param LoggerInterface $log * @param Random $random + * @param ConnectionFactory $connectionFactory */ public function __construct( FilePermissions $filePermissions, @@ -108,49 +166,83 @@ class Installer SystemConfigFactory $systemConfigFactory, AdminAccountFactory $adminAccountFactory, LoggerInterface $log, - Random $random + Random $random, + ConnectionFactory $connectionFactory ) { $this->filePermissions = $filePermissions; $this->deploymentConfigFactory = $deploymentConfigFactory; $this->setupFactory = $setupFactory; $this->moduleList = $moduleList; - $this->systemConfigFactory = $systemConfigFactory; + $this->systemConfig = $systemConfigFactory->create(); $this->adminAccountFactory = $adminAccountFactory; $this->log = $log; $this->random = $random; + $this->connectionFactory = $connectionFactory; + $this->shellRenderer = new CommandRenderer; + $this->shell = new Shell($this->shellRenderer); } /** * Install Magento application * * @param \ArrayObject|array $request - * @return Config + * @return void + * @throws \LogicException */ public function install($request) { - $this->log->log('Starting Magento installation:'); - - $this->log->log('File permissions check...'); - $this->checkFilePermissions(); - - $this->log->log('Installing deployment configuration...'); - $deploymentConfig = $this->installDeploymentConfig($request); - - $this->log->log('Installing database schema:'); - $this->installSchema(); + $script[] = ['Enabling Maintenance Mode:', 'setMaintenanceMode', [1]]; + $script[] = ['File permissions check...', 'checkFilePermissions', []]; + $script[] = ['Installing deployment configuration...', 'installDeploymentConfig', [$request]]; + if (!empty($request[self::CLEANUP_DB])) { + $script[] = ['Cleaning up database...', 'cleanupDb', [$request]]; + } + $script[] = ['Installing database schema:', 'installSchema', []]; + $script[] = ['Installing user configuration...', 'installUserConfig', [$request]]; + $script[] = ['Installing data fixtures:', 'installDataFixtures', []]; + if (!empty($request[self::SALES_ORDER_INCREMENT_PREFIX])) { + $script[] = [ + 'Creating sales order increment prefix...', + 'installOrderIncrementPrefix', + [$request[self::SALES_ORDER_INCREMENT_PREFIX]] + ]; + } + $script[] = ['Installing admin user...', 'installAdminUser', [$request]]; + $script[] = ['Enabling caches:', 'enableCaches', []]; + $script[] = ['Disabling Maintenance Mode:', 'setMaintenanceMode', [0]]; - $this->log->log('Installing user configuration...'); - $this->installUserConfig($request); + $total = count($script) + count($this->moduleList->getModules()); + $this->progress = new Installer\Progress($total, 0); - $this->log->log('Installing data fixtures:'); - $this->installDataFixtures(); + $this->log->log('Starting Magento installation:'); - $this->log->log('Installing admin user...'); - $this->installAdminUser($request); + while (list(, list($message, $method, $params)) = each($script)) { + $this->log->log($message); + call_user_func_array([$this, $method], $params); + $this->logProgress(); + } $this->log->logSuccess('Magento installation complete.'); - return $deploymentConfig; + if ($this->progress->getCurrent() != $this->progress->getTotal()) { + throw new \LogicException('Installation progress did not finish properly.'); + } + } + + /** + * Logs progress + * + * @return void + */ + private function logProgress() + { + if (!$this->progress) { + return; + } + $this->progress->setNext(); + $this->log->logMeta( + sprintf(self::PROGRESS_LOG_RENDER, $this->progress->getCurrent(), $this->progress->getTotal()) + ); } /** @@ -202,6 +294,7 @@ class Installer $this->log->log("Module '{$moduleName}':"); $setup = $this->setupFactory->createSetupModule($this->log, $moduleName); $setup->applyUpdates(); + $this->logProgress(); } $this->log->log('Schema post-updates:'); @@ -220,62 +313,66 @@ class Installer */ public function installDataFixtures() { - $systemConfig = $this->systemConfigFactory->create(); - $phpPath = self::getPhpExecutablePath(); - $command = $phpPath . 'php -f ' . $systemConfig->getMagentoBasePath() . '/dev/shell/run_data_fixtures.php 2>&1'; - $this->log->log($command); - exec($command, $output, $exitCode); - if ($exitCode !== 0) { - $outputMsg = implode(PHP_EOL, $output); - throw new \Exception('exec() returned error [' . $exitCode . ']' . PHP_EOL . $outputMsg); - } + $this->exec('-f %s', [$this->systemConfig->getMagentoBasePath() . '/dev/shell/run_data_fixtures.php']); } /** - * Finds the executable path for PHP + * Installs user configuration * - * @return string - * @throws \Exception + * @param \ArrayObject|array $data + * @return void */ - private static function getPhpExecutablePath() + public function installUserConfig($data) { - $result = ''; - $iniFile = fopen(php_ini_loaded_file(), 'r'); - while ($line = fgets($iniFile)) { - if ((strpos($line, 'extension_dir') !== false) && (strrpos($line, ";") !==0)) { - $extPath = explode("=", $line); - $pathFull = explode("\"", $extPath[1]); - $pathParts = str_replace('\\', '/', $pathFull[1]); - foreach (explode('/', $pathParts) as $piece) { - if ((file_exists($result . 'php') && !is_dir($result . 'php')) - || (file_exists($result . 'php.exe') && !is_dir($result . 'php.exe'))) { - break; - } else if ((file_exists($result . 'bin/php') && !is_dir($result . 'bin/php')) - || (file_exists($result . 'bin/php.exe') && !is_dir($result . 'bin/php.exe'))) { - $result .= 'bin' . '/'; - break; - } else { - $result .= $piece . '/'; - } - } - break; - } - } - fclose($iniFile); - return $result; + $setup = $this->setupFactory->createSetup($this->log); + $userConfig = new UserConfigurationData($setup); + $userConfig->install($data); } /** - * Installs user configuration + * Creates store order increment prefix configuration * - * @param \ArrayObject|array $data + * @param string $orderIncrementPrefix Value to use for order increment prefix * @return void */ - public function installUserConfig($data) + private function installOrderIncrementPrefix($orderIncrementPrefix) { $setup = $this->setupFactory->createSetup($this->log); - $userConfig = new UserConfigurationData($setup); - $userConfig->install($data); + $dbConnection = $setup->getConnection(); + + // get entity_type_id for order + $select = $dbConnection->select() + ->from($setup->getTable('eav_entity_type')) + ->where('entity_type_code = \'order\''); + $sql = new Sql($dbConnection); + $selectString = $sql->getSqlStringForSqlObject($select, $dbConnection->getPlatform()); + $statement = $dbConnection->getDriver()->createStatement($selectString); + $selectResult = $statement->execute(); + $entityTypeId = $selectResult->current()['entity_type_id']; + + // See if row already exists + $resultSet = $dbConnection->query( + 'SELECT * FROM ' . $setup->getTable('eav_entity_store') . ' WHERE entity_type_id = ? AND store_id = ?', + [$entityTypeId, Store::DISTRO_STORE_ID] + ); + + if ($resultSet->count() > 0) { + // row exists, update it + $entityStoreId = $resultSet->current()->entity_store_id; + $dbConnection->update( + $setup->getTable('eav_entity_store'), + ['increment_prefix' => $orderIncrementPrefix], + ['entity_store_id' => $entityStoreId] + ); + } else { + // add a row to the store's eav table, setting the increment_prefix + $rowData = [ + 'entity_type_id' => $entityTypeId, + 'store_id' => Store::DISTRO_STORE_ID, + 'increment_prefix' => $orderIncrementPrefix, + ]; + $dbConnection->insert($setup->getTable('eav_entity_store'), $rowData); + } } /** @@ -291,6 +388,54 @@ class Installer $adminAccount->save(); } + /** + * Enables caches after installing application + * + * @return void + */ + private function enableCaches() + { + $args = [$this->systemConfig->getMagentoBasePath() . '/dev/shell/cache.php']; + $this->exec('-f %s -- --set=1', $args); + } + + /** + * Enables or disables maintenance mode for Magento application + * + * @param int $value + * @return void + */ + private function setMaintenanceMode($value) + { + $args = [$this->systemConfig->getMagentoBasePath() . '/dev/shell/maintenance.php', $value]; + $this->exec('-f %s -- --set=%s', $args); + } + + /** + * Executes a command in CLI + * + * @param string $command + * @param array $args + * @return void + * @throws \Exception + */ + private function exec($command, $args) + { + $phpFinder = new PhpExecutableFinder(); + $phpPath = $phpFinder->find(); + if (!$phpPath) { + throw new \Exception( + 'Cannot find PHP executable path.' + . ' Please set $PATH environment variable to include the full path of the PHP executable' + ); + } + $command = $phpPath . ' ' . $command; + $actualCommand = $this->shellRenderer->render($command, $args); + $this->log->log($actualCommand); + $output = $this->shell->execute($command, $args); + $this->log->log($output); + } + /** * Checks Database Connection * @@ -301,21 +446,32 @@ class Installer * @return boolean * @throws \Exception */ - public static function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '') + public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '') { - $dbConnectionInfo = array( - 'driver' => "Pdo", - 'dsn' => "mysql:dbname=" . $dbName . ";host=" . $dbHost, - 'username' => $dbUser, - 'password' => $dbPass, - 'driver_options' => array( - \PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'UTF8'" - ), - ); - $checkDB = new DatabaseCheck($dbConnectionInfo); - if (!$checkDB->checkConnection()) { + $adapter = $this->connectionFactory->create([ + Config::KEY_DB_NAME => $dbName, + Config::KEY_DB_HOST => $dbHost, + Config::KEY_DB_USER => $dbUser, + Config::KEY_DB_PASS => $dbPass + ]); + $adapter->connect(); + if (!$adapter->getDriver()->getConnection()->isConnected()) { throw new \Exception('Database connection failure.'); } return true; } + + /** + * Cleans up database + * + * @param \ArrayObject|array $config + * @return void + */ + public function cleanupDb($config) + { + $adapter = $this->connectionFactory->create($config); + $dbName = $adapter->quoteIdentifier($config[Config::KEY_DB_NAME]); + $adapter->query("DROP DATABASE IF EXISTS {$dbName}"); + $adapter->query("CREATE DATABASE IF NOT EXISTS {$dbName}"); + } } diff --git a/setup/module/Magento/Setup/src/Model/Installer/Progress.php b/setup/module/Magento/Setup/src/Model/Installer/Progress.php new file mode 100644 index 0000000000000000000000000000000000000000..44317be662e649ced41c5a261b59155d298bdb77 --- /dev/null +++ b/setup/module/Magento/Setup/src/Model/Installer/Progress.php @@ -0,0 +1,127 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Setup\Model\Installer; + +/** + * Installation progress model + */ +class Progress +{ + /** + * Total number of steps + * + * @var int + */ + private $total; + + /** + * Current step + * + * @var int + */ + private $current; + + /** + * Constructor + * + * @param int $total + * @param int $current + */ + public function __construct($total, $current = 0) + { + $this->validate($total, $current); + $this->total = $total; + $this->current = $current; + } + + /** + * Increments current counter + * + * @return void + */ + public function setNext() + { + $this->validate($this->total, $this->current + 1); + $this->current++; + } + + /** + * Sets current counter to the end + * + * @return void + */ + public function finish() + { + $this->current = $this->total; + } + + /** + * Gets the current counter + * + * @return int + */ + public function getCurrent() + { + return $this->current; + } + + /** + * Gets the total number + * + * @return int + */ + public function getTotal() + { + return $this->total; + } + + /** + * Gets ratio of current to total + * + * @return float + */ + public function getRatio() + { + return $this->current / $this->total; + } + + /** + * Asserts invariants + * + * @param int $total + * @param int $current + * @return void + * @throws \LogicException + */ + private function validate($total, $current) + { + if (empty($total) || 0 >= $total) { + throw new \LogicException('Total number must be more than zero.'); + } + if ($current > $total) { + throw new \LogicException('Current cannot exceed total number.'); + } + } +} diff --git a/setup/module/Magento/Setup/src/Model/Installer/ProgressFactory.php b/setup/module/Magento/Setup/src/Model/Installer/ProgressFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..23f9f9db1fed26b9649346f2319cfd79a8c2bbd4 --- /dev/null +++ b/setup/module/Magento/Setup/src/Model/Installer/ProgressFactory.php @@ -0,0 +1,53 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Setup\Model\Installer; + +use Magento\Setup\Model\WebLogger; +use Magento\Setup\Model\Installer; + +/** + * Factory for progress indicator model + */ +class ProgressFactory +{ + /** + * Creates a progress indicator from log contents + * + * @param WebLogger $logger + * @return Progress + */ + public function createFromLog(WebLogger $logger) + { + $total = 1; + $current = 0; + $contents = implode('', $logger->get()); + if (preg_match_all(Installer::PROGRESS_LOG_REGEX, $contents, $matches, PREG_SET_ORDER)) { + $last = array_pop($matches); + list(, $current, $total) = $last; + } + $progress = new Progress($total, $current); + return $progress; + } +} diff --git a/setup/module/Magento/Setup/src/Model/InstallerFactory.php b/setup/module/Magento/Setup/src/Model/InstallerFactory.php index a92bdef4d24f292168846ea168f9fbed03368c27..7970e5b3ee60ad026068294314f617cff578e8db 100644 --- a/setup/module/Magento/Setup/src/Model/InstallerFactory.php +++ b/setup/module/Magento/Setup/src/Model/InstallerFactory.php @@ -29,11 +29,15 @@ use Zend\ServiceManager\ServiceLocatorInterface; class InstallerFactory { /** + * Zend Framework's service locator + * * @var ServiceLocatorInterface */ protected $serviceLocator; /** + * Constructor + * * @param ServiceLocatorInterface $serviceLocator */ public function __construct(ServiceLocatorInterface $serviceLocator) @@ -42,6 +46,8 @@ class InstallerFactory } /** + * Factory method for installer object + * * @param LoggerInterface $log * @return Installer */ @@ -55,7 +61,8 @@ class InstallerFactory $this->serviceLocator->get('Magento\Config\ConfigFactory'), $this->serviceLocator->get('Magento\Setup\Model\AdminAccountFactory'), $log, - $this->serviceLocator->get('Magento\Framework\Math\Random') + $this->serviceLocator->get('Magento\Framework\Math\Random'), + $this->serviceLocator->get('Magento\Setup\Module\Setup\ConnectionFactory') ); } } diff --git a/setup/module/Magento/Setup/src/Model/License.php b/setup/module/Magento/Setup/src/Model/License.php new file mode 100644 index 0000000000000000000000000000000000000000..fc670d518516b31974d4b22f07c4fd13b46248b3 --- /dev/null +++ b/setup/module/Magento/Setup/src/Model/License.php @@ -0,0 +1,89 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Setup\Model; + +use Magento\Config\Config; +use Magento\Config\ConfigFactory; + +/** + * License model + * + * @package Magento\Setup\Model + */ +class License +{ + /** + * License File location + * + * @var string + */ + const LICENSE_FILENAME = 'LICENSE.txt'; + + /** + * Path of license file + * + * @var string + */ + protected $licenseFile; + + /** + * Configuration details + * + * @var Config + */ + protected $config; + + /** + * ConfigFactory to create config + * + * @var ConfigFactory + */ + protected $configFactory; + + /** + * Constructor + * + * @param ConfigFactory $configFactory + */ + public function __construct(ConfigFactory $configFactory) + { + $this->configFactory = $configFactory; + $this->config = $this->configFactory->create(); + $this->licenseFile = $this->config->getMagentoBasePath() . DIRECTORY_SEPARATOR . self::LICENSE_FILENAME; + } + + /** + * Returns contents of License file. + * + * @return string + */ + public function getContents() + { + if (!file_exists($this->licenseFile)) { + return false; + } + return file_get_contents($this->licenseFile); + } +} diff --git a/setup/module/Magento/Setup/src/Model/LoggerInterface.php b/setup/module/Magento/Setup/src/Model/LoggerInterface.php index 656d96d2c290e48ec79692ed55c412bea3e38194..34e559a2880023f70e756b313eec6412667241c0 100644 --- a/setup/module/Magento/Setup/src/Model/LoggerInterface.php +++ b/setup/module/Magento/Setup/src/Model/LoggerInterface.php @@ -49,10 +49,18 @@ interface LoggerInterface /** - * Logs message to log writer + * Logs a message * * @param string $message * @return void */ public function log($message); + + /** + * Logs meta information + * + * @param string $message + * @return void + */ + public function logMeta($message); } diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationData.php b/setup/module/Magento/Setup/src/Model/UserConfigurationData.php index 1a34b54c4f7e6291b8d7152b9c431b7044c7eb88..8e5334f49e23c81d13a0585023b0a8893fc90018 100644 --- a/setup/module/Magento/Setup/src/Model/UserConfigurationData.php +++ b/setup/module/Magento/Setup/src/Model/UserConfigurationData.php @@ -28,6 +28,7 @@ use Magento\Setup\Module\Setup; use Magento\Store\Model\Store; use Magento\Core\Helper\Data; use Magento\Directory\Model\Currency; +use Magento\Backend\Model\Url; /** * Model Class to Install User Configuration Data @@ -47,6 +48,7 @@ class UserConfigurationData const KEY_LANGUAGE = 'language'; const KEY_TIMEZONE = 'timezone'; const KEY_CURRENCY = 'currency'; + const KEY_ADMIN_USE_SECURITY_KEY = 'admin_use_security_key'; /**#@- */ /** @@ -65,6 +67,7 @@ class UserConfigurationData Currency::XML_PATH_CURRENCY_BASE => self::KEY_CURRENCY, Currency::XML_PATH_CURRENCY_DEFAULT => self::KEY_CURRENCY, Currency::XML_PATH_CURRENCY_ALLOW => self::KEY_CURRENCY, + Url::XML_PATH_USE_SECURE_KEY => self::KEY_ADMIN_USE_SECURITY_KEY, ]; /** @@ -81,6 +84,7 @@ class UserConfigurationData self::KEY_LANGUAGE => 'en_US', self::KEY_TIMEZONE => 'America/Los_Angeles', self::KEY_CURRENCY => 'USD', + self::KEY_ADMIN_USE_SECURITY_KEY => 1, ]; /** diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php index 20559c5c756420282534a22435b07bfe4a15b4c9..2076cc35bfc376dfabaeb88dfcc235250562f52f 100644 --- a/setup/module/Magento/Setup/src/Model/WebLogger.php +++ b/setup/module/Magento/Setup/src/Model/WebLogger.php @@ -65,7 +65,7 @@ class WebLogger implements LoggerInterface */ private function open($mode) { - $this->resource = @fopen($this->logFile, $mode); + $this->resource = fopen($this->logFile, $mode); } /** @@ -102,6 +102,14 @@ class WebLogger implements LoggerInterface $this->writeToFile('<span class="text-info">' . $message . '</span>'); } + /** + * {@inheritdoc} + */ + public function logMeta($message) + { + $this->writeToFile('<span class="hidden">' . $message . '</span>'); + } + /** * Write the message to file * @@ -152,6 +160,6 @@ class WebLogger implements LoggerInterface */ public function clear() { - @unlink($this->logFile); + unlink($this->logFile); } } diff --git a/setup/module/Magento/Setup/src/Module/Resource/Resource.php b/setup/module/Magento/Setup/src/Module/Resource/Resource.php index 46167fb297f3cadedda7df11f6acffbab4a3152b..3c58437c55d8115b7d8f9f4ca3299d051cd22ec7 100644 --- a/setup/module/Magento/Setup/src/Module/Resource/Resource.php +++ b/setup/module/Magento/Setup/src/Module/Resource/Resource.php @@ -43,27 +43,28 @@ class Resource implements ResourceInterface protected static $versions = null; /** - * Table prefix - * @var string + * DB adapter object + * + * @var AdapterInterface */ - protected $tablePrefix; + private $adapter; /** - * @param AdapterInterface $adapter + * Table prefix + * + * @var string */ - public function __construct(AdapterInterface $adapter) - { - $this->adapter = $adapter; - } + private $tablePrefix; /** - * Set table prefix + * Constructor * + * @param AdapterInterface $adapter * @param string $tablePrefix - * @return void */ - public function setTablePrefix($tablePrefix) + public function __construct(AdapterInterface $adapter, $tablePrefix) { + $this->adapter = $adapter; $this->tablePrefix = $tablePrefix; } diff --git a/setup/module/Magento/Setup/src/Module/Setup.php b/setup/module/Magento/Setup/src/Module/Setup.php index a2492be4c40bd2231caa0bd6726a80badc0c628e..90597ec98b6be66fa1694bf89c7762ac8896309e 100644 --- a/setup/module/Magento/Setup/src/Module/Setup.php +++ b/setup/module/Magento/Setup/src/Module/Setup.php @@ -23,10 +23,10 @@ */ namespace Magento\Setup\Module; -use Magento\Setup\Module\Setup\Connection\AdapterInterface; -use Magento\Setup\Module\Setup\FileResolver as SetupFileResolver; +use Magento\Setup\Module\Setup\ConnectionFactory; use Magento\Setup\Module\Updater\SetupInterface; use Magento\Setup\Model\LoggerInterface; +use Magento\Setup\Module\Setup\Config; class Setup implements SetupInterface { @@ -65,13 +65,6 @@ class Setup implements SetupInterface */ protected $filesystem; - /** - * Setup File Resolver - * - * @var SetupFileResolver - */ - protected $setupFileResolver; - /** * Logger * @@ -80,29 +73,27 @@ class Setup implements SetupInterface protected $logger; /** - * Table Prefix + * Deployment configuration * - * @var string + * @var Config */ - protected $tablePrefix; + protected $config; /** * Constructor * - * @param AdapterInterface $connection - * @param SetupFileResolver $setupFileResolver + * @param ConnectionFactory $connectionFactory * @param LoggerInterface $logger - * @param array $connectionConfig + * @param Config $config */ public function __construct( - AdapterInterface $connection, - SetupFileResolver $setupFileResolver, + ConnectionFactory $connectionFactory, LoggerInterface $logger, - array $connectionConfig = array() + Config $config ) { $this->logger = $logger; - $this->connection = $connection->getConnection($connectionConfig); - $this->setupFileResolver = $setupFileResolver; + $this->connection = $connectionFactory->create($config->getConfigData()); + $this->config = $config; } /** @@ -136,7 +127,7 @@ class Setup implements SetupInterface */ public function getTable($tableName) { - $tablePrefix = (string)$this->tablePrefix; + $tablePrefix = $this->config->get(Config::KEY_DB_PREFIX); if ($tablePrefix && strpos($tableName, $tablePrefix) !== 0) { $tableName = $tablePrefix . $tableName; } @@ -389,15 +380,4 @@ class Setup implements SetupInterface true ); } - - /** - * Set table prefix - * - * @param string $tablePrefix - * @return void - */ - public function setTablePrefix($tablePrefix) - { - $this->tablePrefix = $tablePrefix; - } } diff --git a/setup/module/Magento/Setup/src/Module/Setup/Connection/Adapter.php b/setup/module/Magento/Setup/src/Module/Setup/ConnectionFactory.php similarity index 76% rename from setup/module/Magento/Setup/src/Module/Setup/Connection/Adapter.php rename to setup/module/Magento/Setup/src/Module/Setup/ConnectionFactory.php index 2664c03792c24f3badb9596c5b29288df74a4822..74f0f40f14ab8d758de7abab21f7b168d37d2085 100644 --- a/setup/module/Magento/Setup/src/Module/Setup/Connection/Adapter.php +++ b/setup/module/Magento/Setup/src/Module/Setup/ConnectionFactory.php @@ -21,20 +21,19 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Setup\Module\Setup\Connection; +namespace Magento\Setup\Module\Setup; use Magento\Setup\Framework\DB\Adapter\Pdo\Mysql; -use Magento\Setup\Module\Setup\Config; -class Adapter implements AdapterInterface +class ConnectionFactory { /** - * Get connection + * Create DB adapter object * - * @param array $config - * @return \Magento\Setup\Framework\DB\Adapter\AdapterInterface|null + * @param \ArrayObject|array $config + * @return \Magento\Setup\Framework\DB\Adapter\Pdo\Mysql */ - public function getConnection(array $config = array()) + public function create($config) { return new Mysql( [ @@ -42,8 +41,7 @@ class Adapter implements AdapterInterface 'dsn' => "mysql:dbname=" . $config[Config::KEY_DB_NAME] . ";host=" . $config[Config::KEY_DB_HOST], 'username' => $config[Config::KEY_DB_USER], 'password' => isset($config[Config::KEY_DB_PASS]) ? $config[Config::KEY_DB_PASS] : null, - 'driver_options' => [ - \PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'UTF8'"] + 'driver_options' => [\PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'UTF8'"] ] ); } diff --git a/setup/module/Magento/Setup/src/Module/SetupFactory.php b/setup/module/Magento/Setup/src/Module/SetupFactory.php index 317730befe2ffd43c9f2354a8f932cc89be014b5..c0d01c802bf2aaddd22fc98937cdb618ca76bd93 100644 --- a/setup/module/Magento/Setup/src/Module/SetupFactory.php +++ b/setup/module/Magento/Setup/src/Module/SetupFactory.php @@ -24,57 +24,39 @@ namespace Magento\Setup\Module; +use Zend\ServiceManager\ServiceLocatorInterface; use Magento\Setup\Module\Setup\ConfigFactory as DeploymentConfigFactory; -use Magento\Setup\Module\Setup\Connection\AdapterInterface; use Magento\Setup\Module\Setup\Config; use Magento\Setup\Model\LoggerInterface; class SetupFactory { /** - * @var DeploymentConfigFactory - */ - private $deploymentConfigFactory; - - /** - * Adapter + * ZF service locator * - * @var AdapterInterface + * @var ServiceLocatorInterface */ - protected $adapter; + protected $serviceLocator; /** - * List of all Modules + * Deployment config factory * - * @var ModuleListInterface - */ - protected $moduleList; - - /** - * File Resolver - * - * @var Setup\FileResolver + * @var DeploymentConfigFactory */ - protected $fileResolver; + private $deploymentConfigFactory; /** - * Default Constructor + * Constructor * + * @param ServiceLocatorInterface $serviceLocator * @param DeploymentConfigFactory $deploymentConfigFactory - * @param AdapterInterface $connection - * @param ModuleListInterface $moduleList - * @param Setup\FileResolver $setupFileResolver */ public function __construct( - DeploymentConfigFactory $deploymentConfigFactory, - AdapterInterface $connection, - ModuleListInterface $moduleList, - Setup\FileResolver $setupFileResolver + ServiceLocatorInterface $serviceLocator, + DeploymentConfigFactory $deploymentConfigFactory ) { + $this->serviceLocator = $serviceLocator; $this->deploymentConfigFactory = $deploymentConfigFactory; - $this->adapter = $connection; - $this->moduleList = $moduleList; - $this->fileResolver = $setupFileResolver; } /** @@ -86,10 +68,9 @@ class SetupFactory public function createSetup(LoggerInterface $log) { return new Setup( - $this->adapter, - $this->fileResolver, + $this->serviceLocator->get('Magento\Setup\Module\Setup\ConnectionFactory'), $log, - $this->loadConfigData() + $this->loadConfig() ); } @@ -102,30 +83,25 @@ class SetupFactory */ public function createSetupModule(LoggerInterface $log, $moduleName) { - $configData = $this->loadConfigData(); - $result = new SetupModule( - $this->adapter, - $this->moduleList, - $this->fileResolver, + return new SetupModule( + $this->serviceLocator->get('Magento\Setup\Module\Setup\ConnectionFactory'), $log, - $moduleName, - $configData + $this->loadConfig(), + $this->serviceLocator->get('Magento\Setup\Module\ModuleList'), + $this->serviceLocator->get('Magento\Setup\Module\Setup\FileResolver'), + $moduleName ); - if (isset($configData[Config::KEY_DB_PREFIX])) { - $result->setTablePrefix($configData[Config::KEY_DB_PREFIX]); - } - return $result; } /** * Load deployment configuration data * - * @return array + * @return Config */ - private function loadConfigData() + private function loadConfig() { $config = $this->deploymentConfigFactory->create(); $config->loadFromFile(); - return $config->getConfigData(); + return $config; } } diff --git a/setup/module/Magento/Setup/src/Module/SetupModule.php b/setup/module/Magento/Setup/src/Module/SetupModule.php index 939f43ceb993c48166536a9915ef9780732d005c..4fbc10e3f1b72c03b513c4d58d9f0d3d87d6c3c4 100644 --- a/setup/module/Magento/Setup/src/Module/SetupModule.php +++ b/setup/module/Magento/Setup/src/Module/SetupModule.php @@ -23,10 +23,11 @@ */ namespace Magento\Setup\Module; -use Magento\Setup\Module\Setup\Connection\AdapterInterface; +use Magento\Setup\Module\Setup\ConnectionFactory; use Magento\Setup\Module\Setup\FileResolver as SetupFileResolver; use Magento\Setup\Module\Resource\Resource; use Magento\Setup\Model\LoggerInterface; +use Magento\Setup\Module\Setup\Config; class SetupModule extends Setup { @@ -43,6 +44,13 @@ class SetupModule extends Setup */ protected $moduleConfig; + /** + * Setup File Resolver + * + * @var SetupFileResolver + */ + protected $fileResolver; + /** * Resource * @@ -53,25 +61,26 @@ class SetupModule extends Setup /** * Constructor * - * @param AdapterInterface $connection - * @param ModuleListInterface $moduleList - * @param SetupFileResolver $setupFileResolver + * @param ConnectionFactory $connectionFactory * @param LoggerInterface $log - * @param string $moduleName - * @param array $connectionConfig + * @param Config $config + * @param ModuleListInterface $moduleList + * @param SetupFileResolver $fileResolver + * @param $moduleName */ public function __construct( - AdapterInterface $connection, - ModuleListInterface $moduleList, - SetupFileResolver $setupFileResolver, + ConnectionFactory $connectionFactory, LoggerInterface $log, - $moduleName, - array $connectionConfig = array() + Config $config, + ModuleListInterface $moduleList, + SetupFileResolver $fileResolver, + $moduleName ) { - parent::__construct($connection, $setupFileResolver, $log, $connectionConfig); + parent::__construct($connectionFactory, $log, $config); + $this->fileResolver = $fileResolver; $this->moduleConfig = $moduleList->getModule($moduleName); - $this->resource = new Resource($this->connection); - $this->resourceName = $this->setupFileResolver->getResourceCode($moduleName); + $this->resource = new Resource($this->connection, $config->get(Config::KEY_DB_PREFIX)); + $this->resourceName = $this->fileResolver->getResourceCode($moduleName); } /** @@ -83,9 +92,9 @@ class SetupModule extends Setup public function applyRecurringUpdates() { $moduleName = (string)$this->moduleConfig['name']; - foreach ($this->setupFileResolver->getSqlSetupFiles($moduleName, self::TYPE_DB_RECURRING . '.php') as $file) { + foreach ($this->fileResolver->getSqlSetupFiles($moduleName, self::TYPE_DB_RECURRING . '.php') as $file) { try { - $file = $this->setupFileResolver->getAbsolutePath($file); + $file = $this->fileResolver->getAbsolutePath($file); $this->includeFile($file); } catch (\Exception $e) { throw new \Exception(sprintf('Error in file: "%s" - %s', $file, $e->getMessage()), 0, $e); @@ -109,12 +118,12 @@ class SetupModule extends Setup $typeFiles = array(); $regExpDb = sprintf('#%s-(.*)\.(php|sql)$#i', $actionType); $regExpType = sprintf('#%s-%s-(.*)\.(php|sql)$#i', 'mysql4', $actionType); - foreach ($this->setupFileResolver->getSqlSetupFiles($moduleName, '*.{php,sql}') as $file) { + foreach ($this->fileResolver->getSqlSetupFiles($moduleName, '*.{php,sql}') as $file) { $matches = array(); if (preg_match($regExpDb, $file, $matches)) { - $dbFiles[$matches[1]] = $this->setupFileResolver->getAbsolutePath($file); + $dbFiles[$matches[1]] = $this->fileResolver->getAbsolutePath($file); } elseif (preg_match($regExpType, $file, $matches)) { - $typeFiles[$matches[1]] = $this->setupFileResolver->getAbsolutePath($file); + $typeFiles[$matches[1]] = $this->fileResolver->getAbsolutePath($file); } } @@ -254,16 +263,4 @@ class SetupModule extends Setup } return $arrRes; } - - /** - * Set table prefix - * - * @param string $tablePrefix - * @return void - */ - public function setTablePrefix($tablePrefix) - { - parent::setTablePrefix($tablePrefix); - $this->resource->setTablePrefix($this->tablePrefix); - } } diff --git a/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php b/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php index 03f8a63b8e2e32faade9ed42c9860bf7903c1e7c..9aad31633afba1ebe9705824e963ee280335fa1f 100644 --- a/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php +++ b/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php @@ -93,7 +93,6 @@ class Setup extends ZendRegex } $chunks = explode('/', substr(ltrim($path, '/'), $pathOffset)); - array_shift($chunks); // Extract 'lang' part array_pop($chunks); // Extract 'controller' part array_unshift($chunks, $this->defaults['__NAMESPACE__']); diff --git a/setup/module/Magento/Setup/view/magento/setup/install.phtml b/setup/module/Magento/Setup/view/magento/setup/install.phtml index 6baf08f45d8a5fb6ee5ac6ecc04c4db66181d326..6e95df09c95658929122f65336134d45896d1628 100644 --- a/setup/module/Magento/Setup/view/magento/setup/install.phtml +++ b/setup/module/Magento/Setup/view/magento/setup/install.phtml @@ -23,35 +23,35 @@ */ ?> <div class="step-controls"> - <a href="#" class="btn btn-primary" ng-disabled="disabled" ng-click="previousState()"><?php echo $this->translate('Previous'); ?></a> - <a href="#" class="btn btn-primary" ng-disabled="disabled" ng-click="start()" ng-show="isStart"><?php echo $this->translate('Try Again'); ?></a> + <a href="#" class="btn btn-primary" ng-disabled="isDisabled" ng-click="previousState()"><?php echo $this->translate('Previous'); ?></a> + <a href="#" class="btn btn-primary" ng-disabled="isDisabled" ng-click="start()" ng-show="isStarted"><?php echo $this->translate('Try Again'); ?></a> </div> <div class="page-header"> <h1>{{$state.current.header}}</h1> </div> -<div ng-show="!isStart" class="text-center" style="padding-top: 50px; padding-bottom: 50px;"> +<div ng-show="!isStarted" class="text-center" style="padding-top: 50px; padding-bottom: 50px;"> <p><?php echo $this->translate('You\'re ready!'); ?></p> <button ng-click="start()" class="btn btn-primary">Install Now</button> </div> -<div ng-show="isStart" ng-init="errorStatus='<?php echo $this->translate('Sorry we can not install Magento right now.'); ?>'"> - <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{progress}}%;">{{progressText}}</div></div> - <div ng-show="error" class="error-container"> +<div ng-show="isStarted"> + <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{progress}}%; min-width: 5em;">{{progressText}}</div></div> + <div ng-show="isFailed" class="error-container"> <span class="glyphicon glyphicon-remove-sign "></span> - <span><?php echo $this->translate('We don\'t know the exact reason. Check the console log for errors before trying again.'); ?></span> + <span><?php echo $this->translate('Installation is incomplete. Check the console log for errors before trying again.'); ?></span> </div> <div class="collapsed-options"> <a href="#" class="collapsed-options" ng-click="toggleConsole()"><?php echo $this->translate('Console Log'); ?></a> <span class="caret"></span> </div> - <div ng-show="console" id="console"> + <div ng-show="isConsole" id="console"> <div class="highlight" style="background-color: #000000;"><pre ng-bind-html="log"></pre></div> </div> </div> <div class="step-controls"> - <a href="#" class="btn btn-primary" ng-disabled="disabled" ng-click="previousState()"><?php echo $this->translate('Previous'); ?></a> - <a href="#" class="btn btn-primary" ng-disabled="disabled" ng-click="start()" ng-show="isStart"><?php echo $this->translate('Try Again'); ?></a> -</div> \ No newline at end of file + <a href="#" class="btn btn-primary" ng-disabled="isDisabled" ng-click="previousState()"><?php echo $this->translate('Previous'); ?></a> + <a href="#" class="btn btn-primary" ng-disabled="isDisabled" ng-click="start()" ng-show="isStarted"><?php echo $this->translate('Try Again'); ?></a> +</div> diff --git a/setup/module/Magento/Setup/view/magento/setup/landing.phtml b/setup/module/Magento/Setup/view/magento/setup/landing.phtml index 13317c2a7078d016d354d5f9378dc62f263f80be..b7e62a452588148d50ff544b00c1febbed9e35eb 100644 --- a/setup/module/Magento/Setup/view/magento/setup/landing.phtml +++ b/setup/module/Magento/Setup/view/magento/setup/landing.phtml @@ -25,13 +25,15 @@ <div class="text-center"> <h1><?php echo $this->translate('Magento'); ?></h1> <br/> - <p><?php echo $this->translate('Version x.x.x'); ?></p> + <p><?php echo $this->translate('Version') . ' ' . $this->version; ?></p> <br/> <br/> <br/> <p><?php echo $this->translate('Welcome to Magento Admin, your online store headquarters. - Click \'Agree and Set Up Magento\' or read <a href="#/getting-start">Getting Start</a> to learn more.'); ?></p> + Click \'Agree and Set Up Magento\' or read <a href="#/getting-started">Getting Started</a> to learn more.'); ?></p> <br/> +<?php +/* not implemented yet <br/> <br/> <label><?php echo $this->translate('Choose a language:'); ?></label> @@ -42,9 +44,11 @@ </select> <br/> <br/> +*/ +?> <br/> <div> - <a href="#/terms-and-agreement"><?php echo $this->translate('Terms & Agreement'); ?></a> + <a href="#" ng-click="previousState()"><?php echo $this->translate('Terms & Agreement'); ?></a> </div> <br/> <button type="button" class="btn-lg btn-primary" ng-click="nextState()"><?php echo $this->translate('Agree and Set Up Magento'); ?></button> diff --git a/setup/module/Magento/Setup/view/magento/setup/license.phtml b/setup/module/Magento/Setup/view/magento/setup/license.phtml new file mode 100644 index 0000000000000000000000000000000000000000..13c5ce8cc085e58201f8de4758eacfc10cf47c76 --- /dev/null +++ b/setup/module/Magento/Setup/view/magento/setup/license.phtml @@ -0,0 +1,33 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +?> +<div class="col-xs-9"> + <br/> + <a href="#" class="btn btn-primary" ng-click="nextState()"> <?php echo $this->translate('Go Back'); ?></a> + <br/><br/> + <?php echo nl2br(htmlspecialchars($this->license, ENT_COMPAT, 'UTF-8')); ?> + <br/><br/><br/> + <a href="#" class="btn btn-primary" ng-click="nextState()"> <?php echo $this->translate('Go Back'); ?></a> + <br/><br/> +</div> diff --git a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml index 724936cd69ca2aa50b99020c83b7a2cd1a754560..9d7e6bb7fa7b9eaead3df0ae9b5bbeed73f00a2b 100644 --- a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml +++ b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml @@ -29,7 +29,7 @@ <span ng-switch-default><?php echo $this->translate('Completed!'); ?></span> </div> <div ng-switch-default> - <img src="../pub/images/ajax-loader.gif" /> + <img src="pub/images/ajax-loader.gif" /> <span><?php echo $this->translate('We\'re making sure your server environment is ready for Magento to be installed.'); ?></span> </div> </div> diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js index 731d8d86e01c8796fb4755a150fb69724fd2a309..51910485e1486a222d2083c5684d9953552e623d 100644 --- a/setup/pub/magento/setup/install.js +++ b/setup/pub/magento/setup/install.js @@ -24,19 +24,17 @@ 'use strict'; angular.module('install', ['ngStorage']) .controller('installController', ['$scope', '$sce', '$timeout', '$localStorage', '$rootScope', 'progress', function ($scope, $sce, $timeout, $localStorage, $rootScope, progress) { - $scope.finished = false; - $scope.isStart = false; - $scope.console = false; - $scope.disabled = false; + $scope.isStarted = false; + $scope.isInProgress = false; + $scope.isConsole = false; + $scope.isDisabled = false; $scope.toggleConsole = function () { - $scope.console = $scope.console === false; + $scope.isConsole = $scope.isConsole === false; }; $scope.checkProgress = function () { - $scope.isStart = true; - $scope.disabled = true; + $scope.displayProgress(); progress.get(function (response) { - var log = ''; response.data.console.forEach(function (message) { log = log + message + '<br>'; @@ -46,18 +44,13 @@ angular.module('install', ['ngStorage']) if (response.data.success) { $scope.progress = response.data.progress; $scope.progressText = response.data.progress + '%'; - + } else { + $scope.displayFailure(); + } + if ($scope.isInProgress) { $timeout(function() { - if (!$scope.finished) { - $scope.checkProgress(); - } + $scope.checkProgress(); }, 1500); - } else { - $scope.progress = 100; - $scope.progressText = $scope.errorStatus; - $scope.error = true; - $scope.disabled = false; - $rootScope.isMenuEnabled = true; } }); }; @@ -69,20 +62,31 @@ angular.module('install', ['ngStorage']) 'store': $localStorage.store, 'config': $localStorage.config }; - $rootScope.isMenuEnabled = false; + $scope.isStarted = true; + $scope.isInProgress = true; progress.post(data, function (response) { - $localStorage.config.encrypt.key = response.key; + $scope.isInProgress = false; if (response.success) { - $scope.finished = true; + $localStorage.config.encrypt.key = response.key; $scope.nextState(); + } else { + $scope.displayFailure(); } }); - progress.clear(function (response) { - if (response.data.success) { - $scope.checkProgress(); - } + progress.get(function () { + $scope.checkProgress(); }); }; + $scope.displayProgress = function() { + $scope.isFailed = false; + $scope.isDisabled = true; + $rootScope.isMenuEnabled = false; + }; + $scope.displayFailure = function () { + $scope.isFailed = true; + $scope.isDisabled = false; + $rootScope.isMenuEnabled = true; + }; }]) .service('progress', ['$http', function ($http) { return { @@ -91,9 +95,6 @@ angular.module('install', ['ngStorage']) }, post: function (data, callback) { $http.post('install/start', data).success(callback); - }, - clear: function (callback) { - $http.get('install/clear-progress').then(callback); } }; }]); diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js index 55dcef6a8f0ed83be0060785f0393545a618142a..70434761c42de57e3d721462df92b9e90491b5aa 100644 --- a/setup/pub/magento/setup/readiness-check.js +++ b/setup/pub/magento/setup/readiness-check.js @@ -135,18 +135,11 @@ angular.module('readiness-check', []) }; $scope.progress = function() { - var timeout = 0; angular.forEach($scope.items, function(item) { - timeout += 1000; - $timeout(function() { - item.show(); - }, timeout); + item.show(); }); angular.forEach($scope.items, function(item) { - timeout += 500; - $timeout(function() { - $scope.query(item); - }, timeout); + $scope.query(item); }); };