ITOBEN STYLE > EC-CUBE3 > EC-CUBE3 ■3.0.10から3.0.11へのバージョンアップファイル一覧 2016年10月15日カテゴリー: EC-CUBE3 EC-CUBE3 ■3.0.10から3.0.11へのバージョンアップファイル一覧 ******** 直下 ******** ■.coveralls.yml ←★新規追加 ■.htaccess.sample ←★新規追加 ■autoload.php ■composer.json ■composer.lock ■eccube_install.sh ■phpunit.xml.dist ■web.config.sample ←★新規追加 ********ディレクトリで変更されているファイル ******** 1 ■html/template/default/js/eccube.js ■html/.htaccess ■html/index.php ■html/index_dev.php ■html/install.php ******** [src/Eccube]ディレクトリで変更されているファイル ******** ■src/Eccube/Application.php ————————————————– ■src/Eccube/Common/Constant.php ————————————————– ■src/Eccube/Controller/EntryController.php ■src/Eccube/Controller/ProductController.php ■src/Eccube/Controller/ShoppingController.php ■src/Eccube/Controller/Admin/AdminController.php ■src/Eccube/Controller/Admin/Content/CacheController.php ■src/Eccube/Controller/Admin/Content/ContentsController.php ■src/Eccube/Controller/Admin/Content/LayoutController.php ■src/Eccube/Controller/Admin/Customer/CustomerController.php ■src/Eccube/Controller/Admin/Order/EditController.php ■src/Eccube/Controller/Admin/Order/MailController.php ■src/Eccube/Controller/Admin/Order/OrderController.php ■src/Eccube/Controller/Admin/Product/CategoryController.php ■src/Eccube/Controller/Admin/Product/CsvImportController.php ■src/Eccube/Controller/Admin/Product/ProductClassController.php ■src/Eccube/Controller/Admin/Product/ProductController.php ■src/Eccube/Controller/Admin/Setting/System/MasterdataController.php ■src/Eccube/Controller/Admin/Setting/System/SecurityController.php ■src/Eccube/Controller/Admin/Store/PluginController.php ■src/Eccube/Controller/Admin/Store/TemplateController.php ■src/Eccube/Controller/Install/InstallController.php ■src/Eccube/Controller/Mypage/MypageController.php ————————————————– ■src/Eccube/ControllerProvider/AdminControllerProvider.php ————————————————– ■src/Eccube/Doctrine/ORM ←★新規追加 ————————————————– ■src/Eccube/Entity/Category.php ■src/Eccube/Entity/CategoryCount.php ■src/Eccube/Entity/CategoryTotalCount.php ■src/Eccube/Entity/Plugin.php ■src/Eccube/Entity/PluginEventHandler.php ■src/Eccube/Entity/Product.php ————————————————– ■src/Eccube/Event/EccubeEvents.php ■src/Eccube/Event/FormEventSubscriber.php ————————————————– ■src/Eccube/EventListener/TransactionListener.php ←★新規追加 ————————————————– ■src/Eccube/Form/Type/AddCartType.php ■src/Eccube/Form/Type/AddressType.php ■src/Eccube/Form/Type/CustomerType.php ■src/Eccube/Form/Type/NameType.php ■src/Eccube/Form/Type/OrderMailType.php ■src/Eccube/Form/Type/OrderSearchType.php ■src/Eccube/Form/Type/SearchProductType.php ■src/Eccube/Form/Type/ShippingItemType.php ■src/Eccube/Form/Type/ShippingMultipleItemType.php ■src/Eccube/Form/Type/ShippingMultipleType.php ■src/Eccube/Form/Type/ShoppingMultipleType.php ■src/Eccube/Form/Type/ShoppingType.php ■src/Eccube/Form/Type/TelType.php ■src/Eccube/Form/Type/ZipType.php ■src/Eccube/Form/Type/Admin/AuthorityRoleType.php ■src/Eccube/Form/Type/Admin/BlockType.php ■src/Eccube/Form/Type/Admin/CacheType.php ←★新規追加 ■src/Eccube/Form/Type/Admin/CategoryType.php ■src/Eccube/Form/Type/Admin/ChangePasswordType.php ←★新規追加 ■src/Eccube/Form/Type/Admin/ClassCategoryType.php ■src/Eccube/Form/Type/Admin/ClassNameType.php ■src/Eccube/Form/Type/Admin/CsvImportType.php ■src/Eccube/Form/Type/Admin/CustomerAgreementType.php ■src/Eccube/Form/Type/Admin/CustomerType.php ■src/Eccube/Form/Type/Admin/DeliveryFeeType.php ■src/Eccube/Form/Type/Admin/DeliveryTimeType.php ■src/Eccube/Form/Type/Admin/DeliveryType.php ■src/Eccube/Form/Type/Admin/FaqType.php ■src/Eccube/Form/Type/Admin/LoginType.php ■src/Eccube/Form/Type/Admin/LogType.php ■src/Eccube/Form/Type/Admin/LpRegisterType.php ■src/Eccube/Form/Type/Admin/MailType.php ■src/Eccube/Form/Type/Admin/MainEditType.php ■src/Eccube/Form/Type/Admin/MasterdataType.php ■src/Eccube/Form/Type/Admin/MemberType.php ■src/Eccube/Form/Type/Admin/NewsType.php ■src/Eccube/Form/Type/Admin/OrderDetailType.php ■src/Eccube/Form/Type/Admin/OrderType.php ■src/Eccube/Form/Type/Admin/PageLayoutType.php ■src/Eccube/Form/Type/Admin/PaymentRegisterType.php ■src/Eccube/Form/Type/Admin/PluginLocalInstallType.php ■src/Eccube/Form/Type/Admin/PluginManagementType.php ■src/Eccube/Form/Type/Admin/ProductClassType.php ■src/Eccube/Form/Type/Admin/ProductType.php ■src/Eccube/Form/Type/Admin/SearchCustomerType.php ■src/Eccube/Form/Type/Admin/SearchOrderType.php ■src/Eccube/Form/Type/Admin/SearchProductType.php ■src/Eccube/Form/Type/Admin/SecurityType.php ■src/Eccube/Form/Type/Admin/ShipmentItemType.php ■src/Eccube/Form/Type/Admin/ShippingType.php ■src/Eccube/Form/Type/Admin/ShopMasterType.php ■src/Eccube/Form/Type/Admin/TaxRuleType.php ■src/Eccube/Form/Type/Admin/TemplateType.php ■src/Eccube/Form/Type/Admin/TickerRegisterType.php ■src/Eccube/Form/Type/Admin/TopimageRegisterType.php ■src/Eccube/Form/Type/Admin/TradelawType.php ■src/Eccube/Form/Type/Front/ContactType.php ■src/Eccube/Form/Type/Front/CustomerAddressType.php ■src/Eccube/Form/Type/Front/CustomerLoginType.php ■src/Eccube/Form/Type/Front/EntryType.php ■src/Eccube/Form/Type/Front/ForgotType.php ■src/Eccube/Form/Type/Front/NonMemberType.php ■src/Eccube/Form/Type/Front/ShoppingShippingType.php ■src/Eccube/Form/Type/Install/Step3Type.php ■src/Eccube/Form/Type/Master/PageMaxType.php ■src/Eccube/Form/Type/Master/ProductListMaxType.php ■src/Eccube/Form/Type/Master/ProductListOrderByType.php ————————————————– ■src/Eccube/Repository/CategoryCountRepository.php ■src/Eccube/Repository/CategoryTotalCountRepository.php ■src/Eccube/Repository/CustomerFavoriteProductRepository.php ■src/Eccube/Repository/CustomerRepository.php ■src/Eccube/Repository/MemberRepository.php ■src/Eccube/Repository/ProductRepository.php ————————————————– ■src/Eccube/Resource/config/cache.yml.dist ←★新規追加 ■src/Eccube/Resource/config/database.yml.dist ■src/Eccube/Resource/config/doctrine_cache.yml.dist ←★新規追加 ■src/Eccube/Resource/config/http_cache.yml.dist ←★新規追加 ■src/Eccube/Resource/config/nav.yml.dist ■src/Eccube/Resource/config/path.yml.dist ■src/Eccube/Resource/config/session_handler.yml.dist ←★新規追加 ■src/Eccube/Resource/doctrine/Eccube.Entity.Category.dcm.yml ■src/Eccube/Resource/doctrine/Eccube.Entity.CategoryCount.dcm.yml ■src/Eccube/Resource/doctrine/Eccube.Entity.CategoryTotalCount.dcm.yml ■src/Eccube/Resource/doctrine/migration/Version20160413151321.php ■src/Eccube/Resource/doctrine/migration/Version20160823140932.php ←★新規追加 ■src/Eccube/Resource/doctrine/migration/Version20160823172700.php ←★新規追加 ■src/Eccube/Resource/doctrine/migration/Version20160908161616.php ←★新規追加 ■src/Eccube/Resource/locale/message.ja.yml ■src/Eccube/Resource/locale/validator.ja.yml ————————————————– ▼ここからは、twigファイル ■src/Eccube/Resource/template/admin/change_password.twig ←★新規追加 ■src/Eccube/Resource/template/admin/default_frame.twig ■src/Eccube/Resource/template/admin/Content/cache.twig ■src/Eccube/Resource/template/admin/Customer/index.twig ■src/Eccube/Resource/template/admin/Order/edit.twig ■src/Eccube/Resource/template/admin/Order/index.twig ■src/Eccube/Resource/template/admin/Order/mail.twig ■src/Eccube/Resource/template/admin/Order/mail_all.twig ■src/Eccube/Resource/template/admin/Order/mail_complete.twig ■src/Eccube/Resource/template/admin/Product/index.twig ■src/Eccube/Resource/template/admin/Product/product.twig ■src/Eccube/Resource/template/admin/Product/product_class.twig ■src/Eccube/Resource/template/admin/Setting/Shop/customer_agreement.twig ■src/Eccube/Resource/template/admin/Store/plugin_install.twig ■src/Eccube/Resource/template/default/block.twig ■src/Eccube/Resource/template/default/Mypage/favorite.twig ■src/Eccube/Resource/template/default/Mypage/history.twig ■src/Eccube/Resource/template/default/Product/detail.twig ▼detail.twigはカスタマイズされている可能性が高いので、修正箇所を具体的に明記します。 ======================================== 修正① 2つ目の<script>~</script>内の最後、}); の前に追加 ——————– $(‘#add-cart’).click(function() { $(‘#mode’).val(‘add_cart’); }); ——————– 修正② 通常価格 ——————– <p id=”detail_description_box__class_normal_range_price” class=”normal_price”> 通常価格:<span class=”price01_default”>{{ Product.getPrice01IncTaxMin|price }}</span> ~ <span class=”price01_default”>{{ Product.getPrice01IncTaxMax|price }}</span> <span class=”small”>税込</span></p> ——————– ↓【修正】 ——————– <p id=”detail_description_box__class_normal_range_price” class=”normal_price”> 通常価格:<span class=”price01_default”>{{ Product.getPrice01IncTaxMin|price }} ~ {{ Product.getPrice01IncTaxMax|price }}</span> <span class=”small”>税込</span></p> ——————– 修正③ 販売価格 ——————– <p id=”detail_description_box__class_range_sale_price” class=”sale_price text-primary”> <span class=”price02_default”>{{ Product.getPrice02IncTaxMin|price }}</span> ~ <span class=”price02_default”>{{ Product.getPrice02IncTaxMax|price }}</span> <span class=”small”>税込</span></p> ——————– ↓【修正】 ——————– <p id=”detail_description_box__class_range_sale_price” class=”sale_price text-primary”> <span class=”price02_default”>{{ Product.getPrice02IncTaxMin|price }} ~ {{ Product.getPrice02IncTaxMax|price }}</span> <span class=”small”>税込</span></p> ——————– 修正④ カートボタン ——————– <li class=”col-xs-12 col-sm-8″><button type=”submit” id=”cart” class=”btn btn-primary btn-block prevention-btn prevention-mask”>カートに入れる</button></li> ——————– ↓【修正】 ——————– <li class=”col-xs-12 col-sm-8″><button type=”submit” id=”add-cart” class=”btn btn-primary btn-block prevention-btn prevention-mask”>カートに入れる</button></li> ——————– ======================================== ■src/Eccube/Resource/template/default/Product/option_detailclass_script.twig(本サイトのダウンロード商品「C3010D1609A」のみ) ■src/Eccube/Resource/template/install/frame.twig ■src/Eccube/Resource/template/install/migration_frame.twig ————————————————– ■src/Eccube/Service/CsvImportService.php ■src/Eccube/Service/ShoppingService.php ————————————————– ■src/Eccube/ServiceProvider/DebugServiceProvider.php ■src/Eccube/ServiceProvider/EccubeServiceProvider.php ————————————————–
******** 直下 ********
■.coveralls.yml ←★新規追加
■.htaccess.sample ←★新規追加
■autoload.php
■composer.json
■composer.lock
■eccube_install.sh
■phpunit.xml.dist
■web.config.sample ←★新規追加
********ディレクトリで変更されているファイル ********
■html/template/default/js/eccube.js
■html/.htaccess
■html/index.php
■html/index_dev.php
■html/install.php
******** [src/Eccube]ディレクトリで変更されているファイル ********
■src/Eccube/Application.php
————————————————–
■src/Eccube/Common/Constant.php
————————————————–
■src/Eccube/Controller/EntryController.php
■src/Eccube/Controller/ProductController.php
■src/Eccube/Controller/ShoppingController.php
■src/Eccube/Controller/Admin/AdminController.php
■src/Eccube/Controller/Admin/Content/CacheController.php
■src/Eccube/Controller/Admin/Content/ContentsController.php
■src/Eccube/Controller/Admin/Content/LayoutController.php
■src/Eccube/Controller/Admin/Customer/CustomerController.php
■src/Eccube/Controller/Admin/Order/EditController.php
■src/Eccube/Controller/Admin/Order/MailController.php
■src/Eccube/Controller/Admin/Order/OrderController.php
■src/Eccube/Controller/Admin/Product/CategoryController.php
■src/Eccube/Controller/Admin/Product/CsvImportController.php
■src/Eccube/Controller/Admin/Product/ProductClassController.php
■src/Eccube/Controller/Admin/Product/ProductController.php
■src/Eccube/Controller/Admin/Setting/System/MasterdataController.php
■src/Eccube/Controller/Admin/Setting/System/SecurityController.php
■src/Eccube/Controller/Admin/Store/PluginController.php
■src/Eccube/Controller/Admin/Store/TemplateController.php
■src/Eccube/Controller/Install/InstallController.php
■src/Eccube/Controller/Mypage/MypageController.php
————————————————–
■src/Eccube/ControllerProvider/AdminControllerProvider.php
————————————————–
■src/Eccube/Doctrine/ORM ←★新規追加
————————————————–
■src/Eccube/Entity/Category.php
■src/Eccube/Entity/CategoryCount.php
■src/Eccube/Entity/CategoryTotalCount.php
■src/Eccube/Entity/Plugin.php
■src/Eccube/Entity/PluginEventHandler.php
■src/Eccube/Entity/Product.php
————————————————–
■src/Eccube/Event/EccubeEvents.php
■src/Eccube/Event/FormEventSubscriber.php
————————————————–
■src/Eccube/EventListener/TransactionListener.php ←★新規追加
————————————————–
■src/Eccube/Form/Type/AddCartType.php
■src/Eccube/Form/Type/AddressType.php
■src/Eccube/Form/Type/CustomerType.php
■src/Eccube/Form/Type/NameType.php
■src/Eccube/Form/Type/OrderMailType.php
■src/Eccube/Form/Type/OrderSearchType.php
■src/Eccube/Form/Type/SearchProductType.php
■src/Eccube/Form/Type/ShippingItemType.php
■src/Eccube/Form/Type/ShippingMultipleItemType.php
■src/Eccube/Form/Type/ShippingMultipleType.php
■src/Eccube/Form/Type/ShoppingMultipleType.php
■src/Eccube/Form/Type/ShoppingType.php
■src/Eccube/Form/Type/TelType.php
■src/Eccube/Form/Type/ZipType.php
■src/Eccube/Form/Type/Admin/AuthorityRoleType.php
■src/Eccube/Form/Type/Admin/BlockType.php
■src/Eccube/Form/Type/Admin/CacheType.php ←★新規追加
■src/Eccube/Form/Type/Admin/CategoryType.php
■src/Eccube/Form/Type/Admin/ChangePasswordType.php ←★新規追加
■src/Eccube/Form/Type/Admin/ClassCategoryType.php
■src/Eccube/Form/Type/Admin/ClassNameType.php
■src/Eccube/Form/Type/Admin/CsvImportType.php
■src/Eccube/Form/Type/Admin/CustomerAgreementType.php
■src/Eccube/Form/Type/Admin/CustomerType.php
■src/Eccube/Form/Type/Admin/DeliveryFeeType.php
■src/Eccube/Form/Type/Admin/DeliveryTimeType.php
■src/Eccube/Form/Type/Admin/DeliveryType.php
■src/Eccube/Form/Type/Admin/FaqType.php
■src/Eccube/Form/Type/Admin/LoginType.php
■src/Eccube/Form/Type/Admin/LogType.php
■src/Eccube/Form/Type/Admin/LpRegisterType.php
■src/Eccube/Form/Type/Admin/MailType.php
■src/Eccube/Form/Type/Admin/MainEditType.php
■src/Eccube/Form/Type/Admin/MasterdataType.php
■src/Eccube/Form/Type/Admin/MemberType.php
■src/Eccube/Form/Type/Admin/NewsType.php
■src/Eccube/Form/Type/Admin/OrderDetailType.php
■src/Eccube/Form/Type/Admin/OrderType.php
■src/Eccube/Form/Type/Admin/PageLayoutType.php
■src/Eccube/Form/Type/Admin/PaymentRegisterType.php
■src/Eccube/Form/Type/Admin/PluginLocalInstallType.php
■src/Eccube/Form/Type/Admin/PluginManagementType.php
■src/Eccube/Form/Type/Admin/ProductClassType.php
■src/Eccube/Form/Type/Admin/ProductType.php
■src/Eccube/Form/Type/Admin/SearchCustomerType.php
■src/Eccube/Form/Type/Admin/SearchOrderType.php
■src/Eccube/Form/Type/Admin/SearchProductType.php
■src/Eccube/Form/Type/Admin/SecurityType.php
■src/Eccube/Form/Type/Admin/ShipmentItemType.php
■src/Eccube/Form/Type/Admin/ShippingType.php
■src/Eccube/Form/Type/Admin/ShopMasterType.php
■src/Eccube/Form/Type/Admin/TaxRuleType.php
■src/Eccube/Form/Type/Admin/TemplateType.php
■src/Eccube/Form/Type/Admin/TickerRegisterType.php
■src/Eccube/Form/Type/Admin/TopimageRegisterType.php
■src/Eccube/Form/Type/Admin/TradelawType.php
■src/Eccube/Form/Type/Front/ContactType.php
■src/Eccube/Form/Type/Front/CustomerAddressType.php
■src/Eccube/Form/Type/Front/CustomerLoginType.php
■src/Eccube/Form/Type/Front/EntryType.php
■src/Eccube/Form/Type/Front/ForgotType.php
■src/Eccube/Form/Type/Front/NonMemberType.php
■src/Eccube/Form/Type/Front/ShoppingShippingType.php
■src/Eccube/Form/Type/Install/Step3Type.php
■src/Eccube/Form/Type/Master/PageMaxType.php
■src/Eccube/Form/Type/Master/ProductListMaxType.php
■src/Eccube/Form/Type/Master/ProductListOrderByType.php
————————————————–
■src/Eccube/Repository/CategoryCountRepository.php
■src/Eccube/Repository/CategoryTotalCountRepository.php
■src/Eccube/Repository/CustomerFavoriteProductRepository.php
■src/Eccube/Repository/CustomerRepository.php
■src/Eccube/Repository/MemberRepository.php
■src/Eccube/Repository/ProductRepository.php
————————————————–
■src/Eccube/Resource/config/cache.yml.dist ←★新規追加
■src/Eccube/Resource/config/database.yml.dist
■src/Eccube/Resource/config/doctrine_cache.yml.dist ←★新規追加
■src/Eccube/Resource/config/http_cache.yml.dist ←★新規追加
■src/Eccube/Resource/config/nav.yml.dist
■src/Eccube/Resource/config/path.yml.dist
■src/Eccube/Resource/config/session_handler.yml.dist ←★新規追加
■src/Eccube/Resource/doctrine/Eccube.Entity.Category.dcm.yml
■src/Eccube/Resource/doctrine/Eccube.Entity.CategoryCount.dcm.yml
■src/Eccube/Resource/doctrine/Eccube.Entity.CategoryTotalCount.dcm.yml
■src/Eccube/Resource/doctrine/migration/Version20160413151321.php
■src/Eccube/Resource/doctrine/migration/Version20160823140932.php ←★新規追加
■src/Eccube/Resource/doctrine/migration/Version20160823172700.php ←★新規追加
■src/Eccube/Resource/doctrine/migration/Version20160908161616.php ←★新規追加
■src/Eccube/Resource/locale/message.ja.yml
■src/Eccube/Resource/locale/validator.ja.yml
————————————————–
▼ここからは、twigファイル
■src/Eccube/Resource/template/admin/change_password.twig ←★新規追加
■src/Eccube/Resource/template/admin/default_frame.twig
■src/Eccube/Resource/template/admin/Content/cache.twig
■src/Eccube/Resource/template/admin/Customer/index.twig
■src/Eccube/Resource/template/admin/Order/edit.twig
■src/Eccube/Resource/template/admin/Order/index.twig
■src/Eccube/Resource/template/admin/Order/mail.twig
■src/Eccube/Resource/template/admin/Order/mail_all.twig
■src/Eccube/Resource/template/admin/Order/mail_complete.twig
■src/Eccube/Resource/template/admin/Product/index.twig
■src/Eccube/Resource/template/admin/Product/product.twig
■src/Eccube/Resource/template/admin/Product/product_class.twig
■src/Eccube/Resource/template/admin/Setting/Shop/customer_agreement.twig
■src/Eccube/Resource/template/admin/Store/plugin_install.twig
■src/Eccube/Resource/template/default/block.twig
■src/Eccube/Resource/template/default/Mypage/favorite.twig
■src/Eccube/Resource/template/default/Mypage/history.twig
■src/Eccube/Resource/template/default/Product/detail.twig
▼detail.twigはカスタマイズされている可能性が高いので、修正箇所を具体的に明記します。
========================================
修正① 2つ目の<script>~</script>内の最後、}); の前に追加
——————–
$(‘#add-cart’).click(function() {
$(‘#mode’).val(‘add_cart’);
});
——————–
修正② 通常価格
——————–
<p id=”detail_description_box__class_normal_range_price” class=”normal_price”> 通常価格:<span class=”price01_default”>{{ Product.getPrice01IncTaxMin|price }}</span> ~ <span class=”price01_default”>{{ Product.getPrice01IncTaxMax|price }}</span> <span class=”small”>税込</span></p>
——————–
↓【修正】
——————–
<p id=”detail_description_box__class_normal_range_price” class=”normal_price”> 通常価格:<span class=”price01_default”>{{ Product.getPrice01IncTaxMin|price }} ~ {{ Product.getPrice01IncTaxMax|price }}</span> <span class=”small”>税込</span></p>
——————–
修正③ 販売価格
——————–
<p id=”detail_description_box__class_range_sale_price” class=”sale_price text-primary”> <span class=”price02_default”>{{ Product.getPrice02IncTaxMin|price }}</span> ~ <span class=”price02_default”>{{ Product.getPrice02IncTaxMax|price }}</span> <span class=”small”>税込</span></p>
——————–
↓【修正】
——————–
<p id=”detail_description_box__class_range_sale_price” class=”sale_price text-primary”> <span class=”price02_default”>{{ Product.getPrice02IncTaxMin|price }} ~ {{ Product.getPrice02IncTaxMax|price }}</span> <span class=”small”>税込</span></p>
——————–
修正④ カートボタン
——————–
<li class=”col-xs-12 col-sm-8″><button type=”submit” id=”cart” class=”btn btn-primary btn-block prevention-btn prevention-mask”>カートに入れる</button></li>
——————–
↓【修正】
——————–
<li class=”col-xs-12 col-sm-8″><button type=”submit” id=”add-cart” class=”btn btn-primary btn-block prevention-btn prevention-mask”>カートに入れる</button></li>
——————–
========================================
■src/Eccube/Resource/template/default/Product/option_detailclass_script.twig(本サイトのダウンロード商品「C3010D1609A」のみ)
■src/Eccube/Resource/template/install/frame.twig
■src/Eccube/Resource/template/install/migration_frame.twig
————————————————–
■src/Eccube/Service/CsvImportService.php
■src/Eccube/Service/ShoppingService.php
————————————————–
■src/Eccube/ServiceProvider/DebugServiceProvider.php
■src/Eccube/ServiceProvider/EccubeServiceProvider.php
————————————————–