ITOBEN STYLE > EC-CUBE3 > EC-CUBE3 3.0.13→3.0.14バージョンアップファイルの一覧 2017年3月20日カテゴリー: EC-CUBE3 EC-CUBE3 3.0.13→3.0.14バージョンアップファイルの一覧 3.0.13のファイルに対して、修正が行われているファイルは次の通りです。 (vendorフォルダ以外) ★は、新規追加 ▲は、3.0.14では不要 ********** 直下ファイル ********** ■.htaccess.sample ■composer.json ■composer.lock ■eccube_install.sh ■phpunit.xml.dist ********** app ********** ■app/console ********** html ********** ■html/.htaccess ——————————— URLから「html」を除いて運用している場合は、1つ上の階層に移動。 その際、1つの上の階層の[.htaccess]を上書き。 ——————————— ■html/template/admin/assets/css/dashboard.css ■html/template/admin/assets/js/function.js ■html/template/default/css/style.css ① ================================= /* MyPage ——————————————- */ の最後に追加されている(2063行目付近) ================================= ↓(2072行目付近に追加) ——————————— #delivery_address_list div.is-edit { position: relative; } ——————————— ② ================================= /****** Effect Setting ********/ に追加されている(3257行目付近) ================================= ↓(3266行目付近に追加) ——————————— /* My page address */ #delivery_address_list div.is-edit p.btn_edit { top: 30%; } ——————————— ③ ================================= /* MyPage ——————————————- */ の最後に追加されている(4338行目付近) ================================= ↓(4375行目付近に追加) ——————————— /* My page address */ #delivery_address_list div.is-edit p.btn_edit { top: 30%; } ——————————— ■html/template/install/assets/img/svg.html ■html/template/install/assets/js/function.js ■html/template/install/assets/js/vendor★ ********** src/Eccube/ ********** ■src/Eccube/Application.php ********** src/Eccube/Command/ ********** ■src/Eccube/Command/PluginCommand.php ■src/Eccube/Command/GeneratorCommand★ ■src/Eccube/Command/PluginCommand▲ ********** src/Eccube/Common/ ********** ■src/Eccube/Common/Constant.php ********** src/Eccube/Controller/ ********** ■src/Eccube/Controller/ShoppingController.php ■src/Eccube/Controller/Admin/AdminController.php ■src/Eccube/Controller/Admin/Content/FileController.php ■src/Eccube/Controller/Admin/Customer/CustomerController.php ■src/Eccube/Controller/Admin/Order/EditController.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/ProductController.php ■src/Eccube/Controller/Admin/Setting/Shop/ShopController.php ■src/Eccube/Controller/Admin/Store/PluginController.php ■src/Eccube/Controller/Admin/Store/TemplateController.php ■src/Eccube/Controller/Block/CartController.php ■src/Eccube/Controller/Install/InstallController.php ********** src/Eccube/Doctrine/ ********** ■src/Eccube/Doctrine/ORM/Query/Normalize.php ********** src/Eccube/Entity/ ********** ■src/Eccube/Entity/Customer.php ■src/Eccube/Entity/ExportCsvRow.php★ ■src/Eccube/Entity/Shipping.php ********** src/Eccube/Event/ ********** ■src/Eccube/Event/EccubeEvents.php ********** src/Eccube/Form/ ********** ■src/Eccube/Form/Type/PriceType.php ■src/Eccube/Form/Type/ShippingMultipleItemType.php ■src/Eccube/Form/Type/ShippingMultipleType.php ■src/Eccube/Form/Type/Admin/DeliveryType.php ■src/Eccube/Form/Type/Admin/MasterdataDataType.php ■src/Eccube/Form/Type/Admin/OrderDetailType.php ■src/Eccube/Form/Type/Admin/OrderType.php ■src/Eccube/Form/Type/Admin/PaymentRegisterType.php ■src/Eccube/Form/Type/Admin/ProductClassType.php ■src/Eccube/Form/Type/Admin/SearchOrderType.php ■src/Eccube/Form/Type/Admin/ShipmentItemType.php ■src/Eccube/Form/Type/Admin/ShopMasterType.php ■src/Eccube/Form/Type/Install/Step3Type.php ********** src/Eccube/Repository/ ********** ■src/Eccube/Repository/CustomerRepository.php ■src/Eccube/Repository/DeliveryRepository.php ■src/Eccube/Repository/MailTemplateRepository.php ■src/Eccube/Repository/OrderRepository.php ■src/Eccube/Repository/PaymentRepository.php ■src/Eccube/Repository/ProductRepository.php ================================= PostgreSQL9.0以下では、$qb->groupBy(‘p’); に変更する(2箇所) ================================= ——————————— $qb->groupBy(‘p.id’); // ★PostgreSQL9.0以下では、$qb->groupBy(‘p’); に変更する ——————————— ********** src/Eccube/Resource/ ********** ■src/Eccube/Resource/config/config.yml.dist ■src/Eccube/Resource/doctrine/migration/Version20170217184500.php★ ■src/Eccube/Resource/template/admin/change_password.twig ■src/Eccube/Resource/template/admin/Content/block_edit.twig ■src/Eccube/Resource/template/admin/Content/file.twig ■src/Eccube/Resource/template/admin/Content/layout.twig ■src/Eccube/Resource/template/admin/Content/news_edit.twig ■src/Eccube/Resource/template/admin/Content/page_edit.twig ■src/Eccube/Resource/template/admin/Customer/edit.twig ■src/Eccube/Resource/template/admin/Form/form_layout.twig ■src/Eccube/Resource/template/admin/Mail/entry_confirm.twig ■src/Eccube/Resource/template/admin/Mail/order.twig ■src/Eccube/Resource/template/admin/Order/edit.twig ■src/Eccube/Resource/template/admin/Order/search_customer.twig ■src/Eccube/Resource/template/admin/Product/product.twig ■src/Eccube/Resource/template/admin/Setting/Shop/csv.twig ■src/Eccube/Resource/template/admin/Setting/Shop/customer_agreement.twig ■src/Eccube/Resource/template/admin/Setting/Shop/delivery_edit.twig ■src/Eccube/Resource/template/admin/Setting/Shop/tradelaw.twig ■src/Eccube/Resource/template/admin/Setting/System/authority.twig ■src/Eccube/Resource/template/admin/Setting/System/masterdata.twig ■src/Eccube/Resource/template/admin/Setting/System/member_edit.twig ■src/Eccube/Resource/template/admin/Setting/System/security.twig ■src/Eccube/Resource/template/admin/Store/authentication_setting.twig ■src/Eccube/Resource/template/admin/Store/plugin_install.twig ■src/Eccube/Resource/template/admin/Store/template.twig ■src/Eccube/Resource/template/admin/Store/template_add.twig ■src/Eccube/Resource/template/default/Block/free.twig ■src/Eccube/Resource/template/default/Block/garally.twig ■src/Eccube/Resource/template/default/Block/new_product.twig ■src/Eccube/Resource/template/default/Form/form_layout.twig ■src/Eccube/Resource/template/default/Mail/order.twig ■src/Eccube/Resource/template/default/Product/detail.twig ================================= 290行目付近の{% if BaseInfo.option_favorite_product == 1 %}から307行目付近の{% endif %}までを書き換え ================================= ——————————— {#Favorite product button#} {% if BaseInfo.option_favorite_product == 1 %} <ul id=”detail_cart_box__favorite_button” class=”row”> {% if is_favorite == false %} <li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block prevention-btn prevention-mask”>お気に入りに追加</button></li> {% else %} <li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block” disabled=”disabled”>お気に入りに追加済みです</button></li> {% endif %} </ul> {% endif %} </div> {#End div#detail_cart_box__button_area #} {% else %} {# 在庫がない場合は品切れボタンを表示 #} <div id=”detail_cart_box__button_area” class=”btn_area”> <ul class=”row”> <li class=”col-xs-12 col-sm-8″><button type=”button” class=”btn btn-default btn-block” disabled=”disabled”>ただいま品切れ中です</button></li> </ul> {#Favorite product button#} {% if BaseInfo.option_favorite_product == 1 %} <ul id=”detail_cart_box__favorite_button” class=”row”> {% if is_favorite == false %} <li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block prevention-btn prevention-mask”>お気に入りに追加</button></li> {% else %} <li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block” disabled=”disabled”>お気に入りに追加済みです</button></li> {% endif %} </ul> {% endif %} </div> {#End div#detail_cart_box__button_area #} {% endif %} {#End stock find#} ——————————— ■src/Eccube/Resource/template/default/Product/list.twig ■src/Eccube/Resource/template/default/Shopping/index.twig ■src/Eccube/Resource/template/default/Shopping/shipping_edit.twig ■src/Eccube/Resource/template/install/frame.twig ■src/Eccube/Resource/template/install/migration.twig ■src/Eccube/Resource/template/install/migration_frame.twig ■src/Eccube/Resource/template/install/migration_plugin.twig ■src/Eccube/Resource/template/install/step1.twig ■src/Eccube/Resource/template/install/step2.twig ■src/Eccube/Resource/template/install/step3.twig ■src/Eccube/Resource/template/install/step4.twig ■src/Eccube/Resource/template/install/step5.twig ********** src/Eccube/Service/ ********** ■src/Eccube/Service/CartService.php ■src/Eccube/Service/MailService.php ■src/Eccube/Service/ShoppingService.php ********** src/Eccube/ServiceProvider/ ********** ■src/Eccube/ServiceProvider/DebugServiceProvider.php ■src/Eccube/ServiceProvider/EccubeServiceProvider.php
3.0.13のファイルに対して、修正が行われているファイルは次の通りです。
(vendorフォルダ以外)
★は、新規追加
▲は、3.0.14では不要
********** 直下ファイル **********
■.htaccess.sample
■composer.json
■composer.lock
■eccube_install.sh
■phpunit.xml.dist
********** app **********
■app/console
********** html **********
■html/.htaccess
———————————
URLから「html」を除いて運用している場合は、1つ上の階層に移動。
その際、1つの上の階層の[.htaccess]を上書き。
———————————
■html/template/admin/assets/css/dashboard.css
■html/template/admin/assets/js/function.js
■html/template/default/css/style.css
①
=================================
/* MyPage
——————————————- */
の最後に追加されている(2063行目付近)
=================================
↓(2072行目付近に追加)
———————————
#delivery_address_list div.is-edit {
position: relative;
}
———————————
②
=================================
/****** Effect Setting ********/ に追加されている(3257行目付近)
=================================
↓(3266行目付近に追加)
———————————
/* My page address */
#delivery_address_list div.is-edit p.btn_edit {
top: 30%;
}
———————————
③
=================================
/* MyPage
——————————————- */
の最後に追加されている(4338行目付近)
=================================
↓(4375行目付近に追加)
———————————
/* My page address */
#delivery_address_list div.is-edit p.btn_edit {
top: 30%;
}
———————————
■html/template/install/assets/img/svg.html
■html/template/install/assets/js/function.js
■html/template/install/assets/js/vendor★
********** src/Eccube/ **********
■src/Eccube/Application.php
********** src/Eccube/Command/ **********
■src/Eccube/Command/PluginCommand.php
■src/Eccube/Command/GeneratorCommand★
■src/Eccube/Command/PluginCommand▲
********** src/Eccube/Common/ **********
■src/Eccube/Common/Constant.php
********** src/Eccube/Controller/ **********
■src/Eccube/Controller/ShoppingController.php
■src/Eccube/Controller/Admin/AdminController.php
■src/Eccube/Controller/Admin/Content/FileController.php
■src/Eccube/Controller/Admin/Customer/CustomerController.php
■src/Eccube/Controller/Admin/Order/EditController.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/ProductController.php
■src/Eccube/Controller/Admin/Setting/Shop/ShopController.php
■src/Eccube/Controller/Admin/Store/PluginController.php
■src/Eccube/Controller/Admin/Store/TemplateController.php
■src/Eccube/Controller/Block/CartController.php
■src/Eccube/Controller/Install/InstallController.php
********** src/Eccube/Doctrine/ **********
■src/Eccube/Doctrine/ORM/Query/Normalize.php
********** src/Eccube/Entity/ **********
■src/Eccube/Entity/Customer.php
■src/Eccube/Entity/ExportCsvRow.php★
■src/Eccube/Entity/Shipping.php
********** src/Eccube/Event/ **********
■src/Eccube/Event/EccubeEvents.php
********** src/Eccube/Form/ **********
■src/Eccube/Form/Type/PriceType.php
■src/Eccube/Form/Type/ShippingMultipleItemType.php
■src/Eccube/Form/Type/ShippingMultipleType.php
■src/Eccube/Form/Type/Admin/DeliveryType.php
■src/Eccube/Form/Type/Admin/MasterdataDataType.php
■src/Eccube/Form/Type/Admin/OrderDetailType.php
■src/Eccube/Form/Type/Admin/OrderType.php
■src/Eccube/Form/Type/Admin/PaymentRegisterType.php
■src/Eccube/Form/Type/Admin/ProductClassType.php
■src/Eccube/Form/Type/Admin/SearchOrderType.php
■src/Eccube/Form/Type/Admin/ShipmentItemType.php
■src/Eccube/Form/Type/Admin/ShopMasterType.php
■src/Eccube/Form/Type/Install/Step3Type.php
********** src/Eccube/Repository/ **********
■src/Eccube/Repository/CustomerRepository.php
■src/Eccube/Repository/DeliveryRepository.php
■src/Eccube/Repository/MailTemplateRepository.php
■src/Eccube/Repository/OrderRepository.php
■src/Eccube/Repository/PaymentRepository.php
■src/Eccube/Repository/ProductRepository.php
=================================
PostgreSQL9.0以下では、$qb->groupBy(‘p’); に変更する(2箇所)
=================================
———————————
$qb->groupBy(‘p.id’); // ★PostgreSQL9.0以下では、$qb->groupBy(‘p’); に変更する
———————————
********** src/Eccube/Resource/ **********
■src/Eccube/Resource/config/config.yml.dist
■src/Eccube/Resource/doctrine/migration/Version20170217184500.php★
■src/Eccube/Resource/template/admin/change_password.twig
■src/Eccube/Resource/template/admin/Content/block_edit.twig
■src/Eccube/Resource/template/admin/Content/file.twig
■src/Eccube/Resource/template/admin/Content/layout.twig
■src/Eccube/Resource/template/admin/Content/news_edit.twig
■src/Eccube/Resource/template/admin/Content/page_edit.twig
■src/Eccube/Resource/template/admin/Customer/edit.twig
■src/Eccube/Resource/template/admin/Form/form_layout.twig
■src/Eccube/Resource/template/admin/Mail/entry_confirm.twig
■src/Eccube/Resource/template/admin/Mail/order.twig
■src/Eccube/Resource/template/admin/Order/edit.twig
■src/Eccube/Resource/template/admin/Order/search_customer.twig
■src/Eccube/Resource/template/admin/Product/product.twig
■src/Eccube/Resource/template/admin/Setting/Shop/csv.twig
■src/Eccube/Resource/template/admin/Setting/Shop/customer_agreement.twig
■src/Eccube/Resource/template/admin/Setting/Shop/delivery_edit.twig
■src/Eccube/Resource/template/admin/Setting/Shop/tradelaw.twig
■src/Eccube/Resource/template/admin/Setting/System/authority.twig
■src/Eccube/Resource/template/admin/Setting/System/masterdata.twig
■src/Eccube/Resource/template/admin/Setting/System/member_edit.twig
■src/Eccube/Resource/template/admin/Setting/System/security.twig
■src/Eccube/Resource/template/admin/Store/authentication_setting.twig
■src/Eccube/Resource/template/admin/Store/plugin_install.twig
■src/Eccube/Resource/template/admin/Store/template.twig
■src/Eccube/Resource/template/admin/Store/template_add.twig
■src/Eccube/Resource/template/default/Block/free.twig
■src/Eccube/Resource/template/default/Block/garally.twig
■src/Eccube/Resource/template/default/Block/new_product.twig
■src/Eccube/Resource/template/default/Form/form_layout.twig
■src/Eccube/Resource/template/default/Mail/order.twig
■src/Eccube/Resource/template/default/Product/detail.twig
=================================
290行目付近の{% if BaseInfo.option_favorite_product == 1 %}から307行目付近の{% endif %}までを書き換え
=================================
———————————
{#Favorite product button#}
{% if BaseInfo.option_favorite_product == 1 %}
<ul id=”detail_cart_box__favorite_button” class=”row”>
{% if is_favorite == false %}
<li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block prevention-btn prevention-mask”>お気に入りに追加</button></li>
{% else %}
<li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block” disabled=”disabled”>お気に入りに追加済みです</button></li>
{% endif %}
</ul>
{% endif %}
</div> {#End div#detail_cart_box__button_area #}
{% else %}
{# 在庫がない場合は品切れボタンを表示 #}
<div id=”detail_cart_box__button_area” class=”btn_area”>
<ul class=”row”>
<li class=”col-xs-12 col-sm-8″><button type=”button” class=”btn btn-default btn-block” disabled=”disabled”>ただいま品切れ中です</button></li>
</ul>
{#Favorite product button#}
{% if BaseInfo.option_favorite_product == 1 %}
<ul id=”detail_cart_box__favorite_button” class=”row”>
{% if is_favorite == false %}
<li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block prevention-btn prevention-mask”>お気に入りに追加</button></li>
{% else %}
<li class=”col-xs-12 col-sm-8″><button type=”submit” id=”favorite” class=”btn btn-info btn-block” disabled=”disabled”>お気に入りに追加済みです</button></li>
{% endif %}
</ul>
{% endif %}
</div> {#End div#detail_cart_box__button_area #}
{% endif %} {#End stock find#}
———————————
■src/Eccube/Resource/template/default/Product/list.twig
■src/Eccube/Resource/template/default/Shopping/index.twig
■src/Eccube/Resource/template/default/Shopping/shipping_edit.twig
■src/Eccube/Resource/template/install/frame.twig
■src/Eccube/Resource/template/install/migration.twig
■src/Eccube/Resource/template/install/migration_frame.twig
■src/Eccube/Resource/template/install/migration_plugin.twig
■src/Eccube/Resource/template/install/step1.twig
■src/Eccube/Resource/template/install/step2.twig
■src/Eccube/Resource/template/install/step3.twig
■src/Eccube/Resource/template/install/step4.twig
■src/Eccube/Resource/template/install/step5.twig
********** src/Eccube/Service/ **********
■src/Eccube/Service/CartService.php
■src/Eccube/Service/MailService.php
■src/Eccube/Service/ShoppingService.php
********** src/Eccube/ServiceProvider/ **********
■src/Eccube/ServiceProvider/DebugServiceProvider.php
■src/Eccube/ServiceProvider/EccubeServiceProvider.php