From 5dcf7d71bb5ea9a9daf8396192ca394e384d0ae3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:09:14 +0000 Subject: [PATCH 01/44] Bump @typescript-eslint/parser from 5.55.0 to 5.62.0 Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.55.0 to 5.62.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 58 ++++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index b197654df8..650f05bd7d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@types/faker": "^6.6.9", "@types/tar": "^6.1.4", "@typescript-eslint/eslint-plugin": "^5.48.0", - "@typescript-eslint/parser": "^5.55.0", + "@typescript-eslint/parser": "^5.62.0", "babel-eslint": "^10.0.3", "babel-loader": "^8.2.5", "browser-sync-webpack-plugin": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 59d3b404d6..a8eb50c9b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1147,14 +1147,14 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.55.0.tgz#8c96a0b6529708ace1dcfa60f5e6aec0f5ed2262" - integrity sha512-ppvmeF7hvdhUUZWSd2EEWfzcFkjJzgNQzVST22nzg958CR+sphy8A6K7LXQZd6V75m1VKjp+J4g/PCEfSCmzhw== - dependencies: - "@typescript-eslint/scope-manager" "5.55.0" - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/typescript-estree" "5.55.0" +"@typescript-eslint/parser@^5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" + integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== + dependencies: + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/typescript-estree" "5.62.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.48.0": @@ -1165,13 +1165,13 @@ "@typescript-eslint/types" "5.48.0" "@typescript-eslint/visitor-keys" "5.48.0" -"@typescript-eslint/scope-manager@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210" - integrity sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw== +"@typescript-eslint/scope-manager@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" + integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== dependencies: - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/visitor-keys" "5.55.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" "@typescript-eslint/type-utils@5.48.0": version "5.48.0" @@ -1188,10 +1188,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.0.tgz#d725da8dfcff320aab2ac6f65c97b0df30058449" integrity sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw== -"@typescript-eslint/types@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd" - integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug== +"@typescript-eslint/types@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" + integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== "@typescript-eslint/typescript-estree@5.48.0": version "5.48.0" @@ -1206,13 +1206,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz#8db7c8e47ecc03d49b05362b8db6f1345ee7b575" - integrity sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ== +"@typescript-eslint/typescript-estree@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" + integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== dependencies: - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/visitor-keys" "5.55.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -1241,12 +1241,12 @@ "@typescript-eslint/types" "5.48.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2" - integrity sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw== +"@typescript-eslint/visitor-keys@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" + integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== dependencies: - "@typescript-eslint/types" "5.55.0" + "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.11.1": From 28af2485adf2ff6cf0440e2ef787ece02de18e5a Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sat, 2 Sep 2023 00:44:21 +0900 Subject: [PATCH 02/44] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9C=E3=82=A4?= =?UTF-8?q?=E3=82=B9=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 納品書を4.2系と同様にインボイス準拠するよう対応 - 受注完了メールの「うち消費税」の表記を削除(暫定) --- .../default/mail_templates/order_mail.tpl | 2 +- .../mobile/mail_templates/order_mail.tpl | 2 +- data/class/SC_Fpdf.php | 37 ++++++++++++++++++- data/class/helper/SC_Helper_TaxRule.php | 22 +++++++++++ 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/data/Smarty/templates/default/mail_templates/order_mail.tpl b/data/Smarty/templates/default/mail_templates/order_mail.tpl index b58cd99a86..5d9d58ae6e 100644 --- a/data/Smarty/templates/default/mail_templates/order_mail.tpl +++ b/data/Smarty/templates/default/mail_templates/order_mail.tpl @@ -56,7 +56,7 @@ ------------------------------------------------- -小　計 ￥ (うち消費税 ￥) +小　計 ￥ 値引き ￥ diff --git a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl index 84de76be3d..ef2806f60a 100644 --- a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl +++ b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl @@ -49,7 +49,7 @@ -小　計 ￥ (うち消費税 ￥) +小　計 ￥ 値引き ￥ diff --git a/data/class/SC_Fpdf.php b/data/class/SC_Fpdf.php index 9a2b57af16..886c328372 100644 --- a/data/class/SC_Fpdf.php +++ b/data/class/SC_Fpdf.php @@ -155,6 +155,11 @@ private function setShopData() //ロゴ画像 $logo_file = PDF_TEMPLATE_REALDIR . 'logo.png'; $this->Image($logo_file, 124, 46, 40); + + if (defined('INVOICE_REGISTRATION_NUM')) { + $text = '登録番号: '.INVOICE_REGISTRATION_NUM; + $this->lfText(125, 87, $text, 8); + } } private function setMessageData() @@ -228,6 +233,8 @@ private function setOrderData() $monetary_unit = '円'; $point_unit = 'Pt'; + $arrTaxableTotal = []; + $defaultTaxRule = SC_Helper_TaxRule_Ex::getTaxRule(); // 購入商品情報 for ($i = 0; $i < count($this->arrDisp['quantity']); $i++) { // 購入数量 @@ -249,9 +256,18 @@ private function setOrderData() $arrOrder[$i][0] .= ' * '.$this->arrDisp['classcategory_name2'][$i].' ]'; } } + + // 標準税率より低い税率は軽減税率として※を付与 + if ($this->arrDisp['tax_rate'][$i] < $defaultTaxRule['tax_rate']) { + $arrOrder[$i][0] .= ' ※'; + } $arrOrder[$i][1] = number_format($data[0]); $arrOrder[$i][2] = number_format($data[1]).$monetary_unit; $arrOrder[$i][3] = number_format($data[2]).$monetary_unit; + if (array_key_exists($this->arrDisp['tax_rate'][$i], $arrTaxableTotal) === false) { + $arrTaxableTotal[$this->arrDisp['tax_rate'][$i]] = 0; + } + $arrTaxableTotal[$this->arrDisp['tax_rate'][$i]] += $data[2]; } $arrOrder[$i][0] = ''; @@ -270,18 +286,21 @@ private function setOrderData() $arrOrder[$i][1] = ''; $arrOrder[$i][2] = '送料'; $arrOrder[$i][3] = number_format($this->arrDisp['deliv_fee']).$monetary_unit; + $arrTaxableTotal[intval($defaultTaxRule['tax_rate'])] += $this->arrDisp['deliv_fee']; $i++; $arrOrder[$i][0] = ''; $arrOrder[$i][1] = ''; $arrOrder[$i][2] = '手数料'; $arrOrder[$i][3] = number_format($this->arrDisp['charge']).$monetary_unit; + $arrTaxableTotal[intval($defaultTaxRule['tax_rate'])] += $this->arrDisp['charge']; $i++; $arrOrder[$i][0] = ''; $arrOrder[$i][1] = ''; $arrOrder[$i][2] = '値引き'; - $arrOrder[$i][3] = '- '.number_format(($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount']).$monetary_unit; + $discount_total = ($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount']; + $arrOrder[$i][3] = '- '.number_format($discount_total).$monetary_unit; $i++; $arrOrder[$i][0] = ''; @@ -311,6 +330,22 @@ private function setOrderData() } $this->FancyTable($this->label_cell, $arrOrder, $this->width_cell); + + $this->SetLineWidth(.3); + $this->SetFont('SJIS', '', 6); + + $this->Cell(0, 0, '', 0, 1, 'C', 0, ''); + // 行頭近くの場合、表示崩れがあるためもう一個字下げする + if (270 <= $this->GetY()) { + $this->Cell(0, 0, '', 0, 1, 'C', 0, ''); + } + $width = array_reduce($this->width_cell, function ($n, $w) { + return $n + $w; + }); + $this->SetX(20); + + $message = SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total); + $this->MultiCell($width, 4, $message, 0, 'R', 0, ''); } /** diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index d01b50b54f..d707e5775f 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -62,6 +62,28 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr return SC_Helper_TaxRule_Ex::calcTax($price, $arrTaxRule['tax_rate'], $arrTaxRule['tax_rule'], $arrTaxRule['tax_adjust']); } + /** + * 消費税の内訳を返す. + * + * 値引額合計は税率ごとに按分する. + * + * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額 + * @param int $discount_total 値引額合計 + */ + public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string + { + ksort($arrTaxableTotal); + $tax = []; + $taxable_total = array_sum($arrTaxableTotal); + $result = ''; + foreach ($arrTaxableTotal as $rate => $total) { + $tax = round(($total - $discount_total * $total / array_sum($arrTaxableTotal)) * ($rate / (100 + $rate))); + $result .= '('.$rate.'%対象: '.number_format(round($total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL; + } + + return $result; + } + /** * 設定情報IDに基づいて税金付与した金額を返す * (受注データのようにルールが決まっている場合用) From 1077a191fdbc56dcb58dd43a060c35c9cf2bfa70 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 3 Sep 2023 23:00:38 +0900 Subject: [PATCH 03/44] Fix reduced total --- data/class/helper/SC_Helper_TaxRule.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index d707e5775f..9ca5d95fc2 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -77,8 +77,9 @@ public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): stri $taxable_total = array_sum($arrTaxableTotal); $result = ''; foreach ($arrTaxableTotal as $rate => $total) { - $tax = round(($total - $discount_total * $total / array_sum($arrTaxableTotal)) * ($rate / (100 + $rate))); - $result .= '('.$rate.'%対象: '.number_format(round($total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL; + $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal); + $tax = round($reduced_total * ($rate / (100 + $rate))); + $result .= '('.$rate.'%対象: '.number_format(round($reduced_total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL; } return $result; From 9fde0f29659f42fac53f3ef5b31cc0a8a3225c62 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sat, 9 Sep 2023 01:21:54 +0900 Subject: [PATCH 04/44] =?UTF-8?q?=E7=A8=8E=E9=A1=8D=E9=9B=86=E8=A8=88?= =?UTF-8?q?=E3=81=A8=E5=86=85=E8=A8=B3=E5=87=BA=E5=8A=9B=E3=81=AE=E3=83=A1?= =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/helper/SC_Helper_TaxRule.php | 38 ++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 9ca5d95fc2..206d6d34cd 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -65,21 +65,51 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr /** * 消費税の内訳を返す. * + * 税率ごとに以下のような連想配列を返す. + * - total: 値引後の税込み合計金額 + * - tax: 値引後の税額 * 値引額合計は税率ごとに按分する. + * 課税規則は標準税率の設定を使用する. * * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額 * @param int $discount_total 値引額合計 + * @return array{8?:array{total:int,tax:int}, 10?:array{total:int,tax:int}} */ - public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string + public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array { + $arrDefaultTaxRule = static::getTaxRule(); + ksort($arrTaxableTotal); $tax = []; $taxable_total = array_sum($arrTaxableTotal); - $result = ''; + $result = []; foreach ($arrTaxableTotal as $rate => $total) { $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal); - $tax = round($reduced_total * ($rate / (100 + $rate))); - $result .= '('.$rate.'%対象: '.number_format(round($reduced_total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL; + $tax = $reduced_total * ($rate / (100 + $rate)); + $result[$rate] = [ + 'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])), + 'tax' => intval(static::roundByCalcRule($tax, $arrDefaultTaxRule['calc_rule'])), + ]; + } + + return $result; + } + + /** + * 消費税の内訳の文字列を返す. + * + * 複数の税率がある場合は改行で区切る. + * + * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額 + * @param int $discount_total 値引額合計 + * @return string (<税率>%対象: <値引後税込合計>円 内消費税: <値引後税額>円) + */ + public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string + { + $arrTaxPerTaxRate = static::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + $result = ''; + foreach ($arrTaxPerTaxRate as $rate => $item) { + $result .= '('.$rate .'%対象: '. number_format($item['total']).'円 内消費税: '.number_format($item['tax']).'円)'.PHP_EOL; } return $result; From 70717b99b71d54a4461fa184bd810ca937b80b49 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sat, 9 Sep 2023 01:22:48 +0900 Subject: [PATCH 05/44] Add unit test --- data/class/helper/SC_Helper_TaxRule.php | 4 +- .../SC_Helper_TaxRule_TestBase.php | 2 +- .../SC_Helper_TaxRule_getTaxDetailTest.php | 159 ++++++++++++++++++ 3 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 206d6d34cd..44ca75158b 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -75,7 +75,7 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr * @param int $discount_total 値引額合計 * @return array{8?:array{total:int,tax:int}, 10?:array{total:int,tax:int}} */ - public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array + public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total = 0) { $arrDefaultTaxRule = static::getTaxRule(); @@ -104,7 +104,7 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_to * @param int $discount_total 値引額合計 * @return string (<税率>%対象: <値引後税込合計>円 内消費税: <値引後税額>円) */ - public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string + public static function getTaxDetail($arrTaxableTotal, $discount_total = 0) { $arrTaxPerTaxRate = static::getTaxPerTaxRate($arrTaxableTotal, $discount_total); $result = ''; diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php index a721eaf5ed..22691105d3 100644 --- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php @@ -28,7 +28,7 @@ * @author Nobuhiko Kimoto * @version $Id$ */ -class SC_Helper_TaxRule_TestBase extends Common_TestCase +abstract class SC_Helper_TaxRule_TestBase extends Common_TestCase { /** diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php new file mode 100644 index 0000000000..1f67e12aa7 --- /dev/null +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php @@ -0,0 +1,159 @@ +setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '1', + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 724431, + 8 => 65756, + ]; + $discount_total = 7159; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'total' => 65160, + 'tax' => 4827 + ], + 10 => [ + 'total' => 717868, + 'tax' => 65261 + ] + ], + $actual + ); + + self::assertSame( + '(8%対象: 65,160円 内消費税: 4,827円)'.PHP_EOL. + '(10%対象: 717,868円 内消費税: 65,261円)'.PHP_EOL, + SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total) + ); + } + + /** + * @runInSeparateProcess + * @preserveGlobalState disabled + */ + public function testGetTaxPerTaxRateWithFloor() + { + self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly'); + + $this->setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '2', // floor + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 724431, + 8 => 65756, + ]; + $discount_total = 7159; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'total' => 65160, + 'tax' => 4826 + ], + 10 => [ + 'total' => 717867, + 'tax' => 65260 + ] + ], + $actual + ); + } + + /** + * @runInSeparateProcess + * @preserveGlobalState disabled + */ + public function testGetTaxPerTaxRateWithCeil() + { + self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly'); + + $this->setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '3', // ceil + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 724431, + 8 => 65756, + ]; + $discount_total = 7159; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'total' => 65161, + 'tax' => 4827 + ], + 10 => [ + 'total' => 717868, + 'tax' => 65261 + ] + ], + $actual + ); + } + + protected function setUpTaxRule(array $taxs = []) + { + $this->objQuery->delete('dtb_tax_rule'); + foreach ($taxs as $key => $item) { + $this->objQuery->insert('dtb_tax_rule', $item); + } + } +} From c654b7037081deb0f40d0ac78eeb5ac8d0b45b67 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 13 Sep 2023 22:41:03 +0900 Subject: [PATCH 06/44] =?UTF-8?q?debian-stretch=20=E3=81=8C=20archive=20?= =?UTF-8?q?=E3=81=B8=E7=A7=BB=E5=8B=95=E3=81=97=E3=81=9F=E3=81=9F=E3=82=81?= =?UTF-8?q?=20sources.list=20=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit archive.debian.org は遅いので cloudfront の mirror を使用する --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3c902a30f7..3e27089bac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,10 @@ ARG FORCE_YES="--force-yes" RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi +RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list +RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list + # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev # ext-pgsql: libpq-dev # ext-zip: libzip-dev zlib1g-dev From 4a12b8bbbb209e795362f0a30ef51e503ec0d3ae Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sat, 16 Sep 2023 23:19:27 +0900 Subject: [PATCH 07/44] Add PHP8.2 --- .github/workflows/dockerbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index e6cdd862bc..0bc9876d2f 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] steps: - name: downcase REPO From b13489369bf3448b40ddd8df4bdeafe99677497b Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 17 Sep 2023 02:20:21 +0900 Subject: [PATCH 08/44] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 14 +++++++++++--- .github/workflows/e2e-tests.yml | 16 ++++++++++++++-- Dockerfile | 17 +++++++++++------ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index e6cdd862bc..cfccdb5d3a 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -32,14 +32,22 @@ jobs: run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} - echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=" >> ${GITHUB_ENV} echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 7.0 }} + run: | + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f12c5d3442..ffd5659be2 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -109,22 +109,34 @@ jobs: run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 7.0 }} + run: | + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.4 }} run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} - name: Checkout uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 3e27089bac..a5b6a7c8b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,19 @@ FROM php:${TAG} ARG GD_OPTIONS="--with-freetype --with-jpeg" ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache" ARG APCU="apcu" -ARG FORCE_YES="--force-yes" +ARG FORCE_YES="" +ARG APT_REPO="deb.debian.org" +ARG APT_SECURITY_REPO="security.debian.org" + # See https://github.com/debuerreotype/debuerreotype/issues/10 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi -RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list -RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list -RUN sed -i '/stretch-updates/d' /etc/apt/sources.list +RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list; +RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list; +RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list # for stretch +RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # for jessie # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev # ext-pgsql: libpq-dev @@ -31,7 +36,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS} -RUN pecl install ${APCU} && docker-php-ext-enable apcu +RUN if [[ ${APCU} ]]; then pecl install ${APCU} && docker-php-ext-enable apcu; fi # composer COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer @@ -68,4 +73,4 @@ COPY composer.lock ${ECCUBE_PREFIX}/composer.lock RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX} COPY . ${ECCUBE_PREFIX} -RUN composer dumpautoload -o --apcu +RUN composer dumpautoload -o From 9e56bdfa17921408f9b07f3e468be0433217215b Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 17 Sep 2023 02:20:21 +0900 Subject: [PATCH 09/44] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 26 ++++++++++++++++++++++---- .github/workflows/e2e-tests.yml | 28 ++++++++++++++++++++++++---- Dockerfile | 17 +++++++++++------ 3 files changed, 57 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index e6cdd862bc..9b07fcb0fe 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -32,26 +32,42 @@ jobs: run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} - echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=" >> ${GITHUB_ENV} echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} - - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 7.0 }} + run: | + echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} + echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} + echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.4 }} run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - name: Checkout uses: actions/checkout@v3 @@ -97,6 +113,8 @@ jobs: GD_OPTIONS=${{ env.GD_OPTIONS }} EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} APCU=${{ env.APCU }} + APT_REPO=${{ env.APT_REPO }} + APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} - name: Setup to EC-CUBE env: diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f12c5d3442..27ad0e76c6 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -109,22 +109,42 @@ jobs: run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} - - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} + echo "APCU=" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 7.0 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }} + run: | + echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} + echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} + echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.4 }} run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - name: Checkout uses: actions/checkout@v3 @@ -142,7 +162,7 @@ jobs: sudo chown -R 1001:1000 zap sudo chmod -R g+w zap sh -c 'echo "> data/config/config.php' - docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU}" . + docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU} APT_REPO=${{ env.APT_REPO }} APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}" . docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache TAG=${PHP_VERSION_TAG}-apache docker-compose up -d diff --git a/Dockerfile b/Dockerfile index 3e27089bac..a5b6a7c8b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,19 @@ FROM php:${TAG} ARG GD_OPTIONS="--with-freetype --with-jpeg" ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache" ARG APCU="apcu" -ARG FORCE_YES="--force-yes" +ARG FORCE_YES="" +ARG APT_REPO="deb.debian.org" +ARG APT_SECURITY_REPO="security.debian.org" + # See https://github.com/debuerreotype/debuerreotype/issues/10 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi -RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list -RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list -RUN sed -i '/stretch-updates/d' /etc/apt/sources.list +RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list; +RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list; +RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list # for stretch +RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # for jessie # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev # ext-pgsql: libpq-dev @@ -31,7 +36,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS} -RUN pecl install ${APCU} && docker-php-ext-enable apcu +RUN if [[ ${APCU} ]]; then pecl install ${APCU} && docker-php-ext-enable apcu; fi # composer COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer @@ -68,4 +73,4 @@ COPY composer.lock ${ECCUBE_PREFIX}/composer.lock RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX} COPY . ${ECCUBE_PREFIX} -RUN composer dumpautoload -o --apcu +RUN composer dumpautoload -o From 0945ae107870fe1ac263c5e2d88953e0c0e945d6 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 17 Sep 2023 02:20:21 +0900 Subject: [PATCH 10/44] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 28 +++++++++++++++++++++++----- .github/workflows/e2e-tests.yml | 30 +++++++++++++++++++++++++----- Dockerfile | 17 +++++++++++------ 3 files changed, 59 insertions(+), 16 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index e6cdd862bc..dd585f1ea7 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] steps: - name: downcase REPO @@ -32,26 +32,42 @@ jobs: run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} - echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=" >> ${GITHUB_ENV} echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} - - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 7.0 }} + run: | + echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} + echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} + echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.4 }} run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - name: Checkout uses: actions/checkout@v3 @@ -97,6 +113,8 @@ jobs: GD_OPTIONS=${{ env.GD_OPTIONS }} EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} APCU=${{ env.APCU }} + APT_REPO=${{ env.APT_REPO }} + APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} - name: Setup to EC-CUBE env: diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f12c5d3442..916cd69865 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -89,7 +89,7 @@ jobs: fail-fast: false matrix: db: [ 'pgsql', 'mysql' ] - php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] include: - db: mysql dbport: '3306' @@ -109,22 +109,42 @@ jobs: run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} - echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV} - - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }} + echo "APCU=" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 7.0 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }} + run: | + echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} + echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} + echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.4 }} run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} + echo "FORCE_YES=" >> ${GITHUB_ENV} + echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV} - name: Checkout uses: actions/checkout@v3 @@ -142,7 +162,7 @@ jobs: sudo chown -R 1001:1000 zap sudo chmod -R g+w zap sh -c 'echo "> data/config/config.php' - docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU}" . + docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU} APT_REPO=${{ env.APT_REPO }} APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}" . docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache TAG=${PHP_VERSION_TAG}-apache docker-compose up -d diff --git a/Dockerfile b/Dockerfile index 3e27089bac..a5b6a7c8b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,19 @@ FROM php:${TAG} ARG GD_OPTIONS="--with-freetype --with-jpeg" ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache" ARG APCU="apcu" -ARG FORCE_YES="--force-yes" +ARG FORCE_YES="" +ARG APT_REPO="deb.debian.org" +ARG APT_SECURITY_REPO="security.debian.org" + # See https://github.com/debuerreotype/debuerreotype/issues/10 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi -RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list -RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list -RUN sed -i '/stretch-updates/d' /etc/apt/sources.list +RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list; +RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list; +RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list # for stretch +RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # for jessie # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev # ext-pgsql: libpq-dev @@ -31,7 +36,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS} -RUN pecl install ${APCU} && docker-php-ext-enable apcu +RUN if [[ ${APCU} ]]; then pecl install ${APCU} && docker-php-ext-enable apcu; fi # composer COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer @@ -68,4 +73,4 @@ COPY composer.lock ${ECCUBE_PREFIX}/composer.lock RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX} COPY . ${ECCUBE_PREFIX} -RUN composer dumpautoload -o --apcu +RUN composer dumpautoload -o From 988f46c4c761268f47b2a65d7dc88de49e7ceeda Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 20 Sep 2023 00:06:16 +0900 Subject: [PATCH 11/44] Fix Division by zero on PHP8.0+ --- data/class/helper/SC_Helper_TaxRule.php | 5 ++- .../SC_Helper_TaxRule_getTaxDetailTest.php | 45 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 44ca75158b..309c5e2f5f 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -84,7 +84,10 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total $taxable_total = array_sum($arrTaxableTotal); $result = []; foreach ($arrTaxableTotal as $rate => $total) { - $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal); + if ($taxable_total > 0) { + $reduced_total = $total - $discount_total * $total / $taxable_total; + } + $tax = $reduced_total * ($rate / (100 + $rate)); $result[$rate] = [ 'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])), diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php index 1f67e12aa7..d0e9112b3a 100644 --- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php @@ -59,6 +59,51 @@ public function testGetTaxPerTaxRateWithRound() ); } + public function testGetTaxPerTaxRateWithZero() + { + $this->setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '1', + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 0, + 8 => 0, + ]; + $discount_total = 0; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'total' => 0, + 'tax' => 0 + ], + 10 => [ + 'total' => 0, + 'tax' => 0 + ] + ], + $actual + ); + + self::assertSame( + '(8%対象: 0円 内消費税: 0円)'.PHP_EOL. + '(10%対象: 0円 内消費税: 0円)'.PHP_EOL, + SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total) + ); + } + /** * @runInSeparateProcess * @preserveGlobalState disabled From f2e5f74e051eb66711b17647e47480d63a7d5054 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 19 Oct 2023 22:00:29 +0900 Subject: [PATCH 12/44] =?UTF-8?q?=E3=82=AB=E3=83=B3=E3=83=9E=E5=8C=BA?= =?UTF-8?q?=E5=88=87=E3=82=8A=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=80=82?= =?UTF-8?q?=E8=AA=A4=E3=81=A3=E3=81=9F=E5=80=A4=E5=BC=95=E3=81=8D=E9=A1=8D?= =?UTF-8?q?=E3=81=8C=E5=87=BA=E5=8A=9B=E3=81=95=E3=82=8C=E3=82=8B=E3=80=82?= =?UTF-8?q?=20#780?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/Smarty/templates/default/cart/index.tpl | 2 +- data/Smarty/templates/default/mail_templates/order_mail.tpl | 4 ++-- data/Smarty/templates/mobile/cart/index.tpl | 2 +- data/Smarty/templates/mobile/mail_templates/order_mail.tpl | 4 ++-- data/Smarty/templates/sphone/cart/index.tpl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/Smarty/templates/default/cart/index.tpl b/data/Smarty/templates/default/cart/index.tpl index 657b889f90..dc18013678 100644 --- a/data/Smarty/templates/default/cart/index.tpl +++ b/data/Smarty/templates/default/cart/index.tpl @@ -136,7 +136,7 @@ 合計 - 円 + 円 diff --git a/data/Smarty/templates/default/mail_templates/order_mail.tpl b/data/Smarty/templates/default/mail_templates/order_mail.tpl index b58cd99a86..08a2416735 100644 --- a/data/Smarty/templates/default/mail_templates/order_mail.tpl +++ b/data/Smarty/templates/default/mail_templates/order_mail.tpl @@ -58,8 +58,8 @@ ------------------------------------------------- 小　計 ￥ (うち消費税 ￥) - -値引き ￥ + +値引き ￥ 送　料 ￥ 手数料 ￥ diff --git a/data/Smarty/templates/mobile/cart/index.tpl b/data/Smarty/templates/mobile/cart/index.tpl index 366c63be08..f69b09017b 100644 --- a/data/Smarty/templates/mobile/cart/index.tpl +++ b/data/Smarty/templates/mobile/cart/index.tpl @@ -72,7 +72,7 @@
- 合計:円
+ 合計:円
diff --git a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl index 84de76be3d..3c042f9d5c 100644 --- a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl +++ b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl @@ -51,8 +51,8 @@ 小　計 ￥ (うち消費税 ￥) - -値引き ￥ + +値引き ￥ 送　料 ￥ 手数料 ￥ diff --git a/data/Smarty/templates/sphone/cart/index.tpl b/data/Smarty/templates/sphone/cart/index.tpl index 6d6859ebb4..349ccac4dd 100644 --- a/data/Smarty/templates/sphone/cart/index.tpl +++ b/data/Smarty/templates/sphone/cart/index.tpl @@ -137,7 +137,7 @@
-
合計： 円
+
合計： 円
お誕生月ポイント： Pt
From e332637fa75d4552d0ab589195bf0cced68ab3e9 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 20 Dec 2023 18:56:59 +0900 Subject: [PATCH 13/44] CSS #783 #784 (PC) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CSS Nesting Module を使った実装 #783 - CSS ファイルをまとめる #784 ``` cat \ html/user_data/packages/default/css/reset.css \ html/user_data/packages/default/css/common.css \ html/user_data/packages/default/css/contents.css \ html/user_data/packages/default/css/table.css \ html/user_data/packages/default/css/bloc.css \ html/user_data/packages/default/css/bloc_alpha.css \ html/user_data/packages/default/css/popup.css \ html/user_data/packages/default/css/print.css \ | sass-convert --indent=4 --from=css --to=scss \ > html/user_data/packages/default/style.css ``` --- .../Smarty/templates/default/popup_header.tpl | 2 +- data/Smarty/templates/default/site_frame.tpl | 2 +- html/user_data/packages/default/css/bloc.css | 421 ---- .../packages/default/css/bloc_alpha.css | 88 - .../user_data/packages/default/css/common.css | 414 ---- .../packages/default/css/contents.css | 731 ------ .../user_data/packages/default/css/import.css | 14 - html/user_data/packages/default/css/popup.css | 111 - html/user_data/packages/default/css/print.css | 11 - html/user_data/packages/default/css/reset.css | 99 - html/user_data/packages/default/css/table.css | 73 - html/user_data/packages/default/style.css | 2148 +++++++++++++++++ 12 files changed, 2150 insertions(+), 1964 deletions(-) delete mode 100644 html/user_data/packages/default/css/bloc.css delete mode 100644 html/user_data/packages/default/css/bloc_alpha.css delete mode 100644 html/user_data/packages/default/css/common.css delete mode 100644 html/user_data/packages/default/css/contents.css delete mode 100644 html/user_data/packages/default/css/import.css delete mode 100644 html/user_data/packages/default/css/popup.css delete mode 100644 html/user_data/packages/default/css/print.css delete mode 100644 html/user_data/packages/default/css/reset.css delete mode 100644 html/user_data/packages/default/css/table.css create mode 100644 html/user_data/packages/default/style.css diff --git a/data/Smarty/templates/default/popup_header.tpl b/data/Smarty/templates/default/popup_header.tpl index 8196da768d..e10727355f 100644 --- a/data/Smarty/templates/default/popup_header.tpl +++ b/data/Smarty/templates/default/popup_header.tpl @@ -26,7 +26,7 @@ - + <!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--> diff --git a/data/Smarty/templates/default/site_frame.tpl b/data/Smarty/templates/default/site_frame.tpl index df9bc2bfc2..ba8aab6534 100644 --- a/data/Smarty/templates/default/site_frame.tpl +++ b/data/Smarty/templates/default/site_frame.tpl @@ -41,7 +41,7 @@ - + diff --git a/html/user_data/packages/default/css/bloc.css b/html/user_data/packages/default/css/bloc.css deleted file mode 100644 index 67c19f22f4..0000000000 --- a/html/user_data/packages/default/css/bloc.css +++ /dev/null @@ -1,421 +0,0 @@ -@charset "utf-8"; - -/************************************************ - ブロック用 -************************************************ */ -/*** 目次 *** - -▼ブロック共通 -リスト -タイトル -ヘッダー上、フッター下のブロックエリア - -▼各機能ブロックの指定 --新着情報 --現在のカゴの中 --カテゴリ --ガイドリンク --ログイン（サイド用） --検索 --カレンダー --おすすめ商品 - * 商品詳細のオススメ商品 [whobought_area] -*/ - - -/* ============================================== -ブロック共通 - * #container から指定することで、ヘッダー・フッターには適用していない。 -/* ============================================= */ -.side_column { - overflow-x: hidden; /* IE6 表示乱れ防止 */ -} -.side_column .block_body, -#main_column .block_body { - border: solid 1px #ccc; - border-top: none; -} -.side_column .block_body .box { - border: solid 1px #ccc; - width: 145px; -} - -/* 外枠 ------------------------------------------------ */ -#container .block_outer { - padding: 0 15px 10px; /* #container の背景色を欠けさせないため敢えて padding */ -} -#container #main_column .block_outer { - padding: 0 0 20px; -} -#container .side_column .block_outer { - padding: 0 7% 10px; -} - -/* リスト ------------------------------------------------ */ -/* ログイン 検索条件 */ -#container .block_outer .block_body dl.formlist { - margin-bottom: 8px; -} -#container .block_outer .block_body dl.formlist dd { - margin-bottom: 5px; -} -#container .block_outer .block_body dl.formlist dt { - margin-bottom: 3px; - padding-left: 15px; - background: url("../img/icon/ico_arrow_03.gif") no-repeat left; - font-size: 90%; -} -#container .block_outer .block_body dl.formlist span { - vertical-align: top; -} - - -/* タイトル ------------------------------------------------ */ -/* タイトルの背景 白 */ -#login_area h2, -#search_area h2, -#calender_area h2, -#cart_area h2, -#cart h2 { - padding: 5px 0 8px 10px; - border-style: solid; - border-color: #f90 #ccc #ccc; - border-width: 1px 1px 0; - background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; - font-size: 14px; -} -#category_area h2 { - border-top: solid 1px #f90; - background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; - padding: 5px 0 8px 10px; - font-size: 14px; -} - -/* タイトルの背景 オレンジ */ -#recommend_area h2, -#news_area h2 { - padding: 5px 0 8px 10px; - border-style: solid; - border-color: #f90 #ccc #ccc; - border-width: 1px 1px 0; - background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8; -} - - -/* *********************************************** -▼各機能ブロックの指定 -/*********************************************** */ - -/* =============================================== -▼新着情報 -=============================================== */ -#news_area .news_contents { - padding: 10px; - max-height: 260px; - height: auto !important; /* hack? */ - height: 260px; /* hack? */ - overflow: auto; - overflow-y: scroll; -} -#news_area dl.newslist { - background: url("../img/background/line_dot_01.gif") repeat-x bottom; -} -#news_area dl.newslist:last-child { /* IE9 未満では無効 (影響度合いが低いので黙殺) */ - background: none; -} -#news_area dl.newslist dt { - margin-bottom: 5px; -} -#news_area dl.newslist dd { - margin-bottom: 10px; - padding-bottom: 10px; -} - - -/* =============================================== -▼現在のカゴの中 -=============================================== */ -#cart_area .information { - padding: 10px; -} -#cart_area .postage { - margin-top: 10px; - padding-top: 10px; - background: url("../img/background/line_dot_01.gif") repeat-x top; -} -#cart_area .postage .point_announce { - padding: 2px 0 2px 20px; - background: url("../img/icon/ico_price.gif") no-repeat left top; -} -#cart_area .btn { - padding: 10px 0; - background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6; - text-align: center; -} - - -/* =============================================== -▼カテゴリ -=============================================== */ -#container #category_area .block_body { - background-color: #fffaf0; -} - -#category_area li { - padding-left: 5px; -} -#category_area li.level1 { - border-bottom: solid 1px #ccc; -} -#category_area li.level1 p { - padding-left: 20px; - margin: 7px 3px; -} -#category_area li.level1 p { - background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat; -} -#category_area li.level1 li p { - background: url("../img/icon/ico_level.gif") 7px 7px no-repeat; -} -#category_area li a { - display: block; - padding: 0; -} -a.onlink:link { - color: #f00; - text-decoration: underline; -} -a.onlink:visited { - color: #f00; -} -a.onlink:hover { - color: #f00; -} - - -/* =============================================== -▼ガイドリンク -=============================================== */ -#guide_area { - border: none; -} -#guide_area li { - margin-bottom: 5px; - letter-spacing: -0.05em; -} -ul.button_like li { - margin: 0; - padding: 0 0 1px 0; - background: url("../img/background/bg_btn_list.jpg") bottom repeat-x; -} -ul.button_like li a { - margin: 0; - padding: 10px 15px 10px 10px; - border: 1px solid; - border-bottom: none; - border-color: #ccc; - display: block; - background: url("../img/icon/ico_arrow_02.gif") no-repeat right; - text-decoration: none; - outline: none; -} - - -/* =============================================== -▼ログイン（サイド用） -※ヘッダー用はbloc_alpha.css内に記述 -=============================================== */ -#container div#login_area .block_body { - padding: 10px; -} - -#container div#login_area .block_body p { - margin-bottom: 5px; -} - -#container div#login_area .block_body .btn { - text-align: center; -} -#container .login_area dl.formlist { - margin-bottom: 8px; - width: 450px; -} -#container .login_area dl.formlist dt { - margin-bottom: 3px; - padding-left: 15px; - color: #333; - background: url("../img/icon/ico_arrow_03.gif") no-repeat left; - width: 120px; - float: left; - font-size: 90%; -} -#container .login_area dl.formlist dd { - margin-bottom: 5px; - float: right; - width: 300px; - vertical-align: bottom; - text-align: left; -} -#container div#login_area .block_body .mini { - margin-top: 5px; - letter-spacing: -0.01em; -} - - -/* =============================================== -▼検索 -=============================================== */ -#container div#search_area .block_body { - padding: 10px; -} -#container div#search_area .block_body .btn { - text-align: center; -} - - -/* =============================================== -▼カレンダー -=============================================== */ -#calender_area { - background-color: transparent; - border: none; -} -#calender_area .block_body { - padding: 10px 0; - background-color: #f1f9fc; -} -#calender_area table { - background: #fff; - border: none; - width: 150px; - margin: 0 auto 5px; - font-size: 90%; -} -#calender_area table td { - padding: 1px 3px; - border-top: 1px solid #ccc; - border-right: none; - text-align: center; -} -#calender_area th { - padding: 1px 3px; - background: #fff; - border: none; - text-align: center; -} -#calender_area table .month { - margin-bottom: 5px; - padding-left: 12px; - background: url("../img/icon/ico_arrow_04.gif") no-repeat left; - font-size: 120%; -} -#calender_area .off { - color: #f00; -} -#calender_area .today { - background-color: #FFF99D; - font-weight: bold; -} -#calender_area .information { - margin-left: 10px; - font-size: 90%; -} - - -/* =============================================== -▼おすすめ商品 -=============================================== */ -/* - tplファイルのマークアップが同じ項目 - メインカラム用 - サイドカラム用 [side_column] - 商品詳細のオススメ商品 [whobought_area] -=============================================== */ -/* 共通 ------------------------------------------------ */ -#recommend_area .block_body, -#whobought_area .product_item { - padding: 10px 0 10px; - border: none; - background: url("../img/background/line_dot_01.gif") repeat-x bottom; -} - -#recommend_area .block_body p, -#whobought_area .product_item p { - margin: 0 0 5px 0; -} - -#recommend_area .block_body img, -#whobought_area .product_item img { - margin: 0 5px 0 0; -} - -#recommend_area .block_body h3, -#whobought_area .product_item h3 { - font-size: 100%; - font-weight: normal; -} - -/* サイドカラム用 */ -.side_column #recommend_area .product_item { - margin-bottom: 10px; -} - - -/* 画像 ------------------------------------------------ */ -/* メインカラム用 */ -#main_column #recommend_area .block_body .productImage, -#whobought_area .product_item .productImage { - margin-bottom: 10px; - float: left; - width: 90px; -} -/* サイドカラム用 */ -.side_column #recommend_area .block_body .productImage { - float: none; - text-align: center; - width: auto; -} - - -/* 左右の振り分け ------------------------------------------------ */ -#main_column #recommend_area .product_item, -#whobought_area .product_item { - float: left; - width: 47.5%; - padding-left: 1%; - padding-right: 1%; -} - - -/* 商品説明テキスト ------------------------------------------------ */ -/* メインカラム用 1カラム時*/ -#main_column.colnum1 #recommend_area .block_body .productContents { - float: right; - width: 74%; -} - -/* メインカラム用 2カラム時*/ -#main_column.colnum2 #recommend_area .block_body .productContents, -#main_column.colnum2 #whobought_area .productContents { - float: right; - width: 74%; -} - -/* メインカラム用 3カラム時*/ -#main_column.colnum3 #recommend_area .block_body .productContents, -#main_column.colnum3 #whobought_area .productContents { - float: right; - width: 67%; -} - -/* サイドカラム用 */ -.side_column #recommend_area .block_body .productContents { - clear: both; -} diff --git a/html/user_data/packages/default/css/bloc_alpha.css b/html/user_data/packages/default/css/bloc_alpha.css deleted file mode 100644 index 25087c6ccd..0000000000 --- a/html/user_data/packages/default/css/bloc_alpha.css +++ /dev/null @@ -1,88 +0,0 @@ -@charset "utf-8"; - -/************************************************ - インヘッダーブロック -************************************************ */ -#headerInternalColumn { - margin-top: 5px; - float: right; - width: 520px; - height: 35px; -} - -/* ログイン（ヘッダー用） ------------------------------------------------ */ -#header_login_area { - padding: 0 10px; - border: solid 1px #ffc979; - height: 30px; - background: #fef3d3; - letter-spacing: -0.075em; -} -#header_login_area ul.formlist { - margin-top: 5px; -} -#header_login_area ul.formlist li { - float: left; -} -#header_login_area ul.formlist li.mail { - padding-left: 28px; - width: 155px; - background: url("../img/common/ico_arrow_login.gif") no-repeat left; - font-size: 90%; -} -#header_login_area ul.formlist li.password { - padding-right: 5px; -} -#header_login_area ul.formlist li.login_memory { - padding-right: 5px; - font-size: 90%; -} -#header_login_area ul.formlist li.forgot { - margin-top: 3px; - padding-right: 5px; - font-size: 90%; -} -#header_login_area ul.formlist li.btn { - padding-right: 5px; - width: 53px; -} -#header_login_area p.btn { - height: 20px; - padding: 5px 0; - vertical-align: middle; -} -#header_login_area p.btn input[type=image] { - vertical-align: middle; -} - -/* *********************************************** -追加ブロック -************************************************ */ -/* 共通 ------------------------------------------------ */ -#container .block_outer #banner_area .block_body { - border: none; -} - -/* 【メイン】バナーエリア_02 ------------------------------------------------ */ -#main_column .block_outer #banner_area .block_body ul { - width: 100%; -} -#main_column .block_outer #banner_area .block_body ul li { - float: left; -} -#main_column .block_outer #banner_area .block_body ul li.sub_01 { - padding-right: 8px; -} - -/* 【サイド】バナーエリア_01 ------------------------------------------------ */ -/* 【サイド】バナーエリア_02 ------------------------------------------------ */ -#leftcolumn .block_outer #banner_area .block_body ul li, -#rightcolumn .block_outer #banner_area .block_body ul li { - margin-bottom: 8px; -} - diff --git a/html/user_data/packages/default/css/common.css b/html/user_data/packages/default/css/common.css deleted file mode 100644 index c5826efc01..0000000000 --- a/html/user_data/packages/default/css/common.css +++ /dev/null @@ -1,414 +0,0 @@ -@charset "utf-8"; - -/************************************************ - 共通設定 -************************************************ */ -body { - color: #666; - font-family: Verdana,Arial,Helvetica,sans-serif; - background-color: #f5f5f5; - font-size: 72.5%; - line-height: 150%; - letter-spacing: 0.1em; -} - -/* 写真 */ -img.picture { - border: 1px solid #ccc; -} - - -/* ============================================== - フレーム -=============================================== */ -/* 全体を包括 */ -.frame_outer { - margin: 0 auto; - width: 100%; - text-align: center; -} - -/* コンテンツ */ -#container { - margin: 0 auto; - padding: 0 0 30px; - width: 980px; - background: #fff; - text-align: left; -} - - -/* ============================================== - カラム指定 -=============================================== */ - -/* メイン部 ------------------------------------------------ */ -#main_column { - padding: 10px 0 0; -} - -/* 1カラム時 */ -#main_column.colnum1 { - margin: 0 auto; - width: 80%; -} - -/* 2カラム時 (共通) */ -#main_column.colnum2 { - width: 78%; -} - -/* 2カラム時 (メイン部が左) */ -#main_column.colnum2.left { - padding-left: 1.5%; - float: left; -} - -/* 2カラム時 (メイン部が右) */ -#main_column.colnum2.right { - padding-right: 1.5%; - float: right; -} - -/* 3カラム時 */ -#main_column.colnum3 { - padding-left: 0.5%; - width: 59%; - float: left; -} - -/* サイドカラム ------------------------------------------------ */ -.side_column { - padding: 10px 0 0; -} -#leftcolumn { - float: left; - width: 20%; -} -#rightcolumn { - float: right; - width: 20%; -} - -/* 他 ------------------------------------------------ */ -/* ヘッダーとフッターの上下 */ -#topcolumn, -#bottomcolumn, -#footerbottomcolumn { - margin: 0px; - background: #fff; - text-align: left; - clear: both; -} - -/* 下層コンテンツ */ -#undercolumn { - width: 100%; - margin: 0 0 30px 0; -} - - -/* ============================================== - ユーティリティ -=============================================== */ -/* フロート回り込み解除 ------------------------------------------------ */ -.clearfix:after { - display: block; - clear: both; - height: 0px; - line-height: 0px; - visibility: hidden; - content: "."; -} -.clearfix { - display: block; /* for IE8 */ -} -.clear { - clear: both; -} - -/* リンク指定 ------------------------------------------------ */ -a:link, -a:visited { - color: #39c; - text-decoration: none; -} -a:link:hover, -a[href]:hover { - color: #f60; - text-decoration: underline; -} - - -/* フォント ------------------------------------------------ */ -h1, -h2, -h3, -h4, -h5 { - font-size: 100%; - line-height: 150%; -} -.sale_price { - color: #f00; -} -.normal_price { - font-size: 90%; -} -.point { - color: #f00; - font-weight: bold; -} -.user_name { - font-weight: bold; -} -.recommend_level { - color: #ecbd00; -} - -.attention { - color: #f00; -} -.attentionSt { - color: #f00; - font-weight: bold; -} -.st { - font-weight: bold; -} -.mini { - font-size: 90%; -} - - -/* 行揃え ------------------------------------------------ */ -.alignC { - text-align: center; -} -.alignR { - text-align: right; -} -.alignL { - text-align: left; -} -.pricetd em { - font-weight: bold; -} - - -/* フォーム ------------------------------------------------ */ -select { - border: solid 1px #ccc; -} -input[type='text'], -input[type='password'] { - border: solid 1px #ccc; - padding: 2px; -} - -.box40 { - width: 40px; -} -.box60 { - width: 60px; -} -.box100 { - width: 100px; -} -.box120 { - width: 120px; -} -.box140 { - width: 140px; -} -.box145 { - width: 145px; -} -.box150 { - width: 150px; -} -.box240 { - width: 240px; -} -.box300 { - width: 300px; -} -.box320 { - width: 320px; -} -.box350 { - width: 350px; -} -.box380 { - width: 380px; -} - -/* フォームが縦に重なり合う場合に併用する余白 */ -.top { /* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */ - margin-bottom: 5px; -} - - -/* タイトル ------------------------------------------------ */ -h2.title { - margin-bottom: 10px; - padding: 8px; - border-top: solid 1px #ebeced; - color: #f60; - background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom; - background-color: #fef3d8; - font-size: 170%; -} - -#main_column .sub_area h3, -#undercolumn_login .login_area h3, -#undercolumn_shopping h3, -#mypagecolumn h3, -#undercolumn_cart h3 { - margin: 0 0 10px 0; - padding: 5px 0 10px; - color: #f60; - background: url("../img/background/line_01.gif") repeat-x left bottom; - font-size: 120%; -} - -div#undercolumn_login .login_area h4 { - padding-left: 15px; - background: url("../img/icon/ico_arrow_05.gif") no-repeat left; -} - - -/* ============================================== - ヘッダー -=============================================== */ -/* レイアウト ------------------------------------------------ */ -#header_wrap { - border-top: solid 3px #f90; - min-height: 82px; - background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0; -} -#header { - margin: auto; - width: 980px; -} -#header_utility { - float: right; - width: 580px; -} -#errorHeader { - color: #F00; - font-weight: bold; - font-size: 12px; - background-color: #FEB; - text-align: center; - padding: 5px; -} - - -/* ロゴ ------------------------------------------------ */ -#logo_area { - padding-left: 10px; - float: left; - width: 390px; - text-align: left; -} -#site_description { - font-size: 90%; -} - - -/* ヘッダーナビ ------------------------------------------------ */ -div#header_navi { - float: right; - width: 409px; - height: 38px; -} -div#header_navi ul li { - display: block; - float: left; -} -div#header_navi ul li.mypage, -div#header_navi ul li.entry { - margin-top: 6px; -} - - -/* ============================================== - フッター -=============================================== */ -#footer_wrap { - margin: 0 auto; - width: 980px; - height: 80px; - background: #fff; -} -#footer { - margin: auto; - padding-top: 10px; - border-top: solid 1px #ccc; - width: 950px; -} -#pagetop { - width: 210px; - float: right; - text-align: right; -} -#copyright { - width: 740px; - float: left; - text-align: left; - font-size: 97%; -} - - -/* ============================================== - パーツ -=============================================== */ -/* ボタン ------------------------------------------------ */ -.btn_area { - margin-top: 10px; - width: 100%; - text-align: center; -} - -.btn_area li { - padding-right: 10px; - display: inline; -} - - -/* 完了メッセージ ------------------------------------------------ */ -div#complete_area { - margin-bottom: 20px; -} -div#complete_area .message, -div#undercolumn_entry .message { - margin-bottom: 20px; - line-height: 150%; - font-weight: bold; - font-size: 120%; -} -div#complete_area .shop_information { - margin-top: 40px; - padding: 20px 0 0 0; - border-top: solid 1px #ccc; -} -div#complete_area .shop_information .name { - margin-bottom: 10px; - font-weight: bold; - font-size: 140%; -} diff --git a/html/user_data/packages/default/css/contents.css b/html/user_data/packages/default/css/contents.css deleted file mode 100644 index 63ace223f9..0000000000 --- a/html/user_data/packages/default/css/contents.css +++ /dev/null @@ -1,731 +0,0 @@ -@charset "utf-8"; - -/************************************************ - 各ページコンテンツ用 -************************************************ */ -/* ============================================== -▼TOP -=============================================== */ -/* メインイメージ ------------------------------------------------ */ -#main_image { - margin-bottom: 10px; - text-align: center; -} - -/* ============================================== -▼下層 -=============================================== */ -/* ============================================== -▼ガイド -=============================================== */ -/* ◎◎について ------------------------------------------------ */ -div#undercolumn_aboutus { -} - -/* 特定商取引法 ------------------------------------------------ */ -div#undercolumn_order { -} - -/* お問い合わせ ------------------------------------------------ */ -div#undercolumn_contact { - margin: 0 auto; - width: 100%; -} - -.zipimg img { - vertical-align: middle; -} - - -/* ============================================== -▼MYページ -=============================================== */ -/* 共通設定 ------------------------------------------------ */ -div#mypagecolumn { - width: 100%; -} - -div#mynavi_area { - width: 100%; -} - -div#mycontents_area { - width: 100%; -} -div#mynavi_area .mynavi_list { - margin-bottom: 20px; - width: 100%; -} -div#mynavi_area .mynavi_list li { - margin: 0 15px 5px 0; - padding-left: 15px; - float: left; - background: url('../img/icon/ico_arrow_01.gif') no-repeat left ; - font-size: 120%; -} - -div#mynavi_area div.point_announce { - margin-bottom: 30px; - padding: 10px; - border: solid 1px #ffcc62; - background-color: #fffaf0; -} -div#mynavi_area div.point_announce p { - padding-left: 20px; - background: url('../img/icon/ico_point.gif') no-repeat left ; -} - -div#mycontents_area p.inforamtion { - margin-bottom: 20px; -} - -div#mypagecolumn h4 { - margin: 10px auto; - border-bottom: 1px solid #999; - text-align: left; - font-size: 120%; -} - - -/* 購入履歴一覧/詳細 ------------------------------------------------ */ -div#mycontents_area div.mycondition_area { - margin: 0 auto 20px 0; - padding: 10px; - border: solid 1px #ccc; - width: 97%; - background: #f9f9f9; -} -div#mycontents_area div.mycondition_area p { - float: left; -} -div#mycontents_area div.mycondition_area .btn { - width: 160px; - margin-top: 15px; - float: right; -} -.add_address { - margin-bottom: 20px; -} - - -/* 会員登録内容変更/退会 ------------------------------------------------ */ -div#mycontents_area .message_area { - margin: 30px auto; - padding: 30px; - border: 1px solid #ccc; - text-align: center; -} - -div#mycontents_area .message_area p { - margin-bottom: 20px; -} - -/* ============================================== -▼会員登録 -=============================================== */ -div#undercolumn_entry { - width: 100%; -} - -div#undercolumn_entry .kiyaku_text { - margin: 20px auto; - padding: 10px; - border: solid 1px #ccc; - width: 94%; - background: #fff; -} - - -/* ============================================== -▼ログイン -=============================================== */ -div#undercolumn_login { - margin: 0 auto; - width: 100%; -} - -div#undercolumn_login .login_area { - margin-bottom: 30px; -} - -div#undercolumn_login .login_area .inputbox { - margin: 15px auto 15px auto; - padding: 15px 20px 10px 20px; - background: #f0f0f0; -} - -div#undercolumn_login .login_area .inputbox .btn_area { - margin-top: 0; -} - - -/* ============================================== -▼エラー -=============================================== */ -div#undercolumn_error .message_area { - width: 80%; - margin: 30px auto; - padding: 30px; - border: 1px solid #ccc; - text-align: center; -} - -div#undercolumn_error .message_area .error { - padding: 120px 0; -} - - -/* ============================================== -▼商品一覧 -=============================================== */ -/* ページ送り ------------------------------------------------ */ -.pagenumber_area { - padding-bottom: 10px; - background: url("../img/background/line_dot_01.gif") repeat-x bottom ; -} -.pagecond_area { - margin-bottom: 20px; - padding: 10px; -} -.pagenumber_area { - margin: 20px 0; -} -.pagecond_area { - border: 1px solid #ccc; -} -.pagenumber_area .navi { - width: 100%; - text-align: left; -} -.pagenumber_area .navi li { - display: inline; -} -.pagenumber_area .change { - float: right; - text-align: right; - white-space: nowrap; -} - - -/* レイアウト ------------------------------------------------ */ -div.list_area { - padding: 0 0 30px 0; - width: 100%; - overflow: auto; -} - -div.listphoto { - float: left; -} - -/* メインカラム用 1カラム時*/ -#main_column.colnum1 div.listrightbloc { - float: right; - width: 74%; -} - -/* メインカラム用 2カラム時*/ -#main_column.colnum2 div.listrightbloc { - float: right; - width: 80%; -} - -/* メインカラム用 3カラム時*/ -#main_column.colnum3 div.listrightbloc { - float: right; - width: 74%; -} - - -/* 商品情報 各種設定 ------------------------------------------------ */ -/* 商品ステータス */ -div.listrightbloc ul.status_icon { - margin-bottom: 10px; - width: 100%; -} -div.listrightbloc ul.status_icon li { - margin-right: 5px; - float: left; -} - -/* 商品名 */ -div.listrightbloc h3 { - font-weight: bold; - font-size: 120%; -} - -/* コメント */ -div.listrightbloc .listcomment { - margin: 0 0 10px 0; - text-align: left; -} - -/* 商品詳細を見る */ -div.listrightbloc .detail_btn { - margin-bottom: 20px; -} - -/* 価格 */ -div.listrightbloc .pricebox { - margin: 0 0 10px 0; -} - -/* 買い物カゴ */ -div.listrightbloc .cart_area { - padding: 10px; - border: 1px solid #cef0f4; - background-color: #ecf5ff; - width: 94%; -} - -/* 規格 */ -div.listrightbloc .classlist { - margin-bottom: 10px; - padding-bottom: 10px; - background: url("../img/background/line_dot_02.gif") repeat-x bottom ; -} -div.listrightbloc dl { - width: 100%; -} -div.listrightbloc dt { - display: inline-block; - vertical-align: top; -} -div.listrightbloc dd { - padding-bottom: 10px; - display: inline-block; -} -div.listrightbloc dd p.attention { - margin-top: 5px; -} - -/* カゴに入れる */ -div.listrightbloc .cartin { - margin: 0; - float :right; -} -div.listrightbloc .cartin .quantity { - padding: 3px 10px 0 0; - width: 150px; - float :left; - text-align: right; -} -div.listrightbloc .cartin .quantity .box { - width: 70px; -} -div.listrightbloc .cartin_btn { - width: 160px; - float :left; -} - - -/* ============================================== -▼商品詳細 -=============================================== */ -/* レイアウト - - tplファイルのマークアップが同じ項目 - * 1カラム時 - * 2カラム時 - * 3カラム時 - ------------------------------------------------ */ -#detailarea, -.sub_area { - margin-bottom: 20px; - width: 100%; -} - -/* レイアウト ------------------------------------------------ */ -/* 1カラム用 */ -#main_column.colnum1 div#detailphotobloc { - width: 37%; - float: left; -} -#main_column.colnum1 #detailrightbloc { - width: 63%; - float: right; -} -#main_column.colnum1 div.subtext { - margin-bottom: 20px; - float: left; - width: 69%; -} -#main_column.colnum1 div.subphotoimg { - float: right; - width: 25%; - text-align: right; -} -#main_column.colnum1 p.subtext { - margin-bottom: 20px; -} - -/* 2カラム用 */ -#main_column.colnum2 div#detailphotobloc { - float: left; - width: 37%; -} -#main_column.colnum2 #detailrightbloc { - float: right; - width: 63%; -} -#main_column.colnum2 div.subtext { - margin-bottom: 20px; - float: left; - width: 73%; -} -#main_column.colnum2 p.subtext { - margin-bottom: 20px; -} -#main_column.colnum2 div.subphotoimg { - float: right; - width: 25%; - text-align: right; -} - -/* 3カラム用 */ -#main_column.colnum3 div#detailphotobloc { - float: left; - width: 49%; -} -#main_column.colnum3 #detailrightbloc { - float: right; - width: 50%; -} -#main_column.colnum3 div.subtext { - margin-bottom: 20px; - float: left; - width: 63%; -} -#main_column.colnum3 p.subtext { - margin-bottom: 20px; -} -#main_column.colnum3 div.subphotoimg { - float: right; - width: 35%; - text-align: right; -} - -/* 商品情報 各種設定 ------------------------------------------------ */ -#detailrightbloc h2 { - margin: 0 0 10px 0; - padding: 0 0 15px 0; - color: #666; - background: url("../img/background/line_dot_01.gif") repeat-x bottom ; - font-weight: bold; - font-size: 160%; -} -#detailrightbloc .point, -#detailrightbloc .relative_cat { - margin: 0 0 10px 0; - padding: 0 0 10px 0; - background: url("../img/background/line_dot_01.gif") repeat-x bottom ; -} -#detailrightbloc .main_comment { - margin-bottom: 20px; -} - -/* 商品コード */ -#detailrightbloc .product_code dt, -#detailrightbloc .product_code dd { - display: inline; -} - -/* 商品ステータス */ -#detailrightbloc ul.status_icon { - margin-bottom: 10px; - width: 100%; -} -#detailrightbloc ul.status_icon li { - margin-right: 5px; - margin-bottom: 3px; - float: left; -} - -/* 通常価格 */ -#detailrightbloc .normal_price dt, -#detailrightbloc .normal_price dd { - display: inline; -} - -/* 販売価格 */ -#detailrightbloc .sale_price dt, -#detailrightbloc .sale_price dd { - display: inline; -} - -/* ポイント */ -#detailrightbloc .point dt, -#detailrightbloc .point dd { - display: inline; -} - -/* 規格 */ -#detailrightbloc div.classlist { - margin-bottom: 10px; - padding-bottom: 10px; - width: 100%; - background: url("../img/background/line_dot_02.gif") repeat-x bottom ; -} -#detailrightbloc .classlist { - margin-bottom: 5px; -} -#detailrightbloc ul { - margin-bottom: 10px; - width: 100%; -} -#detailrightbloc ul li { - vertical-align: top; - float: left; -} - -/* メーカー */ -#detailrightbloc .maker dt, -#detailrightbloc .maker dd { - display: inline; -} - -/* メーカーURL */ -#detailrightbloc .comment1 dt, -#detailrightbloc .comment1 dd { - display: inline; -} - -/* 関連カテゴリ */ -#detailrightbloc .relative_cat dd { - margin-left: 1em; -} - -/* 買い物カゴ */ -#detailrightbloc .cart_area { - padding: 10px; - background-color: #ecf5ff; - border: 1px solid #cef0f4; -} -#detailrightbloc .quantity dt, -#detailrightbloc .quantity dd { - display: inline; -} -#detailrightbloc .cartin { - text-align: center; -} -#detailrightbloc .cartin_btn { - text-align: center; -} -#detailrightbloc .favorite_btn { - text-align: center; - margin-top: 10px; -} - - -/* お客様の声 ------------------------------------------------ */ -div#customervoice_area { - clear: both; - padding: 35px 0 0 0; -} - -div#customervoice_area h2 { - margin-bottom: 20px; - padding: 6px 0 8px 10px; - border-top: solid 1px #f90; - background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom; -} - -div#customervoice_area .review_bloc { - margin-bottom: 20px; - padding: 10px; - background-color: #f6f6f6; -} - -div#customervoice_area .review_bloc p { - padding-top: 3px; - margin-right: 10px; - float: left; -} - -div#customervoice_area .review_bloc .review_btn { - float: right; - width: 160px; -} - -div#customervoice_area ul li { - padding-bottom: 15px; - margin-bottom: 15px; - background: url("../img/background/line_dot_01.gif") repeat-x bottom ; -} - -div#customervoice_area .voicetitle { - margin-bottom: 5px; - color: #333; - font-weight: bold; -} - -div#customervoice_area .voicedate { - margin-bottom: 10px; -} - - -/* 関連商品（商品部分はbloc.cssのおすすめ商品と共通） ------------------------------------------------ */ -div#whobought_area { - clear: both; - padding: 35px 0 0 0; -} - -div#whobought_area h2 { - border-top: solid 1px #f90; - background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom; - padding: 5px 0 8px 10px; - font-size: 14px; -} - - -/* *********************************************** -▼カートの中 -/*********************************************** */ -/* 現在のカゴの中 ------------------------------------------------ */ -div#undercolumn_cart .point_announce { - padding: 20px; - margin-bottom: 20px; - border: solid 1px #ffcc62; - background: #fffaf0; - font-size: 120%; - text-align: center; - line-height: 140%; -} -div#undercolumn_cart .totalmoney_area { - margin-bottom: 20px; -} - -div#undercolumn_cart p { - margin: 10px 5px; -} - -div#undercolumn ul#quantity_level li { - padding: 3px; - display: inline; -} - -div#undercolumn .empty { - text-align: left; -} - -div.form_area { - margin-bottom: 30px; -} - - -/* お客様情報入力 ------------------------------------------------ */ -div#undercolumn_customer { -} - -.flow_area { - margin: 0 0 20px 0; -} - -div#undercolumn_customer th em { - color: #000; - font-weight: bold; -} - - -/* お支払い方法・お届け時間等の指定 ------------------------------------------------ */ -div#undercolumn_shopping .pay_area { - margin: 0 auto 30px; - width: 100%; -} -div#undercolumn_shopping .pay_area02 { - margin: 40px auto 30px auto; -} -div#undercolumn_shopping .pay_area02 .txtarea { - margin: 5px 0 0 0; - padding: 2px; - border: 1px solid #ccc; - width: 99%; - height: 150px; -} -div#undercolumn_shopping .pay_area02 .select-msg { - margin-bottom: 10px; -} - -div#undercolumn_shopping .point_area { - margin: 40px auto 0 auto; -} - -div#undercolumn_shopping .point_area .point_announce { - padding: 20px; - border: 1px solid #ccc; -} - -div#undercolumn_shopping .point_area p { - margin-bottom: 20px; -} - -div#undercolumn_shopping .point_area .point_announce li { - margin-bottom: 5px; -} - - -/* お届け先の指定 ------------------------------------------------ */ -#address_area { - margin-bottom: 10px; - width: 100%; -} - -#address_area .information { - width: 65%; - float: left; -} - -#undercolumn_shopping .information { - margin-bottom: 15px; -} - -#address_area .add_multiple { - padding: 15px 10px; - border: 1px solid #ffcc62; - float: right; - width: 30%; - color: #555; - background: #fffaf0; - text-align: center; - font-weight: bold; -} - -#address_area .add_multiple p { - margin-bottom: 10px; -} - -#address_area p.addbtn { - font-weight: bold; - font-size: 10px; -} - - -/* ============================================== -▼検索結果 -=============================================== */ -p.condition_area { - margin: 0 auto; - padding: 5px; - border: solid 1px #333; - width: 566px; -} - diff --git a/html/user_data/packages/default/css/import.css b/html/user_data/packages/default/css/import.css deleted file mode 100644 index 074fa3e4df..0000000000 --- a/html/user_data/packages/default/css/import.css +++ /dev/null @@ -1,14 +0,0 @@ -@charset "utf-8"; - -/************************************************ - import css -************************************************ */ -@import url("./reset.css"); -@import url("./common.css"); -@import url("./contents.css"); -@import url("./table.css"); -@import url("./bloc.css"); -@import url("./bloc_alpha.css"); -@import url("./popup.css"); - -@import url("./print.css"); diff --git a/html/user_data/packages/default/css/popup.css b/html/user_data/packages/default/css/popup.css deleted file mode 100644 index 7d1d5ac207..0000000000 --- a/html/user_data/packages/default/css/popup.css +++ /dev/null @@ -1,111 +0,0 @@ -@charset "utf-8"; - -/************************************************ - ポップアップウィンドウ -************************************************ */ -/* 共通 ------------------------------------------------ */ -div#windowcolumn { - border-top: solid 3px #f90; - width: 560px; - height: 100%; - margin: 15px 15px 0 15px; - background: #fff; -} - -div#windowcolumn h2 { - margin-bottom: 10px; - padding: 8px; - border-top: solid 1px #ebeced; - color: #f60; - background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom; - background-color: #fef3d8; - font-size: 170%; -} - -div#window_area { - margin: 15px auto 0 auto; - padding-bottom: 20px; - width: 540px; - min-height: 300px; - height: auto !important; -} - -div#window_area p.information { - margin-bottom: 20px; -} - -div#window_area .message { - margin-bottom: 20px; - color: #f60; - line-height: 150%; - font-weight: bold; - font-size: 140%; -} -div#window_area table { - width: 540px; -} - -/* お客様の声の書き込み、新しいお届け先の追加・変更 ------------------------------------------------ */ -div#window_area #forgot { - margin: 0 auto; - padding: 20px; - width: 440px; - border: 1px solid #ccc; - text-align: left; -} -div#window_area #forgot .mailaddres { - margin-bottom: 10px; -} - -div#window_area #forgot p { - text-align: center; -} - - -/* 商品詳細拡大写真、カート拡大写真 ------------------------------------------------ */ -div#bigimage, -div#cartimage { - margin-top: 15px; - background-color: #fff; - text-align: center; -} - -div#bigimage img, -div#cartimage img { - padding: 10px; - background-color: #fff; -} - -/* 郵便番号検索 ------------------------------------------------ */ -div#zipsearchcolumn { - margin: 15px auto 0 auto; - border-top: 5px solid #ffa85c; - border-bottom: 5px solid #ffa85c; - width: 460px; - background-color: #fff; -} - -div#zipsearchcolumn h2 { - margin: 0 0 15px 0; - width: 460px; -} - -div#zipsearch_area { - margin: 15px auto 0 auto; - width: 460px; -} - -div#zipsearchcolumn .btn { - margin: 15px 0 30px 0; - text-align: center; -} - -div#zipsearch_area #completebox p { - padding: 60px 5px; - text-align: center; -} - diff --git a/html/user_data/packages/default/css/print.css b/html/user_data/packages/default/css/print.css deleted file mode 100644 index 700fe88029..0000000000 --- a/html/user_data/packages/default/css/print.css +++ /dev/null @@ -1,11 +0,0 @@ -@charset "utf-8"; - -/************************************************ - 印刷用 -************************************************ */ - -@media print { - body { - zoom: 75%; - } -} diff --git a/html/user_data/packages/default/css/reset.css b/html/user_data/packages/default/css/reset.css deleted file mode 100644 index 0e974c9bcc..0000000000 --- a/html/user_data/packages/default/css/reset.css +++ /dev/null @@ -1,99 +0,0 @@ -@charset "utf-8"; - -/************************************************ - ブラウザリセット -************************************************ */ -html, -body, -div, -span, -applet, -object, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -font, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td { - margin: 0; - padding: 0; - border: 0; -} - -table, -caption, -th, -td { - margin: 0; - padding: 0; - border: 0; - border-collapse : collapse ; - border-spacing: 0px; - empty-cells: show; - text-align: left; - font-weight: normal; -} - -a img, -iframe { - border: none; -} -ol, -ul, -li { - list-style: none; -} - -input, -textarea, -select, -button { - font-size: 100%; - font-family: inherit; -} diff --git a/html/user_data/packages/default/css/table.css b/html/user_data/packages/default/css/table.css deleted file mode 100644 index 3f5046dd8c..0000000000 --- a/html/user_data/packages/default/css/table.css +++ /dev/null @@ -1,73 +0,0 @@ -@charset "utf-8"; - -/************************************************ - tables -************************************************ */ -/* デフォルトテーブル ------------------------------------------------ */ -table { - margin: 15px auto 20px auto; - border-top: 1px solid #ccc; - border-left: 1px solid #ccc; - width: 100%; - border-collapse: collapse; - text-align: left; -} -table th { - padding: 8px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - color: #333; - background-color: #f0f0f0; - font-weight: normal; -} -table td { - padding: 8px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; -} - -/* 見出し ------------------------------------------------ */ -div#undercolumn_shopping table th[scope=col] { - text-align: center; -} -div#undercolumn_shopping table.delivname th { - width: 155px; -} - -/* MYページ */ -div#mycontents_area table th { - text-align: left; -} -div#mycontents_area table th.alignR { - text-align: right; -} -div#mycontents_area table th.alignL { - text-align: left; -} -div#mycontents_area table th.alignC { - text-align: center; -} -div#mycontents_area table th.resulttd { - text-align: right; -} -div#mycontents_area table caption { - padding: 8px; - border-top: 1px solid #ccc; - border-right: 1px solid #ccc; - border-left: 1px solid #ccc; - color: #000; - background-color: #f0f0f0; - text-align: left; - font-weight: bold; -} - - -/* その他 ------------------------------------------------ */ -table select { - margin-bottom: 7px; - border: solid 1px #ccc; -} - diff --git a/html/user_data/packages/default/style.css b/html/user_data/packages/default/style.css new file mode 100644 index 0000000000..81fa73eb28 --- /dev/null +++ b/html/user_data/packages/default/style.css @@ -0,0 +1,2148 @@ +@charset "utf-8"; + +/************************************************ + ブラウザリセット +************************************************ */ + +html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; +} + +table, caption, th, td { + margin: 0; + padding: 0; + border: 0; + border-collapse: collapse; + border-spacing: 0px; + empty-cells: show; + text-align: left; + font-weight: normal; +} + +a img, iframe { + border: none; +} + +ol, ul, li { + list-style: none; +} + +input, textarea, select, button { + font-size: 100%; + font-family: inherit; +} + +@charset "utf-8"; + +/************************************************ + 共通設定 +************************************************ */ + +body { + color: #666; + font-family: Verdana,Arial,Helvetica,sans-serif; + background-color: #f5f5f5; + font-size: 72.5%; + line-height: 150%; + letter-spacing: 0.1em; +} + +/* 写真 */ + +img.picture { + border: 1px solid #ccc; +} + +/* ============================================== + フレーム +=============================================== */ +/* 全体を包括 */ + +.frame_outer { + margin: 0 auto; + width: 100%; + text-align: center; +} + +/* コンテンツ */ + +#container { + margin: 0 auto; + padding: 0 0 30px; + width: 980px; + background: #fff; + text-align: left; +} + +/* ============================================== + カラム指定 +=============================================== */ + +/* メイン部 +----------------------------------------------- */ + +#main_column { + padding: 10px 0 0; + + &.colnum1 { + margin: 0 auto; + width: 80%; + } + + &.colnum2 { + width: 78%; + + &.left { + padding-left: 1.5%; + float: left; + } + + &.right { + padding-right: 1.5%; + float: right; + } + } + + &.colnum3 { + padding-left: 0.5%; + width: 59%; + float: left; + } +} + +/* 1カラム時 */ + +/* 2カラム時 (共通) */ + +/* 2カラム時 (メイン部が左) */ + +/* 2カラム時 (メイン部が右) */ + +/* 3カラム時 */ + +/* サイドカラム +----------------------------------------------- */ + +.side_column { + padding: 10px 0 0; +} + +#leftcolumn { + float: left; + width: 20%; +} + +#rightcolumn { + float: right; + width: 20%; +} + +/* 他 +----------------------------------------------- */ +/* ヘッダーとフッターの上下 */ + +#topcolumn, #bottomcolumn, #footerbottomcolumn { + margin: 0px; + background: #fff; + text-align: left; + clear: both; +} + +/* 下層コンテンツ */ + +#undercolumn { + width: 100%; + margin: 0 0 30px 0; +} + +/* ============================================== + ユーティリティ +=============================================== */ +/* フロート回り込み解除 +----------------------------------------------- */ + +.clearfix { + &:after { + display: block; + clear: both; + height: 0px; + line-height: 0px; + visibility: hidden; + content: "."; + } + + display: block; + + /* for IE8 */ +} + +.clear { + clear: both; +} + +/* リンク指定 +----------------------------------------------- */ + +a { + &:link, &:visited { + color: #39c; + text-decoration: none; + } + + &:link:hover, &[href]:hover { + color: #f60; + text-decoration: underline; + } +} + +/* フォント +----------------------------------------------- */ + +h1, h2, h3, h4, h5 { + font-size: 100%; + line-height: 150%; +} + +.sale_price { + color: #f00; +} + +.normal_price { + font-size: 90%; +} + +.point { + color: #f00; + font-weight: bold; +} + +.user_name { + font-weight: bold; +} + +.recommend_level { + color: #ecbd00; +} + +.attention { + color: #f00; +} + +.attentionSt { + color: #f00; + font-weight: bold; +} + +.st { + font-weight: bold; +} + +.mini { + font-size: 90%; +} + +/* 行揃え +----------------------------------------------- */ + +.alignC { + text-align: center; +} + +.alignR { + text-align: right; +} + +.alignL { + text-align: left; +} + +.pricetd em { + font-weight: bold; +} + +/* フォーム +----------------------------------------------- */ + +select { + border: solid 1px #ccc; +} + +input { + &[type='text'], &[type='password'] { + border: solid 1px #ccc; + padding: 2px; + } +} + +.box40 { + width: 40px; +} + +.box60 { + width: 60px; +} + +.box100 { + width: 100px; +} + +.box120 { + width: 120px; +} + +.box140 { + width: 140px; +} + +.box145 { + width: 145px; +} + +.box150 { + width: 150px; +} + +.box240 { + width: 240px; +} + +.box300 { + width: 300px; +} + +.box320 { + width: 320px; +} + +.box350 { + width: 350px; +} + +.box380 { + width: 380px; +} + +/* フォームが縦に重なり合う場合に併用する余白 */ + +.top { + /* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */ + margin-bottom: 5px; +} + +/* タイトル +----------------------------------------------- */ + +h2.title { + margin-bottom: 10px; + padding: 8px; + border-top: solid 1px #ebeced; + color: #f60; + background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom; + background-color: #fef3d8; + font-size: 170%; +} + +#main_column .sub_area h3, #undercolumn_login .login_area h3, #undercolumn_shopping h3, #mypagecolumn h3, #undercolumn_cart h3 { + margin: 0 0 10px 0; + padding: 5px 0 10px; + color: #f60; + background: url("../img/background/line_01.gif") repeat-x left bottom; + font-size: 120%; +} + +div#undercolumn_login .login_area h4 { + padding-left: 15px; + background: url("../img/icon/ico_arrow_05.gif") no-repeat left; +} + +/* ============================================== + ヘッダー +=============================================== */ +/* レイアウト +----------------------------------------------- */ + +#header_wrap { + border-top: solid 3px #f90; + min-height: 82px; + background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0; +} + +#header { + margin: auto; + width: 980px; +} + +#header_utility { + float: right; + width: 580px; +} + +#errorHeader { + color: #F00; + font-weight: bold; + font-size: 12px; + background-color: #FEB; + text-align: center; + padding: 5px; +} + +/* ロゴ +----------------------------------------------- */ + +#logo_area { + padding-left: 10px; + float: left; + width: 390px; + text-align: left; +} + +#site_description { + font-size: 90%; +} + +/* ヘッダーナビ +----------------------------------------------- */ + +div#header_navi { + float: right; + width: 409px; + height: 38px; + + ul li { + display: block; + float: left; + + &.mypage, &.entry { + margin-top: 6px; + } + } +} + +/* ============================================== + フッター +=============================================== */ + +#footer_wrap { + margin: 0 auto; + width: 980px; + height: 80px; + background: #fff; +} + +#footer { + margin: auto; + padding-top: 10px; + border-top: solid 1px #ccc; + width: 950px; +} + +#pagetop { + width: 210px; + float: right; + text-align: right; +} + +#copyright { + width: 740px; + float: left; + text-align: left; + font-size: 97%; +} + +/* ============================================== + パーツ +=============================================== */ +/* ボタン +----------------------------------------------- */ + +.btn_area { + margin-top: 10px; + width: 100%; + text-align: center; + + li { + padding-right: 10px; + display: inline; + } +} + +/* 完了メッセージ +----------------------------------------------- */ + +div { + &#complete_area { + margin-bottom: 20px; + + .message { + margin-bottom: 20px; + line-height: 150%; + font-weight: bold; + font-size: 120%; + } + } + + &#undercolumn_entry .message { + margin-bottom: 20px; + line-height: 150%; + font-weight: bold; + font-size: 120%; + } + + &#complete_area .shop_information { + margin-top: 40px; + padding: 20px 0 0 0; + border-top: solid 1px #ccc; + + .name { + margin-bottom: 10px; + font-weight: bold; + font-size: 140%; + } + } +} + +@charset "utf-8"; + +/************************************************ + 各ページコンテンツ用 +************************************************ */ +/* ============================================== +▼TOP +=============================================== */ +/* メインイメージ +----------------------------------------------- */ + +#main_image { + margin-bottom: 10px; + text-align: center; +} + +/* ============================================== +▼下層 +=============================================== */ +/* ============================================== +▼ガイド +=============================================== */ +/* ◎◎について +----------------------------------------------- */ + +div { + &#undercolumn_aboutus, &#undercolumn_order {} + + &#undercolumn_contact { + margin: 0 auto; + width: 100%; + } +} + +/* 特定商取引法 +----------------------------------------------- */ + +/* お問い合わせ +----------------------------------------------- */ + +.zipimg img { + vertical-align: middle; +} + +/* ============================================== +▼MYページ +=============================================== */ +/* 共通設定 +----------------------------------------------- */ + +div { + &#mypagecolumn, &#mynavi_area, &#mycontents_area { + width: 100%; + } + + &#mynavi_area { + .mynavi_list { + margin-bottom: 20px; + width: 100%; + + li { + margin: 0 15px 5px 0; + padding-left: 15px; + float: left; + background: url('../img/icon/ico_arrow_01.gif') no-repeat left; + font-size: 120%; + } + } + + div.point_announce { + margin-bottom: 30px; + padding: 10px; + border: solid 1px #ffcc62; + background-color: #fffaf0; + + p { + padding-left: 20px; + background: url('../img/icon/ico_point.gif') no-repeat left; + } + } + } + + &#mycontents_area p.inforamtion { + margin-bottom: 20px; + } + + &#mypagecolumn h4 { + margin: 10px auto; + border-bottom: 1px solid #999; + text-align: left; + font-size: 120%; + } + + &#mycontents_area div.mycondition_area { + margin: 0 auto 20px 0; + padding: 10px; + border: solid 1px #ccc; + width: 97%; + background: #f9f9f9; + + p { + float: left; + } + + .btn { + width: 160px; + margin-top: 15px; + float: right; + } + } +} + +/* 購入履歴一覧/詳細 +----------------------------------------------- */ + +.add_address { + margin-bottom: 20px; +} + +/* 会員登録内容変更/退会 +----------------------------------------------- */ + +div { + &#mycontents_area .message_area { + margin: 30px auto; + padding: 30px; + border: 1px solid #ccc; + text-align: center; + + p { + margin-bottom: 20px; + } + } + + &#undercolumn_entry { + width: 100%; + + .kiyaku_text { + margin: 20px auto; + padding: 10px; + border: solid 1px #ccc; + width: 94%; + background: #fff; + } + } + + &#undercolumn_login { + margin: 0 auto; + width: 100%; + + .login_area { + margin-bottom: 30px; + + .inputbox { + margin: 15px auto 15px auto; + padding: 15px 20px 10px 20px; + background: #f0f0f0; + + .btn_area { + margin-top: 0; + } + } + } + } + + &#undercolumn_error .message_area { + width: 80%; + margin: 30px auto; + padding: 30px; + border: 1px solid #ccc; + text-align: center; + + .error { + padding: 120px 0; + } + } +} + +/* ============================================== +▼会員登録 +=============================================== */ + +/* ============================================== +▼ログイン +=============================================== */ + +/* ============================================== +▼エラー +=============================================== */ + +/* ============================================== +▼商品一覧 +=============================================== */ +/* ページ送り +----------------------------------------------- */ + +.pagenumber_area { + padding-bottom: 10px; + background: url("../img/background/line_dot_01.gif") repeat-x bottom; +} + +.pagecond_area { + margin-bottom: 20px; + padding: 10px; +} + +.pagenumber_area { + margin: 20px 0; +} + +.pagecond_area { + border: 1px solid #ccc; +} + +.pagenumber_area { + .navi { + width: 100%; + text-align: left; + + li { + display: inline; + } + } + + .change { + float: right; + text-align: right; + white-space: nowrap; + } +} + +/* レイアウト +----------------------------------------------- */ + +div { + &.list_area { + padding: 0 0 30px 0; + width: 100%; + overflow: auto; + } + + &.listphoto { + float: left; + } +} + +/* メインカラム用 1カラム時*/ + +#main_column { + &.colnum1 div.listrightbloc { + float: right; + width: 74%; + } + + &.colnum2 div.listrightbloc { + float: right; + width: 80%; + } + + &.colnum3 div.listrightbloc { + float: right; + width: 74%; + } +} + +/* メインカラム用 2カラム時*/ + +/* メインカラム用 3カラム時*/ + +/* 商品情報 各種設定 +----------------------------------------------- */ +/* 商品ステータス */ + +div.listrightbloc { + ul.status_icon { + margin-bottom: 10px; + width: 100%; + + li { + margin-right: 5px; + float: left; + } + } + + h3 { + font-weight: bold; + font-size: 120%; + } + + .listcomment { + margin: 0 0 10px 0; + text-align: left; + } + + .detail_btn { + margin-bottom: 20px; + } + + .pricebox { + margin: 0 0 10px 0; + } + + .cart_area { + padding: 10px; + border: 1px solid #cef0f4; + background-color: #ecf5ff; + width: 94%; + } + + .classlist { + margin-bottom: 10px; + padding-bottom: 10px; + background: url("../img/background/line_dot_02.gif") repeat-x bottom; + } + + dl { + width: 100%; + } + + dt { + display: inline-block; + vertical-align: top; + } + + dd { + padding-bottom: 10px; + display: inline-block; + + p.attention { + margin-top: 5px; + } + } + + .cartin { + margin: 0; + float: right; + + .quantity { + padding: 3px 10px 0 0; + width: 150px; + float: left; + text-align: right; + + .box { + width: 70px; + } + } + } + + .cartin_btn { + width: 160px; + float: left; + } +} + +/* 商品名 */ + +/* コメント */ + +/* 商品詳細を見る */ + +/* 価格 */ + +/* 買い物カゴ */ + +/* 規格 */ + +/* カゴに入れる */ + +/* ============================================== +▼商品詳細 +=============================================== */ +/* レイアウト + + tplファイルのマークアップが同じ項目 + * 1カラム時 + * 2カラム時 + * 3カラム時 + +----------------------------------------------- */ + +#detailarea, .sub_area { + margin-bottom: 20px; + width: 100%; +} + +/* レイアウト +----------------------------------------------- */ +/* 1カラム用 */ + +#main_column { + &.colnum1 { + div#detailphotobloc { + width: 37%; + float: left; + } + + #detailrightbloc { + width: 63%; + float: right; + } + + div { + &.subtext { + margin-bottom: 20px; + float: left; + width: 69%; + } + + &.subphotoimg { + float: right; + width: 25%; + text-align: right; + } + } + + p.subtext { + margin-bottom: 20px; + } + } + + &.colnum2 { + div#detailphotobloc { + float: left; + width: 37%; + } + + #detailrightbloc { + float: right; + width: 63%; + } + + div.subtext { + margin-bottom: 20px; + float: left; + width: 73%; + } + + p.subtext { + margin-bottom: 20px; + } + + div.subphotoimg { + float: right; + width: 25%; + text-align: right; + } + } + + &.colnum3 { + div#detailphotobloc { + float: left; + width: 49%; + } + + #detailrightbloc { + float: right; + width: 50%; + } + + div.subtext { + margin-bottom: 20px; + float: left; + width: 63%; + } + + p.subtext { + margin-bottom: 20px; + } + + div.subphotoimg { + float: right; + width: 35%; + text-align: right; + } + } +} + +/* 2カラム用 */ + +/* 3カラム用 */ + +/* 商品情報 各種設定 +----------------------------------------------- */ + +#detailrightbloc { + h2 { + margin: 0 0 10px 0; + padding: 0 0 15px 0; + color: #666; + background: url("../img/background/line_dot_01.gif") repeat-x bottom; + font-weight: bold; + font-size: 160%; + } + + .point, .relative_cat { + margin: 0 0 10px 0; + padding: 0 0 10px 0; + background: url("../img/background/line_dot_01.gif") repeat-x bottom; + } + + .main_comment { + margin-bottom: 20px; + } + + .product_code { + dt, dd { + display: inline; + } + } + + ul.status_icon { + margin-bottom: 10px; + width: 100%; + + li { + margin-right: 5px; + margin-bottom: 3px; + float: left; + } + } + + .normal_price { + dt, dd { + display: inline; + } + } + + .sale_price { + dt, dd { + display: inline; + } + } + + .point { + dt, dd { + display: inline; + } + } + + div.classlist { + margin-bottom: 10px; + padding-bottom: 10px; + width: 100%; + background: url("../img/background/line_dot_02.gif") repeat-x bottom; + } + + .classlist { + margin-bottom: 5px; + } + + ul { + margin-bottom: 10px; + width: 100%; + + li { + vertical-align: top; + float: left; + } + } + + .maker { + dt, dd { + display: inline; + } + } + + .comment1 { + dt, dd { + display: inline; + } + } + + .relative_cat dd { + margin-left: 1em; + } + + .cart_area { + padding: 10px; + background-color: #ecf5ff; + border: 1px solid #cef0f4; + } + + .quantity { + dt, dd { + display: inline; + } + } + + .cartin, .cartin_btn { + text-align: center; + } + + .favorite_btn { + text-align: center; + margin-top: 10px; + } +} + +/* 商品コード */ + +/* 商品ステータス */ + +/* 通常価格 */ + +/* 販売価格 */ + +/* ポイント */ + +/* 規格 */ + +/* メーカー */ + +/* メーカーURL */ + +/* 関連カテゴリ */ + +/* 買い物カゴ */ + +/* お客様の声 +----------------------------------------------- */ + +div { + &#customervoice_area { + clear: both; + padding: 35px 0 0 0; + + h2 { + margin-bottom: 20px; + padding: 6px 0 8px 10px; + border-top: solid 1px #f90; + background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom; + } + + .review_bloc { + margin-bottom: 20px; + padding: 10px; + background-color: #f6f6f6; + + p { + padding-top: 3px; + margin-right: 10px; + float: left; + } + + .review_btn { + float: right; + width: 160px; + } + } + + ul li { + padding-bottom: 15px; + margin-bottom: 15px; + background: url("../img/background/line_dot_01.gif") repeat-x bottom; + } + + .voicetitle { + margin-bottom: 5px; + color: #333; + font-weight: bold; + } + + .voicedate { + margin-bottom: 10px; + } + } + + &#whobought_area { + clear: both; + padding: 35px 0 0 0; + + h2 { + border-top: solid 1px #f90; + background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom; + padding: 5px 0 8px 10px; + font-size: 14px; + } + } + + &#undercolumn_cart { + .point_announce { + padding: 20px; + margin-bottom: 20px; + border: solid 1px #ffcc62; + background: #fffaf0; + font-size: 120%; + text-align: center; + line-height: 140%; + } + + .totalmoney_area { + margin-bottom: 20px; + } + + p { + margin: 10px 5px; + } + } + + &#undercolumn { + ul#quantity_level li { + padding: 3px; + display: inline; + } + + .empty { + text-align: left; + } + } + + &.form_area { + margin-bottom: 30px; + } + + &#undercolumn_customer {} +} + +/* 関連商品（商品部分はbloc.cssのおすすめ商品と共通） +----------------------------------------------- */ + +/* *********************************************** +▼カートの中 +/*********************************************** */ +/* 現在のカゴの中 +----------------------------------------------- */ + +/* お客様情報入力 +----------------------------------------------- */ + +.flow_area { + margin: 0 0 20px 0; +} + +div { + &#undercolumn_customer th em { + color: #000; + font-weight: bold; + } + + &#undercolumn_shopping { + .pay_area { + margin: 0 auto 30px; + width: 100%; + } + + .pay_area02 { + margin: 40px auto 30px auto; + + .txtarea { + margin: 5px 0 0 0; + padding: 2px; + border: 1px solid #ccc; + width: 99%; + height: 150px; + } + + .select-msg { + margin-bottom: 10px; + } + } + + .point_area { + margin: 40px auto 0 auto; + + .point_announce { + padding: 20px; + border: 1px solid #ccc; + } + + p { + margin-bottom: 20px; + } + + .point_announce li { + margin-bottom: 5px; + } + } + } +} + +/* お支払い方法・お届け時間等の指定 +----------------------------------------------- */ + +/* お届け先の指定 +----------------------------------------------- */ + +#address_area { + margin-bottom: 10px; + width: 100%; + + .information { + width: 65%; + float: left; + } +} + +#undercolumn_shopping .information { + margin-bottom: 15px; +} + +#address_area { + .add_multiple { + padding: 15px 10px; + border: 1px solid #ffcc62; + float: right; + width: 30%; + color: #555; + background: #fffaf0; + text-align: center; + font-weight: bold; + + p { + margin-bottom: 10px; + } + } + + p.addbtn { + font-weight: bold; + font-size: 10px; + } +} + +/* ============================================== +▼検索結果 +=============================================== */ + +p.condition_area { + margin: 0 auto; + padding: 5px; + border: solid 1px #333; + width: 566px; +} + +@charset "utf-8"; + +/************************************************ + tables +************************************************ */ +/* デフォルトテーブル +----------------------------------------------- */ + +table { + margin: 15px auto 20px auto; + border-top: 1px solid #ccc; + border-left: 1px solid #ccc; + width: 100%; + border-collapse: collapse; + text-align: left; + + th { + padding: 8px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + color: #333; + background-color: #f0f0f0; + font-weight: normal; + } + + td { + padding: 8px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + } +} + +/* 見出し +----------------------------------------------- */ + +div { + &#undercolumn_shopping table { + th[scope=col] { + text-align: center; + } + + &.delivname th { + width: 155px; + } + } + + &#mycontents_area table { + th { + text-align: left; + + &.alignR { + text-align: right; + } + + &.alignL { + text-align: left; + } + + &.alignC { + text-align: center; + } + + &.resulttd { + text-align: right; + } + } + + caption { + padding: 8px; + border-top: 1px solid #ccc; + border-right: 1px solid #ccc; + border-left: 1px solid #ccc; + color: #000; + background-color: #f0f0f0; + text-align: left; + font-weight: bold; + } + } +} + +/* MYページ */ + +/* その他 +----------------------------------------------- */ + +table select { + margin-bottom: 7px; + border: solid 1px #ccc; +} + +@charset "utf-8"; + +/************************************************ + ブロック用 +************************************************ */ +/*** 目次 *** + +▼ブロック共通 +リスト +タイトル +ヘッダー上、フッター下のブロックエリア + +▼各機能ブロックの指定 +-新着情報 +-現在のカゴの中 +-カテゴリ +-ガイドリンク +-ログイン（サイド用） +-検索 +-カレンダー +-おすすめ商品 + * 商品詳細のオススメ商品 [whobought_area] +*/ + +/* ============================================== +ブロック共通 + * #container から指定することで、ヘッダー・フッターには適用していない。 +/* ============================================= */ + +.side_column { + overflow-x: hidden; + + /* IE6 表示乱れ防止 */ + + .block_body { + border: solid 1px #ccc; + border-top: none; + } +} + +#main_column .block_body { + border: solid 1px #ccc; + border-top: none; +} + +.side_column .block_body .box { + border: solid 1px #ccc; + width: 145px; +} + +/* 外枠 +----------------------------------------------- */ + +#container { + .block_outer { + padding: 0 15px 10px; + + /* #container の背景色を欠けさせないため敢えて padding */ + } + + #main_column .block_outer { + padding: 0 0 20px; + } + + .side_column .block_outer { + padding: 0 7% 10px; + } + + .block_outer .block_body dl.formlist { + margin-bottom: 8px; + + dd { + margin-bottom: 5px; + } + + dt { + margin-bottom: 3px; + padding-left: 15px; + background: url("../img/icon/ico_arrow_03.gif") no-repeat left; + font-size: 90%; + } + + span { + vertical-align: top; + } + } +} + +/* リスト +----------------------------------------------- */ +/* ログイン 検索条件 */ + +/* タイトル +----------------------------------------------- */ +/* タイトルの背景 白 */ + +#login_area h2, #search_area h2, #calender_area h2, #cart_area h2, #cart h2 { + padding: 5px 0 8px 10px; + border-style: solid; + border-color: #f90 #ccc #ccc; + border-width: 1px 1px 0; + background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; + font-size: 14px; +} + +#category_area h2 { + border-top: solid 1px #f90; + background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; + padding: 5px 0 8px 10px; + font-size: 14px; +} + +/* タイトルの背景 オレンジ */ + +#recommend_area h2 { + padding: 5px 0 8px 10px; + border-style: solid; + border-color: #f90 #ccc #ccc; + border-width: 1px 1px 0; + background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8; +} + +#news_area { + h2 { + padding: 5px 0 8px 10px; + border-style: solid; + border-color: #f90 #ccc #ccc; + border-width: 1px 1px 0; + background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8; + } + + .news_contents { + padding: 10px; + max-height: 260px; + height: auto !important; + + /* hack? */ + height: 260px; + + /* hack? */ + overflow: auto; + overflow-y: scroll; + } + + dl.newslist { + background: url("../img/background/line_dot_01.gif") repeat-x bottom; + + &:last-child { + /* IE9 未満では無効 (影響度合いが低いので黙殺) */ + background: none; + } + + dt { + margin-bottom: 5px; + } + + dd { + margin-bottom: 10px; + padding-bottom: 10px; + } + } +} + +/* *********************************************** +▼各機能ブロックの指定 +/*********************************************** */ + +/* =============================================== +▼新着情報 +=============================================== */ + +/* =============================================== +▼現在のカゴの中 +=============================================== */ + +#cart_area { + .information { + padding: 10px; + } + + .postage { + margin-top: 10px; + padding-top: 10px; + background: url("../img/background/line_dot_01.gif") repeat-x top; + + .point_announce { + padding: 2px 0 2px 20px; + background: url("../img/icon/ico_price.gif") no-repeat left top; + } + } + + .btn { + padding: 10px 0; + background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6; + text-align: center; + } +} + +/* =============================================== +▼カテゴリ +=============================================== */ + +#container #category_area .block_body { + background-color: #fffaf0; +} + +#category_area li { + padding-left: 5px; + + &.level1 { + border-bottom: solid 1px #ccc; + + p { + padding-left: 20px; + margin: 7px 3px; + background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat; + } + + li p { + background: url("../img/icon/ico_level.gif") 7px 7px no-repeat; + } + } + + a { + display: block; + padding: 0; + } +} + +a.onlink { + &:link { + color: #f00; + text-decoration: underline; + } + + &:visited, &:hover { + color: #f00; + } +} + +/* =============================================== +▼ガイドリンク +=============================================== */ + +#guide_area { + border: none; + + li { + margin-bottom: 5px; + letter-spacing: -0.05em; + } +} + +ul.button_like li { + margin: 0; + padding: 0 0 1px 0; + background: url("../img/background/bg_btn_list.jpg") bottom repeat-x; + + a { + margin: 0; + padding: 10px 15px 10px 10px; + border: 1px solid; + border-bottom: none; + border-color: #ccc; + display: block; + background: url("../img/icon/ico_arrow_02.gif") no-repeat right; + text-decoration: none; + outline: none; + } +} + +/* =============================================== +▼ログイン（サイド用） +※ヘッダー用はbloc_alpha.css内に記述 +=============================================== */ + +#container { + div#login_area .block_body { + padding: 10px; + + p { + margin-bottom: 5px; + } + + .btn { + text-align: center; + } + } + + .login_area dl.formlist { + margin-bottom: 8px; + width: 450px; + + dt { + margin-bottom: 3px; + padding-left: 15px; + color: #333; + background: url("../img/icon/ico_arrow_03.gif") no-repeat left; + width: 120px; + float: left; + font-size: 90%; + } + + dd { + margin-bottom: 5px; + float: right; + width: 300px; + vertical-align: bottom; + text-align: left; + } + } + + div { + &#login_area .block_body .mini { + margin-top: 5px; + letter-spacing: -0.01em; + } + + &#search_area .block_body { + padding: 10px; + + .btn { + text-align: center; + } + } + } +} + +/* =============================================== +▼検索 +=============================================== */ + +/* =============================================== +▼カレンダー +=============================================== */ + +#calender_area { + background-color: transparent; + border: none; + + .block_body { + padding: 10px 0; + background-color: #f1f9fc; + } + + table { + background: #fff; + border: none; + width: 150px; + margin: 0 auto 5px; + font-size: 90%; + + td { + padding: 1px 3px; + border-top: 1px solid #ccc; + border-right: none; + text-align: center; + } + } + + th { + padding: 1px 3px; + background: #fff; + border: none; + text-align: center; + } + + table .month { + margin-bottom: 5px; + padding-left: 12px; + background: url("../img/icon/ico_arrow_04.gif") no-repeat left; + font-size: 120%; + } + + .off { + color: #f00; + } + + .today { + background-color: #FFF99D; + font-weight: bold; + } + + .information { + margin-left: 10px; + font-size: 90%; + } +} + +/* =============================================== +▼おすすめ商品 +=============================================== */ +/* + tplファイルのマークアップが同じ項目 + メインカラム用 + サイドカラム用 [side_column] + 商品詳細のオススメ商品 [whobought_area] +=============================================== */ +/* 共通 +----------------------------------------------- */ + +#recommend_area .block_body, #whobought_area .product_item { + padding: 10px 0 10px; + border: none; + background: url("../img/background/line_dot_01.gif") repeat-x bottom; +} + +#recommend_area .block_body p, #whobought_area .product_item p { + margin: 0 0 5px 0; +} + +#recommend_area .block_body img, #whobought_area .product_item img { + margin: 0 5px 0 0; +} + +#recommend_area .block_body h3, #whobought_area .product_item h3 { + font-size: 100%; + font-weight: normal; +} + +/* サイドカラム用 */ + +.side_column #recommend_area .product_item { + margin-bottom: 10px; +} + +/* 画像 +----------------------------------------------- */ +/* メインカラム用 */ + +#main_column #recommend_area .block_body .productImage, #whobought_area .product_item .productImage { + margin-bottom: 10px; + float: left; + width: 90px; +} + +/* サイドカラム用 */ + +.side_column #recommend_area .block_body .productImage { + float: none; + text-align: center; + width: auto; +} + +/* 左右の振り分け +----------------------------------------------- */ + +#main_column #recommend_area .product_item, #whobought_area .product_item { + float: left; + width: 47.5%; + padding-left: 1%; + padding-right: 1%; +} + +/* 商品説明テキスト +----------------------------------------------- */ +/* メインカラム用 1カラム時*/ + +#main_column { + &.colnum1 #recommend_area .block_body .productContents { + float: right; + width: 74%; + } + + &.colnum2 { + #recommend_area .block_body .productContents, #whobought_area .productContents { + float: right; + width: 74%; + } + } + + &.colnum3 { + #recommend_area .block_body .productContents, #whobought_area .productContents { + float: right; + width: 67%; + } + } +} + +/* メインカラム用 2カラム時*/ + +/* メインカラム用 3カラム時*/ + +/* サイドカラム用 */ + +.side_column #recommend_area .block_body .productContents { + clear: both; +} + +@charset "utf-8"; + +/************************************************ + インヘッダーブロック +************************************************ */ + +#headerInternalColumn { + margin-top: 5px; + float: right; + width: 520px; + height: 35px; +} + +/* ログイン（ヘッダー用） +----------------------------------------------- */ + +#header_login_area { + padding: 0 10px; + border: solid 1px #ffc979; + height: 30px; + background: #fef3d3; + letter-spacing: -0.075em; + + ul.formlist { + margin-top: 5px; + + li { + float: left; + + &.mail { + padding-left: 28px; + width: 155px; + background: url("../img/common/ico_arrow_login.gif") no-repeat left; + font-size: 90%; + } + + &.password { + padding-right: 5px; + } + + &.login_memory { + padding-right: 5px; + font-size: 90%; + } + + &.forgot { + margin-top: 3px; + padding-right: 5px; + font-size: 90%; + } + + &.btn { + padding-right: 5px; + width: 53px; + } + } + } + + p.btn { + height: 20px; + padding: 5px 0; + vertical-align: middle; + + input[type=image] { + vertical-align: middle; + } + } +} + +/* *********************************************** +追加ブロック +************************************************ */ +/* 共通 +----------------------------------------------- */ + +#container .block_outer #banner_area .block_body { + border: none; +} + +/* 【メイン】バナーエリア_02 +----------------------------------------------- */ + +#main_column .block_outer #banner_area .block_body ul { + width: 100%; + + li { + float: left; + + &.sub_01 { + padding-right: 8px; + } + } +} + +/* 【サイド】バナーエリア_01 +----------------------------------------------- */ +/* 【サイド】バナーエリア_02 +----------------------------------------------- */ + +#leftcolumn .block_outer #banner_area .block_body ul li, #rightcolumn .block_outer #banner_area .block_body ul li { + margin-bottom: 8px; +} + +@charset "utf-8"; + +/************************************************ + ポップアップウィンドウ +************************************************ */ +/* 共通 +----------------------------------------------- */ + +div { + &#windowcolumn { + border-top: solid 3px #f90; + width: 560px; + height: 100%; + margin: 15px 15px 0 15px; + background: #fff; + + h2 { + margin-bottom: 10px; + padding: 8px; + border-top: solid 1px #ebeced; + color: #f60; + background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom; + background-color: #fef3d8; + font-size: 170%; + } + } + + &#window_area { + margin: 15px auto 0 auto; + padding-bottom: 20px; + width: 540px; + min-height: 300px; + height: auto !important; + + p.information { + margin-bottom: 20px; + } + + .message { + margin-bottom: 20px; + color: #f60; + line-height: 150%; + font-weight: bold; + font-size: 140%; + } + + table { + width: 540px; + } + + #forgot { + margin: 0 auto; + padding: 20px; + width: 440px; + border: 1px solid #ccc; + text-align: left; + + .mailaddres { + margin-bottom: 10px; + } + + p { + text-align: center; + } + } + } + + &#bigimage, &#cartimage { + margin-top: 15px; + background-color: #fff; + text-align: center; + } + + &#bigimage img, &#cartimage img { + padding: 10px; + background-color: #fff; + } + + &#zipsearchcolumn { + margin: 15px auto 0 auto; + border-top: 5px solid #ffa85c; + border-bottom: 5px solid #ffa85c; + width: 460px; + background-color: #fff; + + h2 { + margin: 0 0 15px 0; + width: 460px; + } + } + + &#zipsearch_area { + margin: 15px auto 0 auto; + width: 460px; + } + + &#zipsearchcolumn .btn { + margin: 15px 0 30px 0; + text-align: center; + } + + &#zipsearch_area #completebox p { + padding: 60px 5px; + text-align: center; + } +} + +/* お客様の声の書き込み、新しいお届け先の追加・変更 +----------------------------------------------- */ + +/* 商品詳細拡大写真、カート拡大写真 +----------------------------------------------- */ + +/* 郵便番号検索 +----------------------------------------------- */ + +@charset "utf-8"; + +/************************************************ + 印刷用 +************************************************ */ + +@media print { + body { + zoom: 75%; + } +} From 84e65a713289ced15b856ec6c10168bfd7636284 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 20 Dec 2023 19:50:58 +0900 Subject: [PATCH 14/44] =?UTF-8?q?CSS=20Nesting=20Module=20=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=9F=E5=AE=9F=E8=A3=85=20#783=20(PC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 目視で気になった点を調整した。 --- html/user_data/packages/default/style.css | 1148 +++++++++++---------- 1 file changed, 606 insertions(+), 542 deletions(-) diff --git a/html/user_data/packages/default/style.css b/html/user_data/packages/default/style.css index 81fa73eb28..43b59696f6 100644 --- a/html/user_data/packages/default/style.css +++ b/html/user_data/packages/default/style.css @@ -4,13 +4,73 @@ ブラウザリセット ************************************************ */ -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +font, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td { margin: 0; padding: 0; border: 0; } -table, caption, th, td { +table, +caption, +th, +td { margin: 0; padding: 0; border: 0; @@ -21,28 +81,32 @@ table, caption, th, td { font-weight: normal; } -a img, iframe { +a img, +iframe { border: none; } -ol, ul, li { +ol, +ul, +li { list-style: none; } -input, textarea, select, button { +input, +textarea, +select, +button { font-size: 100%; font-family: inherit; } -@charset "utf-8"; - /************************************************ 共通設定 ************************************************ */ body { color: #666; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: Verdana, Arial, Helvetica, sans-serif; background-color: #f5f5f5; font-size: 72.5%; line-height: 150%; @@ -86,25 +150,30 @@ img.picture { #main_column { padding: 10px 0 0; + /* 1カラム時 */ &.colnum1 { margin: 0 auto; width: 80%; } + /* 2カラム時 (共通) */ &.colnum2 { width: 78%; + /* 2カラム時 (メイン部が左) */ &.left { padding-left: 1.5%; float: left; } + /* 2カラム時 (メイン部が右) */ &.right { padding-right: 1.5%; float: right; } } + /* 3カラム時 */ &.colnum3 { padding-left: 0.5%; width: 59%; @@ -112,16 +181,6 @@ img.picture { } } -/* 1カラム時 */ - -/* 2カラム時 (共通) */ - -/* 2カラム時 (メイン部が左) */ - -/* 2カラム時 (メイン部が右) */ - -/* 3カラム時 */ - /* サイドカラム ----------------------------------------------- */ @@ -143,7 +202,9 @@ img.picture { ----------------------------------------------- */ /* ヘッダーとフッターの上下 */ -#topcolumn, #bottomcolumn, #footerbottomcolumn { +#topcolumn, +#bottomcolumn, +#footerbottomcolumn { margin: 0px; background: #fff; text-align: left; @@ -172,10 +233,6 @@ img.picture { visibility: hidden; content: "."; } - - display: block; - - /* for IE8 */ } .clear { @@ -186,12 +243,15 @@ img.picture { ----------------------------------------------- */ a { - &:link, &:visited { + + &:link, + &:visited { color: #39c; text-decoration: none; } - &:link:hover, &[href]:hover { + &:link:hover, + &[href]:hover { color: #f60; text-decoration: underline; } @@ -200,7 +260,11 @@ a { /* フォント ----------------------------------------------- */ -h1, h2, h3, h4, h5 { +h1, +h2, +h3, +h4, +h5 { font-size: 100%; line-height: 150%; } @@ -270,7 +334,9 @@ select { } input { - &[type='text'], &[type='password'] { + + &[type='text'], + &[type='password'] { border: solid 1px #ccc; padding: 2px; } @@ -325,9 +391,9 @@ input { } /* フォームが縦に重なり合う場合に併用する余白 */ +/* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */ .top { - /* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */ margin-bottom: 5px; } @@ -339,22 +405,26 @@ h2.title { padding: 8px; border-top: solid 1px #ebeced; color: #f60; - background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom; + background: url("img/background/bg_tit_sub_01.jpg") repeat-x left bottom; background-color: #fef3d8; font-size: 170%; } -#main_column .sub_area h3, #undercolumn_login .login_area h3, #undercolumn_shopping h3, #mypagecolumn h3, #undercolumn_cart h3 { +#main_column .sub_area h3, +#undercolumn_login .login_area h3, +#undercolumn_shopping h3, +#mypagecolumn h3, +#undercolumn_cart h3 { margin: 0 0 10px 0; padding: 5px 0 10px; color: #f60; - background: url("../img/background/line_01.gif") repeat-x left bottom; + background: url("img/background/line_01.gif") repeat-x left bottom; font-size: 120%; } -div#undercolumn_login .login_area h4 { +#undercolumn_login .login_area h4 { padding-left: 15px; - background: url("../img/icon/ico_arrow_05.gif") no-repeat left; + background: url("img/icon/ico_arrow_05.gif") no-repeat left; } /* ============================================== @@ -366,7 +436,7 @@ div#undercolumn_login .login_area h4 { #header_wrap { border-top: solid 3px #f90; min-height: 82px; - background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0; + background: url("img/common/bg_header.gif") repeat-x bottom #fffaf0; } #header { @@ -405,7 +475,7 @@ div#undercolumn_login .login_area h4 { /* ヘッダーナビ ----------------------------------------------- */ -div#header_navi { +#header_navi { float: right; width: 409px; height: 38px; @@ -414,7 +484,8 @@ div#header_navi { display: block; float: left; - &.mypage, &.entry { + &.mypage, + &.entry { margin-top: 6px; } } @@ -503,8 +574,6 @@ div { } } -@charset "utf-8"; - /************************************************ 各ページコンテンツ用 ************************************************ */ @@ -527,21 +596,20 @@ div { =============================================== */ /* ◎◎について ----------------------------------------------- */ - -div { - &#undercolumn_aboutus, &#undercolumn_order {} - - &#undercolumn_contact { - margin: 0 auto; - width: 100%; - } +#undercolumn_aboutus { } /* 特定商取引法 ----------------------------------------------- */ +#undercolumn_order { +} /* お問い合わせ ----------------------------------------------- */ +#undercolumn_contact { + margin: 0 auto; + width: 100%; +} .zipimg img { vertical-align: middle; @@ -553,71 +621,77 @@ div { /* 共通設定 ----------------------------------------------- */ -div { - &#mypagecolumn, &#mynavi_area, &#mycontents_area { - width: 100%; - } - - &#mynavi_area { - .mynavi_list { - margin-bottom: 20px; - width: 100%; - - li { - margin: 0 15px 5px 0; - padding-left: 15px; - float: left; - background: url('../img/icon/ico_arrow_01.gif') no-repeat left; - font-size: 120%; - } - } +#mypagecolumn { + width: 100%; +} - div.point_announce { - margin-bottom: 30px; - padding: 10px; - border: solid 1px #ffcc62; - background-color: #fffaf0; +#mynavi_area { + width: 100%; +} - p { - padding-left: 20px; - background: url('../img/icon/ico_point.gif') no-repeat left; - } - } - } +#mycontents_area { + width: 100%; +} - &#mycontents_area p.inforamtion { +#mynavi_area { + .mynavi_list { margin-bottom: 20px; - } + width: 100%; - &#mypagecolumn h4 { - margin: 10px auto; - border-bottom: 1px solid #999; - text-align: left; - font-size: 120%; + li { + margin: 0 15px 5px 0; + padding-left: 15px; + float: left; + background: url('img/icon/ico_arrow_01.gif') no-repeat left; + font-size: 120%; + } } - &#mycontents_area div.mycondition_area { - margin: 0 auto 20px 0; + div.point_announce { + margin-bottom: 30px; padding: 10px; - border: solid 1px #ccc; - width: 97%; - background: #f9f9f9; + border: solid 1px #ffcc62; + background-color: #fffaf0; p { - float: left; - } - - .btn { - width: 160px; - margin-top: 15px; - float: right; + padding-left: 20px; + background: url('img/icon/ico_point.gif') no-repeat left; } } } +#mycontents_area p.inforamtion { + margin-bottom: 20px; +} + +#mypagecolumn h4 { + margin: 10px auto; + border-bottom: 1px solid #999; + text-align: left; + font-size: 120%; +} + /* 購入履歴一覧/詳細 ----------------------------------------------- */ +#mycontents_area div.mycondition_area { + margin: 0 auto 20px 0; + padding: 10px; + border: solid 1px #ccc; + width: 97%; + background: #f9f9f9; + + p { + float: left; + } + + .btn { + width: 160px; + margin-top: 15px; + float: right; + } +} + .add_address { margin-bottom: 20px; } @@ -625,73 +699,71 @@ div { /* 会員登録内容変更/退会 ----------------------------------------------- */ -div { - &#mycontents_area .message_area { - margin: 30px auto; - padding: 30px; - border: 1px solid #ccc; - text-align: center; +#mycontents_area .message_area { + margin: 30px auto; + padding: 30px; + border: 1px solid #ccc; + text-align: center; - p { - margin-bottom: 20px; - } + p { + margin-bottom: 20px; } +} - &#undercolumn_entry { - width: 100%; +/* ============================================== +▼会員登録 +=============================================== */ - .kiyaku_text { - margin: 20px auto; - padding: 10px; - border: solid 1px #ccc; - width: 94%; - background: #fff; - } - } +#undercolumn_entry { + width: 100%; - &#undercolumn_login { - margin: 0 auto; - width: 100%; + .kiyaku_text { + margin: 20px auto; + padding: 10px; + border: solid 1px #ccc; + width: 94%; + background: #fff; + } +} - .login_area { - margin-bottom: 30px; +/* ============================================== +▼ログイン +=============================================== */ - .inputbox { - margin: 15px auto 15px auto; - padding: 15px 20px 10px 20px; - background: #f0f0f0; +#undercolumn_login { + margin: 0 auto; + width: 100%; - .btn_area { - margin-top: 0; - } - } - } - } + .login_area { + margin-bottom: 30px; - &#undercolumn_error .message_area { - width: 80%; - margin: 30px auto; - padding: 30px; - border: 1px solid #ccc; - text-align: center; + .inputbox { + margin: 15px auto 15px auto; + padding: 15px 20px 10px 20px; + background: #f0f0f0; - .error { - padding: 120px 0; + .btn_area { + margin-top: 0; + } } } } /* ============================================== -▼会員登録 +▼エラー =============================================== */ -/* ============================================== -▼ログイン -=============================================== */ +#undercolumn_error .message_area { + width: 80%; + margin: 30px auto; + padding: 30px; + border: 1px solid #ccc; + text-align: center; -/* ============================================== -▼エラー -=============================================== */ + .error { + padding: 120px 0; + } +} /* ============================================== ▼商品一覧 @@ -701,7 +773,7 @@ div { .pagenumber_area { padding-bottom: 10px; - background: url("../img/background/line_dot_01.gif") repeat-x bottom; + background: url("img/background/line_dot_01.gif") repeat-x bottom; } .pagecond_area { @@ -737,40 +809,40 @@ div { /* レイアウト ----------------------------------------------- */ -div { - &.list_area { - padding: 0 0 30px 0; - width: 100%; - overflow: auto; - } +div.list_area { + padding: 0 0 30px 0; + width: 100%; + overflow: auto; +} - &.listphoto { - float: left; - } +div.listphoto { + float: left; } -/* メインカラム用 1カラム時*/ +/* メインカラム */ #main_column { + + /* 1カラム時 */ &.colnum1 div.listrightbloc { float: right; width: 74%; } + /* 2カラム時 */ &.colnum2 div.listrightbloc { float: right; width: 80%; } + /* 3カラム時 */ &.colnum3 div.listrightbloc { float: right; width: 74%; } } -/* メインカラム用 2カラム時*/ -/* メインカラム用 3カラム時*/ /* 商品情報 各種設定 ----------------------------------------------- */ @@ -787,24 +859,29 @@ div.listrightbloc { } } + /* 商品名 */ h3 { font-weight: bold; font-size: 120%; } + /* コメント */ .listcomment { margin: 0 0 10px 0; text-align: left; } + /* 商品詳細を見る */ .detail_btn { margin-bottom: 20px; } + /* 価格 */ .pricebox { margin: 0 0 10px 0; } + /* 買い物カゴ */ .cart_area { padding: 10px; border: 1px solid #cef0f4; @@ -812,10 +889,11 @@ div.listrightbloc { width: 94%; } + /* 規格 */ .classlist { margin-bottom: 10px; padding-bottom: 10px; - background: url("../img/background/line_dot_02.gif") repeat-x bottom; + background: url("img/background/line_dot_02.gif") repeat-x bottom; } dl { @@ -836,6 +914,7 @@ div.listrightbloc { } } + /* カゴに入れる */ .cartin { margin: 0; float: right; @@ -858,20 +937,6 @@ div.listrightbloc { } } -/* 商品名 */ - -/* コメント */ - -/* 商品詳細を見る */ - -/* 価格 */ - -/* 買い物カゴ */ - -/* 規格 */ - -/* カゴに入れる */ - /* ============================================== ▼商品詳細 =============================================== */ @@ -884,18 +949,20 @@ div.listrightbloc { ----------------------------------------------- */ -#detailarea, .sub_area { +#detailarea, +.sub_area { margin-bottom: 20px; width: 100%; } /* レイアウト ----------------------------------------------- */ -/* 1カラム用 */ #main_column { + + /* 1カラム用 */ &.colnum1 { - div#detailphotobloc { + #detailphotobloc { width: 37%; float: left; } @@ -924,8 +991,9 @@ div.listrightbloc { } } + /* 2カラム用 */ &.colnum2 { - div#detailphotobloc { + #detailphotobloc { float: left; width: 37%; } @@ -952,8 +1020,9 @@ div.listrightbloc { } } + /* 3カラム用 */ &.colnum3 { - div#detailphotobloc { + #detailphotobloc { float: left; width: 49%; } @@ -981,10 +1050,6 @@ div.listrightbloc { } } -/* 2カラム用 */ - -/* 3カラム用 */ - /* 商品情報 各種設定 ----------------------------------------------- */ @@ -993,27 +1058,32 @@ div.listrightbloc { margin: 0 0 10px 0; padding: 0 0 15px 0; color: #666; - background: url("../img/background/line_dot_01.gif") repeat-x bottom; + background: url("img/background/line_dot_01.gif") repeat-x bottom; font-weight: bold; font-size: 160%; } - .point, .relative_cat { + .point, + .relative_cat { margin: 0 0 10px 0; padding: 0 0 10px 0; - background: url("../img/background/line_dot_01.gif") repeat-x bottom; + background: url("img/background/line_dot_01.gif") repeat-x bottom; } .main_comment { margin-bottom: 20px; } + /* 商品コード */ .product_code { - dt, dd { + + dt, + dd { display: inline; } } + /* 商品ステータス */ ul.status_icon { margin-bottom: 10px; width: 100%; @@ -1025,29 +1095,39 @@ div.listrightbloc { } } + /* 通常価格 */ .normal_price { - dt, dd { + + dt, + dd { display: inline; } } + /* 販売価格 */ .sale_price { - dt, dd { + + dt, + dd { display: inline; } } + /* ポイント */ .point { - dt, dd { + + dt, + dd { display: inline; } } + /* 規格 */ div.classlist { margin-bottom: 10px; padding-bottom: 10px; width: 100%; - background: url("../img/background/line_dot_02.gif") repeat-x bottom; + background: url("img/background/line_dot_02.gif") repeat-x bottom; } .classlist { @@ -1064,22 +1144,30 @@ div.listrightbloc { } } + /* メーカー */ .maker { - dt, dd { + + dt, + dd { display: inline; } } + /* メーカーURL */ .comment1 { - dt, dd { + + dt, + dd { display: inline; } } + /* 関連カテゴリ */ .relative_cat dd { margin-left: 1em; } + /* 買い物カゴ */ .cart_area { padding: 10px; background-color: #ecf5ff; @@ -1087,12 +1175,15 @@ div.listrightbloc { } .quantity { - dt, dd { + + dt, + dd { display: inline; } } - .cartin, .cartin_btn { + .cartin, + .cartin_btn { text-align: center; } @@ -1102,191 +1193,167 @@ div.listrightbloc { } } -/* 商品コード */ - -/* 商品ステータス */ - -/* 通常価格 */ - -/* 販売価格 */ - -/* ポイント */ - -/* 規格 */ - -/* メーカー */ - -/* メーカーURL */ - -/* 関連カテゴリ */ - -/* 買い物カゴ */ - /* お客様の声 ----------------------------------------------- */ -div { - &#customervoice_area { - clear: both; - padding: 35px 0 0 0; - - h2 { - margin-bottom: 20px; - padding: 6px 0 8px 10px; - border-top: solid 1px #f90; - background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom; - } - - .review_bloc { - margin-bottom: 20px; - padding: 10px; - background-color: #f6f6f6; - - p { - padding-top: 3px; - margin-right: 10px; - float: left; - } - - .review_btn { - float: right; - width: 160px; - } - } - - ul li { - padding-bottom: 15px; - margin-bottom: 15px; - background: url("../img/background/line_dot_01.gif") repeat-x bottom; - } - - .voicetitle { - margin-bottom: 5px; - color: #333; - font-weight: bold; - } - - .voicedate { - margin-bottom: 10px; - } - } - - &#whobought_area { - clear: both; - padding: 35px 0 0 0; +#customervoice_area { + clear: both; + padding: 35px 0 0 0; - h2 { - border-top: solid 1px #f90; - background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom; - padding: 5px 0 8px 10px; - font-size: 14px; - } + h2 { + margin-bottom: 20px; + padding: 6px 0 8px 10px; + border-top: solid 1px #f90; + background: url('img/background/bg_tit_sub_01.jpg') repeat-x left bottom; } - &#undercolumn_cart { - .point_announce { - padding: 20px; - margin-bottom: 20px; - border: solid 1px #ffcc62; - background: #fffaf0; - font-size: 120%; - text-align: center; - line-height: 140%; - } - - .totalmoney_area { - margin-bottom: 20px; - } + .review_bloc { + margin-bottom: 20px; + padding: 10px; + background-color: #f6f6f6; p { - margin: 10px 5px; + padding-top: 3px; + margin-right: 10px; + float: left; } - } - &#undercolumn { - ul#quantity_level li { - padding: 3px; - display: inline; + .review_btn { + float: right; + width: 160px; } + } - .empty { - text-align: left; - } + ul li { + padding-bottom: 15px; + margin-bottom: 15px; + background: url("img/background/line_dot_01.gif") repeat-x bottom; } - &.form_area { - margin-bottom: 30px; + .voicetitle { + margin-bottom: 5px; + color: #333; + font-weight: bold; } - &#undercolumn_customer {} + .voicedate { + margin-bottom: 10px; + } } /* 関連商品（商品部分はbloc.cssのおすすめ商品と共通） ----------------------------------------------- */ +#whobought_area { + clear: both; + padding: 35px 0 0 0; + + h2 { + border-top: solid 1px #f90; + background: url('img/background/bg_tit_sub_01.jpg') repeat-x left bottom; + padding: 5px 0 8px 10px; + font-size: 14px; + } +} + /* *********************************************** ▼カートの中 /*********************************************** */ /* 現在のカゴの中 ----------------------------------------------- */ +#undercolumn_cart { + .point_announce { + padding: 20px; + margin-bottom: 20px; + border: solid 1px #ffcc62; + background: #fffaf0; + font-size: 120%; + text-align: center; + line-height: 140%; + } + + .totalmoney_area { + margin-bottom: 20px; + } + + p { + margin: 10px 5px; + } +} + +#undercolumn { + ul#quantity_level li { + padding: 3px; + display: inline; + } + + .empty { + text-align: left; + } +} + +div.form_area { + margin-bottom: 30px; +} /* お客様情報入力 ----------------------------------------------- */ +#undercolumn_customer { +} + .flow_area { margin: 0 0 20px 0; } -div { - &#undercolumn_customer th em { - color: #000; - font-weight: bold; - } +#undercolumn_customer th em { + color: #000; + font-weight: bold; +} - &#undercolumn_shopping { - .pay_area { - margin: 0 auto 30px; - width: 100%; - } +/* お支払い方法・お届け時間等の指定 +----------------------------------------------- */ - .pay_area02 { - margin: 40px auto 30px auto; +#undercolumn_shopping { + .pay_area { + margin: 0 auto 30px; + width: 100%; + } - .txtarea { - margin: 5px 0 0 0; - padding: 2px; - border: 1px solid #ccc; - width: 99%; - height: 150px; - } + .pay_area02 { + margin: 40px auto 30px auto; - .select-msg { - margin-bottom: 10px; - } + .txtarea { + margin: 5px 0 0 0; + padding: 2px; + border: 1px solid #ccc; + width: 99%; + height: 150px; } - .point_area { - margin: 40px auto 0 auto; + .select-msg { + margin-bottom: 10px; + } + } - .point_announce { - padding: 20px; - border: 1px solid #ccc; - } + .point_area { + margin: 40px auto 0 auto; - p { - margin-bottom: 20px; - } + .point_announce { + padding: 20px; + border: 1px solid #ccc; + } - .point_announce li { - margin-bottom: 5px; - } + p { + margin-bottom: 20px; + } + + .point_announce li { + margin-bottom: 5px; } } } -/* お支払い方法・お届け時間等の指定 ------------------------------------------------ */ - /* お届け先の指定 ----------------------------------------------- */ @@ -1337,8 +1404,6 @@ p.condition_area { width: 566px; } -@charset "utf-8"; - /************************************************ tables ************************************************ */ @@ -1372,52 +1437,50 @@ table { /* 見出し ----------------------------------------------- */ -div { - &#undercolumn_shopping table { - th[scope=col] { - text-align: center; - } +#undercolumn_shopping table { + th[scope=col] { + text-align: center; + } - &.delivname th { - width: 155px; - } + &.delivname th { + width: 155px; } +} - &#mycontents_area table { - th { - text-align: left; +/* MYページ */ - &.alignR { - text-align: right; - } +#mycontents_area table { + th { + text-align: left; - &.alignL { - text-align: left; - } + &.alignR { + text-align: right; + } - &.alignC { - text-align: center; - } + &.alignL { + text-align: left; + } - &.resulttd { - text-align: right; - } + &.alignC { + text-align: center; } - caption { - padding: 8px; - border-top: 1px solid #ccc; - border-right: 1px solid #ccc; - border-left: 1px solid #ccc; - color: #000; - background-color: #f0f0f0; - text-align: left; - font-weight: bold; + &.resulttd { + text-align: right; } } -} -/* MYページ */ + caption { + padding: 8px; + border-top: 1px solid #ccc; + border-right: 1px solid #ccc; + border-left: 1px solid #ccc; + color: #000; + background-color: #f0f0f0; + text-align: left; + font-weight: bold; + } +} /* その他 ----------------------------------------------- */ @@ -1427,8 +1490,6 @@ table select { border: solid 1px #ccc; } -@charset "utf-8"; - /************************************************ ブロック用 ************************************************ */ @@ -1458,7 +1519,6 @@ table select { .side_column { overflow-x: hidden; - /* IE6 表示乱れ防止 */ .block_body { @@ -1482,9 +1542,8 @@ table select { #container { .block_outer { - padding: 0 15px 10px; - /* #container の背景色を欠けさせないため敢えて padding */ + padding: 0 15px 10px; } #main_column .block_outer { @@ -1495,6 +1554,9 @@ table select { padding: 0 7% 10px; } + /* リスト + ----------------------------------------------- */ + /* ログイン 検索条件 */ .block_outer .block_body dl.formlist { margin-bottom: 8px; @@ -1505,7 +1567,7 @@ table select { dt { margin-bottom: 3px; padding-left: 15px; - background: url("../img/icon/ico_arrow_03.gif") no-repeat left; + background: url("img/icon/ico_arrow_03.gif") no-repeat left; font-size: 90%; } @@ -1515,49 +1577,53 @@ table select { } } -/* リスト ------------------------------------------------ */ -/* ログイン 検索条件 */ /* タイトル ----------------------------------------------- */ -/* タイトルの背景 白 */ -#login_area h2, #search_area h2, #calender_area h2, #cart_area h2, #cart h2 { - padding: 5px 0 8px 10px; - border-style: solid; - border-color: #f90 #ccc #ccc; - border-width: 1px 1px 0; - background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; - font-size: 14px; -} +h2 { + /* タイトルの背景 白 */ -#category_area h2 { - border-top: solid 1px #f90; - background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; - padding: 5px 0 8px 10px; - font-size: 14px; -} + #login_area &, + #search_area &, + #calender_area &, + #cart_area &, + #cart & { + padding: 5px 0 8px 10px; + border-style: solid; + border-color: #f90 #ccc #ccc; + border-width: 1px 1px 0; + background: url('img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; + font-size: 14px; + } -/* タイトルの背景 オレンジ */ + #category_area & { + border-top: solid 1px #f90; + background: url('img/background/bg_tit_bloc_01.jpg') repeat-x left bottom; + padding: 5px 0 8px 10px; + font-size: 14px; + } -#recommend_area h2 { - padding: 5px 0 8px 10px; - border-style: solid; - border-color: #f90 #ccc #ccc; - border-width: 1px 1px 0; - background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8; -} + /* タイトルの背景 オレンジ */ -#news_area { - h2 { + #recommend_area &, + #news_area & { padding: 5px 0 8px 10px; border-style: solid; border-color: #f90 #ccc #ccc; border-width: 1px 1px 0; - background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8; + background: url('img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8; } +} + +/* *********************************************** +▼各機能ブロックの指定 +/*********************************************** */ +/* =============================================== +▼新着情報 +=============================================== */ +#news_area { .news_contents { padding: 10px; max-height: 260px; @@ -1572,10 +1638,9 @@ table select { } dl.newslist { - background: url("../img/background/line_dot_01.gif") repeat-x bottom; + background: url("img/background/line_dot_01.gif") repeat-x bottom; &:last-child { - /* IE9 未満では無効 (影響度合いが低いので黙殺) */ background: none; } @@ -1590,14 +1655,6 @@ table select { } } -/* *********************************************** -▼各機能ブロックの指定 -/*********************************************** */ - -/* =============================================== -▼新着情報 -=============================================== */ - /* =============================================== ▼現在のカゴの中 =============================================== */ @@ -1610,17 +1667,17 @@ table select { .postage { margin-top: 10px; padding-top: 10px; - background: url("../img/background/line_dot_01.gif") repeat-x top; + background: url("img/background/line_dot_01.gif") repeat-x top; .point_announce { padding: 2px 0 2px 20px; - background: url("../img/icon/ico_price.gif") no-repeat left top; + background: url("img/icon/ico_price.gif") no-repeat left top; } } .btn { padding: 10px 0; - background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6; + background: url("img/background/line_dot_01.gif") repeat-x top #f7f7e6; text-align: center; } } @@ -1642,11 +1699,11 @@ table select { p { padding-left: 20px; margin: 7px 3px; - background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat; + background: url("img/icon/ico_arrow_01.gif") 2px 3px no-repeat; } li p { - background: url("../img/icon/ico_level.gif") 7px 7px no-repeat; + background: url("img/icon/ico_level.gif") 7px 7px no-repeat; } } @@ -1662,7 +1719,8 @@ a.onlink { text-decoration: underline; } - &:visited, &:hover { + &:visited, + &:hover { color: #f00; } } @@ -1683,7 +1741,7 @@ a.onlink { ul.button_like li { margin: 0; padding: 0 0 1px 0; - background: url("../img/background/bg_btn_list.jpg") bottom repeat-x; + background: url("img/background/bg_btn_list.jpg") bottom repeat-x; a { margin: 0; @@ -1692,7 +1750,7 @@ ul.button_like li { border-bottom: none; border-color: #ccc; display: block; - background: url("../img/icon/ico_arrow_02.gif") no-repeat right; + background: url("img/icon/ico_arrow_02.gif") no-repeat right; text-decoration: none; outline: none; } @@ -1704,7 +1762,7 @@ ul.button_like li { =============================================== */ #container { - div#login_area .block_body { + #login_area .block_body { padding: 10px; p { @@ -1724,7 +1782,7 @@ ul.button_like li { margin-bottom: 3px; padding-left: 15px; color: #333; - background: url("../img/icon/ico_arrow_03.gif") no-repeat left; + background: url("img/icon/ico_arrow_03.gif") no-repeat left; width: 120px; float: left; font-size: 90%; @@ -1739,26 +1797,24 @@ ul.button_like li { } } - div { - &#login_area .block_body .mini { - margin-top: 5px; - letter-spacing: -0.01em; - } + #login_area .block_body .mini { + margin-top: 5px; + letter-spacing: -0.01em; + } - &#search_area .block_body { - padding: 10px; + /* =============================================== + ▼検索 + =============================================== */ - .btn { - text-align: center; - } + #search_area .block_body { + padding: 10px; + + .btn { + text-align: center; } } } -/* =============================================== -▼検索 -=============================================== */ - /* =============================================== ▼カレンダー =============================================== */ @@ -1797,7 +1853,7 @@ ul.button_like li { table .month { margin-bottom: 5px; padding-left: 12px; - background: url("../img/icon/ico_arrow_04.gif") no-repeat left; + background: url("img/icon/ico_arrow_04.gif") no-repeat left; font-size: 120%; } @@ -1828,21 +1884,25 @@ ul.button_like li { /* 共通 ----------------------------------------------- */ -#recommend_area .block_body, #whobought_area .product_item { +#recommend_area .block_body, +#whobought_area .product_item { padding: 10px 0 10px; border: none; - background: url("../img/background/line_dot_01.gif") repeat-x bottom; + background: url("img/background/line_dot_01.gif") repeat-x bottom; } -#recommend_area .block_body p, #whobought_area .product_item p { +#recommend_area .block_body p, +#whobought_area .product_item p { margin: 0 0 5px 0; } -#recommend_area .block_body img, #whobought_area .product_item img { +#recommend_area .block_body img, +#whobought_area .product_item img { margin: 0 5px 0 0; } -#recommend_area .block_body h3, #whobought_area .product_item h3 { +#recommend_area .block_body h3, +#whobought_area .product_item h3 { font-size: 100%; font-weight: normal; } @@ -1857,7 +1917,8 @@ ul.button_like li { ----------------------------------------------- */ /* メインカラム用 */ -#main_column #recommend_area .block_body .productImage, #whobought_area .product_item .productImage { +#main_column #recommend_area .block_body .productImage, +#whobought_area .product_item .productImage { margin-bottom: 10px; float: left; width: 90px; @@ -1874,7 +1935,8 @@ ul.button_like li { /* 左右の振り分け ----------------------------------------------- */ -#main_column #recommend_area .product_item, #whobought_area .product_item { +#main_column #recommend_area .product_item, +#whobought_area .product_item { float: left; width: 47.5%; padding-left: 1%; @@ -1883,41 +1945,46 @@ ul.button_like li { /* 商品説明テキスト ----------------------------------------------- */ -/* メインカラム用 1カラム時*/ +/* メインカラム */ #main_column { + + /* 1カラム時 */ + &.colnum1 #recommend_area .block_body .productContents { float: right; width: 74%; } + /* 2カラム時*/ + &.colnum2 { - #recommend_area .block_body .productContents, #whobought_area .productContents { + + #recommend_area .block_body .productContents, + #whobought_area .productContents { float: right; width: 74%; } } + /* 3カラム時*/ + &.colnum3 { - #recommend_area .block_body .productContents, #whobought_area .productContents { + + #recommend_area .block_body .productContents, + #whobought_area .productContents { float: right; width: 67%; } } } -/* メインカラム用 2カラム時*/ - -/* メインカラム用 3カラム時*/ - /* サイドカラム用 */ .side_column #recommend_area .block_body .productContents { clear: both; } -@charset "utf-8"; - /************************************************ インヘッダーブロック ************************************************ */ @@ -1948,7 +2015,7 @@ ul.button_like li { &.mail { padding-left: 28px; width: 155px; - background: url("../img/common/ico_arrow_login.gif") no-repeat left; + background: url("img/common/ico_arrow_login.gif") no-repeat left; font-size: 90%; } @@ -2015,127 +2082,124 @@ ul.button_like li { /* 【サイド】バナーエリア_02 ----------------------------------------------- */ -#leftcolumn .block_outer #banner_area .block_body ul li, #rightcolumn .block_outer #banner_area .block_body ul li { +#leftcolumn .block_outer #banner_area .block_body ul li, +#rightcolumn .block_outer #banner_area .block_body ul li { margin-bottom: 8px; } -@charset "utf-8"; - /************************************************ ポップアップウィンドウ ************************************************ */ /* 共通 ----------------------------------------------- */ -div { - &#windowcolumn { - border-top: solid 3px #f90; - width: 560px; - height: 100%; - margin: 15px 15px 0 15px; - background: #fff; +#windowcolumn { + border-top: solid 3px #f90; + width: 560px; + height: 100%; + margin: 15px 15px 0 15px; + background: #fff; - h2 { - margin-bottom: 10px; - padding: 8px; - border-top: solid 1px #ebeced; - color: #f60; - background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom; - background-color: #fef3d8; - font-size: 170%; - } + h2 { + margin-bottom: 10px; + padding: 8px; + border-top: solid 1px #ebeced; + color: #f60; + background: url("img/background/bg_tit_sub_01.jpg") repeat-x left bottom; + background-color: #fef3d8; + font-size: 170%; } +} - &#window_area { - margin: 15px auto 0 auto; - padding-bottom: 20px; - width: 540px; - min-height: 300px; - height: auto !important; - - p.information { - margin-bottom: 20px; - } - - .message { - margin-bottom: 20px; - color: #f60; - line-height: 150%; - font-weight: bold; - font-size: 140%; - } - - table { - width: 540px; - } - - #forgot { - margin: 0 auto; - padding: 20px; - width: 440px; - border: 1px solid #ccc; - text-align: left; - - .mailaddres { - margin-bottom: 10px; - } +#window_area { + margin: 15px auto 0 auto; + padding-bottom: 20px; + width: 540px; + min-height: 300px; + height: auto !important; - p { - text-align: center; - } - } + p.information { + margin-bottom: 20px; } - &#bigimage, &#cartimage { - margin-top: 15px; - background-color: #fff; - text-align: center; + .message { + margin-bottom: 20px; + color: #f60; + line-height: 150%; + font-weight: bold; + font-size: 140%; } - &#bigimage img, &#cartimage img { - padding: 10px; - background-color: #fff; + table { + width: 540px; } - &#zipsearchcolumn { - margin: 15px auto 0 auto; - border-top: 5px solid #ffa85c; - border-bottom: 5px solid #ffa85c; - width: 460px; - background-color: #fff; + /* お客様の声の書き込み、新しいお届け先の追加・変更 + ----------------------------------------------- */ - h2 { - margin: 0 0 15px 0; - width: 460px; - } - } - - &#zipsearch_area { - margin: 15px auto 0 auto; - width: 460px; - } + #forgot { + margin: 0 auto; + padding: 20px; + width: 440px; + border: 1px solid #ccc; + text-align: left; - &#zipsearchcolumn .btn { - margin: 15px 0 30px 0; - text-align: center; - } + .mailaddres { + margin-bottom: 10px; + } - &#zipsearch_area #completebox p { - padding: 60px 5px; - text-align: center; + p { + text-align: center; + } } } -/* お客様の声の書き込み、新しいお届け先の追加・変更 ------------------------------------------------ */ /* 商品詳細拡大写真、カート拡大写真 ----------------------------------------------- */ +#bigimage, +#cartimage { + margin-top: 15px; + background-color: #fff; + text-align: center; +} + +#bigimage img, +#cartimage img { + padding: 10px; + background-color: #fff; +} + /* 郵便番号検索 ----------------------------------------------- */ +#zipsearchcolumn { + margin: 15px auto 0 auto; + border-top: 5px solid #ffa85c; + border-bottom: 5px solid #ffa85c; + width: 460px; + background-color: #fff; -@charset "utf-8"; + h2 { + margin: 0 0 15px 0; + width: 460px; + } +} + +#zipsearch_area { + margin: 15px auto 0 auto; + width: 460px; +} + +#zipsearchcolumn .btn { + margin: 15px 0 30px 0; + text-align: center; +} + +#zipsearch_area #completebox p { + padding: 60px 5px; + text-align: center; +} /************************************************ 印刷用 From 983f622835b145291fb74d731437c68af4b1c284 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 20 Dec 2023 20:31:40 +0900 Subject: [PATCH 15/44] =?UTF-8?q?CSS=20=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B=20#784?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 削除されたファイルを参照しているが未使用と思われるファイルを削除する。 --- html/user_data/css/common.css | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/user_data/css/common.css diff --git a/html/user_data/css/common.css b/html/user_data/css/common.css deleted file mode 100644 index 91b3642266..0000000000 --- a/html/user_data/css/common.css +++ /dev/null @@ -1,4 +0,0 @@ -@charset "utf-8"; - -@import url("../packages/default/css/import.css"); - From ca9c81735c620bad9397286f269418d4d846c841 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 21 Dec 2023 20:30:55 +0900 Subject: [PATCH 16/44] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=86=85=E9=83=A8=E3=81=AE?= =?UTF-8?q?URL=E3=81=8B=E3=81=AE=E5=88=A4=E5=AE=9A=E3=82=92=E5=85=B1?= =?UTF-8?q?=E9=80=9A=E5=87=A6=E7=90=86=E5=8C=96=20#806?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/SC_Initial.php | 32 ++++++++++++++++++++++++++++++++ data/class/SC_Response.php | 7 ++----- data/class/util/SC_Utils.php | 11 +++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/data/class/SC_Initial.php b/data/class/SC_Initial.php index e6cf3ae9ae..0661a1d95d 100644 --- a/data/class/SC_Initial.php +++ b/data/class/SC_Initial.php @@ -57,6 +57,7 @@ public function init() $this->resetSuperglobalsRequest(); // stripslashesDeepGpc メソッドより後で実行 $this->setTimezone(); // 本当はエラーハンドラーより先に読みたい気も $this->normalizeHostname(); // defineConstants メソッドより後で実行 + $this->compatPhp(); } /** @@ -558,4 +559,35 @@ public function normalizeHostname() SC_Response_Ex::sendRedirect($correct_url); } } + + function compatPhp() + { + if (!function_exists('str_starts_with')) { + /** + * 文字列が指定された部分文字列で始まるかを調べる。(for PHP < 8) + * + * @param string $haystack + * @param string $needle + * @return bool + */ + function str_starts_with($haystack, $needle) { + return strncmp($haystack, $needle, strlen($needle)) === 0; + } + } + + if (!function_exists('str_ends_with')) { + /** + * 文字列が、指定された文字列で終わるかを調べる。(for PHP < 8) + * + * @param string $haystack + * @param string $needle + * @return bool + */ + function str_ends_with($haystack, $needle) { + $needle_len = strlen($needle); + + return substr($haystack, - $needle_len, $needle_len) === $needle; + } + } + } } diff --git a/data/class/SC_Response.php b/data/class/SC_Response.php index b692fdf0da..018858e718 100644 --- a/data/class/SC_Response.php +++ b/data/class/SC_Response.php @@ -202,11 +202,8 @@ public static function sendRedirect($location, $arrQueryString = array(), $inher $url = $netUrl->getUrl(); } - $pattern = '/^(' . preg_quote(HTTP_URL, '/') . '|' . preg_quote(HTTPS_URL, '/') . ')/'; - - // アプリケーション外へのリダイレクトは扱わない - if (preg_match($pattern, $url) === 0) { - trigger_error('', E_USER_ERROR); + if (!SC_Utils_Ex::isInternalUrl($url)) { + trigger_error('アプリケーション外へのリダイレクトは扱わない: ' . var_export($url, true), E_USER_ERROR); } $netUrl = new Net_URL($url); diff --git a/data/class/util/SC_Utils.php b/data/class/util/SC_Utils.php index 70e4f18ddc..c4c36b87df 100755 --- a/data/class/util/SC_Utils.php +++ b/data/class/util/SC_Utils.php @@ -1687,6 +1687,17 @@ public static function sfIsInternalDomain($url) return true; } + /** + * 指定されたURLはアプリケーション内部のものか + * + * @param string $url + * @return boolean + */ + public static function isInternalUrl($url) + { + return str_starts_with($url, HTTPS_URL) || str_starts_with($url, HTTP_URL); + } + /** * パスワードのハッシュ化 * From 4aa5ac30091f5151e7a442e86f8f41ec8dd97d2c Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 21 Dec 2023 21:06:56 +0900 Subject: [PATCH 17/44] =?UTF-8?q?SC=5FCartSession::setPrevURL()=20?= =?UTF-8?q?=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=20#805?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/SC_AdminView.php | 5 ----- data/class/SC_CartSession.php | 12 ++++++++++-- data/class/SC_Display.php | 9 ++++----- data/class/SC_MobileView.php | 5 ----- data/class/SC_SiteView.php | 12 +++--------- data/class/SC_SmartphoneView.php | 5 ----- data/class/pages/cart/LC_Page_Cart.php | 1 - 7 files changed, 17 insertions(+), 32 deletions(-) diff --git a/data/class/SC_AdminView.php b/data/class/SC_AdminView.php index e919bfc21b..b53d02ba8d 100644 --- a/data/class/SC_AdminView.php +++ b/data/class/SC_AdminView.php @@ -23,11 +23,6 @@ class SC_AdminView extends SC_View_Ex { - public function __construct() - { - parent::__construct(); - } - public function init() { parent::init(); diff --git a/data/class/SC_CartSession.php b/data/class/SC_CartSession.php index 0e0390a2d4..a59ad9b656 100644 --- a/data/class/SC_CartSession.php +++ b/data/class/SC_CartSession.php @@ -279,7 +279,11 @@ public function addProduct($product_class_id, $quantity) } } - // 前頁のURLを記録しておく + /** + * 前頁のURLを記録しておく + * + * @deprecated 2.18.0 本体では呼ばれない。 + */ public function setPrevURL($url, $excludePaths = array()) { // 前頁として記録しないページを指定する。 @@ -301,7 +305,11 @@ public function setPrevURL($url, $excludePaths = array()) } } - // 前頁のURLを取得する + /** + * 前頁のURLを取得する + * + * @deprecated 2.18.0 本体では利用していない。 + */ public function getPrevURL() { return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : ''; diff --git a/data/class/SC_Display.php b/data/class/SC_Display.php index 86ae9e918c..0957a115ab 100644 --- a/data/class/SC_Display.php +++ b/data/class/SC_Display.php @@ -48,17 +48,16 @@ class SC_Display * const('ADMIN',99); */ - public function __construct($hasPrevURL = true) + public function __construct() { $this->response = new SC_Response_Ex(); - if ($hasPrevURL) { - $this->setPrevURL(); - } } + /** + * @deprecated 2.18.0 本体では利用していない。 + */ public function setPrevURL() { - // TODO SC_SiteSession で実装した方が良さげ $objCartSess = new SC_CartSession_Ex(); $objCartSess->setPrevURL($_SERVER['REQUEST_URI']); } diff --git a/data/class/SC_MobileView.php b/data/class/SC_MobileView.php index 96ae635ec2..17aff5e401 100644 --- a/data/class/SC_MobileView.php +++ b/data/class/SC_MobileView.php @@ -26,11 +26,6 @@ */ class SC_MobileView extends SC_SiteView_Ex { - public function __construct($setPrevURL = true) - { - parent::__construct($setPrevURL); - } - public function init() { parent::init(); diff --git a/data/class/SC_SiteView.php b/data/class/SC_SiteView.php index 4689646d4a..0d0d58a636 100644 --- a/data/class/SC_SiteView.php +++ b/data/class/SC_SiteView.php @@ -23,15 +23,6 @@ class SC_SiteView extends SC_View_Ex { - public function __construct($setPrevURL = true) - { - parent::__construct(); - - if ($setPrevURL) { - $this->setPrevURL(); - } - } - public function init() { parent::init(); @@ -42,6 +33,9 @@ public function init() $this->assignTemplatePath(DEVICE_TYPE_PC); } + /** + * @deprecated 2.18.0 本体では利用していない。 + */ public function setPrevURL() { $objCartSess = new SC_CartSession_Ex(); diff --git a/data/class/SC_SmartphoneView.php b/data/class/SC_SmartphoneView.php index 77b712cec0..12b540a80a 100644 --- a/data/class/SC_SmartphoneView.php +++ b/data/class/SC_SmartphoneView.php @@ -23,11 +23,6 @@ class SC_SmartphoneView extends SC_SiteView_Ex { - public function __construct($setPrevURL = true) - { - parent::__construct($setPrevURL); - } - public function init() { parent::init(); diff --git a/data/class/pages/cart/LC_Page_Cart.php b/data/class/pages/cart/LC_Page_Cart.php index 102ab107ee..5d304dbac6 100644 --- a/data/class/pages/cart/LC_Page_Cart.php +++ b/data/class/pages/cart/LC_Page_Cart.php @@ -209,7 +209,6 @@ public function action() } // 前頁のURLを取得 - // TODO: SC_CartSession::setPrevURL()利用不可。 $this->lfGetCartPrevUrl($_SESSION, $_SERVER['HTTP_REFERER']); $this->tpl_prev_url = (isset($_SESSION['cart_prev_url'])) ? $_SESSION['cart_prev_url'] : ''; From b356c0634ed0c084a15fab4563278f6cf078abac Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 21 Dec 2023 21:05:57 +0900 Subject: [PATCH 18/44] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E3=81=AE=E3=82=AB?= =?UTF-8?q?=E3=82=B4=E3=81=AE=E4=B8=AD=20[=E6=88=BB=E3=82=8B]=E3=83=9C?= =?UTF-8?q?=E3=82=BF=E3=83=B3=20=E8=B3=BC=E5=85=A5=E6=89=8B=E7=B6=9A?= =?UTF-8?q?=E3=81=8D=E3=81=B8=E9=81=B7=E7=A7=BB=E3=81=99=E3=82=8B=E3=81=93?= =?UTF-8?q?=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=20#803?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/pages/cart/LC_Page_Cart.php | 36 ++++++++++++------- .../products/LC_Page_Products_Detail.php | 9 +---- .../pages/products/LC_Page_Products_List.php | 5 --- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/data/class/pages/cart/LC_Page_Cart.php b/data/class/pages/cart/LC_Page_Cart.php index 102ab107ee..ae835e4225 100644 --- a/data/class/pages/cart/LC_Page_Cart.php +++ b/data/class/pages/cart/LC_Page_Cart.php @@ -284,22 +284,32 @@ public function lfUpdateOrderTempid($pre_uniqid, $uniqid) */ public function lfGetCartPrevUrl(&$session, $referer) { - if (!preg_match('/cart/', $referer)) { - if (!empty($session['cart_referer_url'])) { - $session['cart_prev_url'] = $session['cart_referer_url']; - unset($session['cart_referer_url']); - } else { - if (preg_match('/entry/', $referer)) { - $session['cart_prev_url'] = HTTPS_URL . 'entry/kiyaku.php'; - } else { - $session['cart_prev_url'] = $referer; - } + // 妥当性チェック + if (!SC_Utils_Ex::isInternalUrl($referer)) { + return; + } + + // 除外ページの場合、何もせず終了する。 + $arrExclude = array( + ROOT_URLPATH . 'shopping/', + ROOT_URLPATH . 'cart/', + ); + + // リファラーから path を切り出す。 + $netURL = new Net_URL($referer); + $referer_path = $netURL->path; + + foreach ($arrExclude as $start) { + if (str_starts_with($referer_path, $start)) { + return; } } - // 妥当性チェック - if (!SC_Utils_Ex::sfIsInternalDomain($session['cart_prev_url'])) { - $session['cart_prev_url'] = ''; + + if (str_starts_with($referer_path, ROOT_URLPATH . 'entry/')) { + $referer = HTTPS_URL . 'entry/kiyaku.php'; } + + $session['cart_prev_url'] = $referer; } /** diff --git a/data/class/pages/products/LC_Page_Products_Detail.php b/data/class/pages/products/LC_Page_Products_Detail.php index 980cf3ed11..461203bbe1 100644 --- a/data/class/pages/products/LC_Page_Products_Detail.php +++ b/data/class/pages/products/LC_Page_Products_Detail.php @@ -242,11 +242,7 @@ public function action() case 'select': case 'select2': case 'selectItem': - /** - * モバイルの数量指定・規格選択の際に、 - * $_SESSION['cart_referer_url'] を上書きさせないために、 - * 何もせずbreakする。 - */ + // nop break; default: @@ -687,9 +683,6 @@ public function doAddFavoriteSphone(SC_Customer $objCustomer) */ public function doDefault() { - // カート「戻るボタン」用に保持 - $netURL = new Net_URL(); - $_SESSION['cart_referer_url'] = $netURL->getURL(); } /** diff --git a/data/class/pages/products/LC_Page_Products_List.php b/data/class/pages/products/LC_Page_Products_List.php index 8196299e04..455b57a780 100644 --- a/data/class/pages/products/LC_Page_Products_List.php +++ b/data/class/pages/products/LC_Page_Products_List.php @@ -578,11 +578,6 @@ public function doDefault(&$objProduct, &$objFormParam) SC_Response_Ex::actionExit(); } $js_fnOnLoad .= $this->lfSetSelectedData($this->arrProducts, $this->arrForm, $arrErr, $target_product_id); - } else { - // カート「戻るボタン」用に保持 - $netURL = new Net_URL(); - //該当メソッドが無いため、$_SESSIONに直接セット - $_SESSION['cart_referer_url'] = $netURL->getURL(); } $this->tpl_javascript .= 'function fnOnLoad() {' . $js_fnOnLoad . '}'; From e90552ae6cd9975e6bb3622d57fe037553d236be Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 3 Jan 2024 11:22:30 +0900 Subject: [PATCH 19/44] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E5=83=8F=E3=81=8C?= =?UTF-8?q?=E6=AC=A0=E8=90=BD=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=20#810?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 画像を使わず CSS で対応。 - ロード完了前も表示対応とした。 - 画像とともに使われていない (既に404 だった) jquery.colorbox の CSS/JS も削除した。 - beforeunload イベントで表示するようにした。 --- html/install/templates/install_frame.tpl | 126 ++++++++++++++--------- 1 file changed, 78 insertions(+), 48 deletions(-) diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index 0d959ed88d..ad41f8f15b 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -26,7 +26,6 @@ - @@ -34,43 +33,22 @@ - - EC-CUBEインストール @@ -78,26 +56,78 @@ $(function(){ -
Loading...
-
-
+
+ +

Loading...

+
+ From 99563a82bb0ca091b754e37d7e9d7805bd1349e1 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 3 Jan 2024 11:37:21 +0900 Subject: [PATCH 20/44] =?UTF-8?q?=E5=B9=BE=E3=82=89=E3=81=8B=E5=AE=B9?= =?UTF-8?q?=E9=87=8F=E3=81=8C=E5=A2=97=E3=81=88=E3=81=9F=E3=81=A8=E6=80=9D?= =?UTF-8?q?=E3=81=86=E3=81=AE=E3=81=A7=20strip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/install/templates/install_frame.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index ad41f8f15b..cf6f1b356d 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -53,6 +53,7 @@ $(window).on('beforeunload',function(){ EC-CUBEインストール +
diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index 0d959ed88d..cdafe1e795 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -65,7 +65,7 @@ +
@@ -103,3 +104,4 @@ function fnChangeVisible(check_id, mod_id){
+ diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl index fad5684f28..5c05bf9578 100644 --- a/html/install/templates/complete.tpl +++ b/html/install/templates/complete.tpl @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> +
@@ -36,11 +37,10 @@
-
-
+ diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index cdafe1e795..969bfc17ea 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -78,26 +78,25 @@ $(function(){
Loading...
-
-
diff --git a/html/install/templates/step0.tpl b/html/install/templates/step0.tpl index 9c3f58f959..496d03dda4 100644 --- a/html/install/templates/step0.tpl +++ b/html/install/templates/step0.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -42,12 +44,11 @@
-
-
+ diff --git a/html/install/templates/step0_1.tpl b/html/install/templates/step0_1.tpl index 2cfa6ed339..6465916cd9 100644 --- a/html/install/templates/step0_1.tpl +++ b/html/install/templates/step0_1.tpl @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> +

必要なファイルのコピー

@@ -44,13 +45,12 @@
-
-
+ diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl index 52cd7812cc..01da4d74b1 100644 --- a/html/install/templates/step1.tpl +++ b/html/install/templates/step1.tpl @@ -39,6 +39,7 @@ $(function() { }); }); +
@@ -223,12 +224,11 @@ $(function() { -
-
+ diff --git a/html/install/templates/step2.tpl b/html/install/templates/step2.tpl index 2988be5268..f70874098e 100644 --- a/html/install/templates/step2.tpl +++ b/html/install/templates/step2.tpl @@ -32,6 +32,7 @@ function lfnChangePort(db_type) { } } +
@@ -101,13 +102,12 @@ function lfnChangePort(db_type) { -
-
+ diff --git a/html/install/templates/step3.tpl b/html/install/templates/step3.tpl index 128dba6c0b..03cc08be60 100644 --- a/html/install/templates/step3.tpl +++ b/html/install/templates/step3.tpl @@ -38,6 +38,7 @@ //--> +
@@ -74,12 +75,11 @@ -
-
+ diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl index 12b43519a6..53e2c6c624 100644 --- a/html/install/templates/step4.tpl +++ b/html/install/templates/step4.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -53,7 +55,6 @@   -
-
+ diff --git a/html/install/templates/welcome.tpl b/html/install/templates/welcome.tpl index 57d2085551..298eaaffa8 100644 --- a/html/install/templates/welcome.tpl +++ b/html/install/templates/welcome.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -29,11 +31,10 @@ EC-CUBEのインストールを開始します。 -
-
+ From 01d9fe174c0a4c084aa9f918f7afdb95e350f5a0 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 4 Jan 2024 19:22:56 +0900 Subject: [PATCH 27/44] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E5=83=8F=E3=81=8C?= =?UTF-8?q?=E6=AC=A0=E8=90=BD=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=20#810?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - JavaScript の追加位置が不適切(IF分岐内)だったのを修正。 --- html/install/templates/install_frame.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index e76011c133..0e79287b1f 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -34,14 +34,15 @@ - - EC-CUBEインストール From 3ed97bb129d68f0991127e756d5b8b48baafe744 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 4 Jan 2024 19:29:34 +0900 Subject: [PATCH 28/44] Fix a typo. "EC CUBE" -> "EC-CUBE" --- html/install/templates/complete.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl index 5c05bf9578..38eadded46 100644 --- a/html/install/templates/complete.tpl +++ b/html/install/templates/complete.tpl @@ -29,7 +29,7 @@
-

EC CUBE インストールが完了しました。

+

EC-CUBE インストールが完了しました。

管理画面にログインできます。
From 81c610c65d7aa40aa7677bcd8c83fb2a576d34a4 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Fri, 5 Jan 2024 18:28:21 +0900 Subject: [PATCH 29/44] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/EC-CUBE/ec-cube2/pull/814#issuecomment-1877437767 を踏まえ、予め @deprecated とした。 --- data/class/SC_Initial.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/class/SC_Initial.php b/data/class/SC_Initial.php index 0661a1d95d..daae3e4ae7 100644 --- a/data/class/SC_Initial.php +++ b/data/class/SC_Initial.php @@ -560,6 +560,12 @@ public function normalizeHostname() } } + /** + * PHPバージョン互換処理 + * + * @deprecated https://github.com/EC-CUBE/ec-cube2/issues/681 が実現したら、外部ライブラリへ移行して、削除する予定。 + * @return void + */ function compatPhp() { if (!function_exists('str_starts_with')) { From 91d5ee6040aabe8927dbad007160c5edefbea9fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:55:43 +0000 Subject: [PATCH 30/44] Bump pear/mail from 1.5.0 to 2.0.0 Bumps [pear/mail](https://github.com/pear/Mail) from 1.5.0 to 2.0.0. - [Release notes](https://github.com/pear/Mail/releases) - [Commits](https://github.com/pear/Mail/compare/v1.5.0...v2.0.0) --- updated-dependencies: - dependency-name: pear/mail dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index fea3b503c2..0f734290ed 100644 --- a/composer.lock +++ b/composer.lock @@ -285,16 +285,16 @@ }, { "name": "pear/mail", - "version": "v1.5.0", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/pear/Mail.git", - "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3" + "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Mail/zipball/c31b7635899a630a8ce681e5ced18cededcc15f3", - "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3", + "url": "https://api.github.com/repos/pear/Mail/zipball/eb053f8b74f4f3178105fcf001626e63068c0dbc", + "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc", "shasum": "" }, "require": { @@ -348,7 +348,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail", "source": "https://github.com/pear/Mail" }, - "time": "2022-11-29T22:04:18+00:00" + "time": "2024-01-15T21:56:23+00:00" }, { "name": "pear/pear-core-minimal", From f9e1d19269d507a1d61bd47df4a0b8bbb0a6772f Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 23 Jan 2024 14:12:57 +0900 Subject: [PATCH 31/44] Update data/class/helper/SC_Helper_TaxRule.php Co-authored-by: bbkids <58061209+bbkids@users.noreply.github.com> --- data/class/helper/SC_Helper_TaxRule.php | 43 +++++++++++++++++++------ 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 309c5e2f5f..574c9bbd0d 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -66,6 +66,7 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr * 消費税の内訳を返す. * * 税率ごとに以下のような連想配列を返す. + * - discount: 税率毎の値引額 * - total: 値引後の税込み合計金額 * - tax: 値引後の税額 * 値引額合計は税率ごとに按分する. @@ -73,28 +74,52 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr * * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額 * @param int $discount_total 値引額合計 - * @return array{8?:array{total:int,tax:int}, 10?:array{total:int,tax:int}} + * @return array{8?:array{discount;int,total:int,tax:int}, 10?:array{discount;int,total:int,tax:int}} */ - public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total = 0) + public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array { $arrDefaultTaxRule = static::getTaxRule(); ksort($arrTaxableTotal); - $tax = []; + $cf_discount = 0; $taxable_total = array_sum($arrTaxableTotal); + $divide = []; $result = []; + + // 按分後の値引額の合計（8%対象商品の按分後の値引額 ＋ 10%対象商品の按分後の値引額）が実際の値引額より＋－1円となる事への対処 + // ①按分した値引き額を四捨五入で丸める foreach ($arrTaxableTotal as $rate => $total) { - if ($taxable_total > 0) { - $reduced_total = $total - $discount_total * $total / $taxable_total; - } + $discount[$rate] = round(($discount_total * $total / $taxable_total),0); + $divide[$rate] = [ + 'discount' => intval($discount[$rate]), + ]; + $cf_discount += $divide[$rate]['discount']; + } + // ②四捨五入したとしても、四捨五入前の値引額がそれぞれ 16.5 + 75.5 の場合 →(四捨五入端数処理)→ 17 + 76 両方繰り上がる。事への対処 + $defaultTaxRule = $arrDefaultTaxRule['calc_rule']; + $diff = $discount_total - $cf_discount; + if($diff > 0) { + $divide[$defaultTaxRule]['discount'] += $diff; + } + elseif($diff < 0){ + $divide[$defaultTaxRule]['discount'] -= $diff; + } + foreach ($arrTaxableTotal as $rate => $total) { + if($rate == $defaultTaxRule){ + $discount[$rate] = $divide[$GTaxRule]['discount']; + } + else{ + $discount[$rate] = round(($discount_total * $total / $taxable_total),0); + } + $reduced_total = $total - $discount[$rate]; $tax = $reduced_total * ($rate / (100 + $rate)); $result[$rate] = [ - 'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])), - 'tax' => intval(static::roundByCalcRule($tax, $arrDefaultTaxRule['calc_rule'])), + 'discount' => intval($discount[$rate]), + 'total' => intval($reduced_total), + 'tax' => intval(static::roundByCalcRule($tax, $defaultTaxRule)), ]; } - return $result; } From 29ed7c556e9050bf232a99011f53d7b2f41a17c9 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 24 Jan 2024 11:29:09 +0900 Subject: [PATCH 32/44] Update data/class/helper/SC_Helper_TaxRule.php Co-authored-by: bbkids <58061209+bbkids@users.noreply.github.com> --- data/class/helper/SC_Helper_TaxRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 574c9bbd0d..b34217ab5e 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -107,7 +107,7 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_to foreach ($arrTaxableTotal as $rate => $total) { if($rate == $defaultTaxRule){ - $discount[$rate] = $divide[$GTaxRule]['discount']; + $discount[$rate] = $divide[$defaultTaxRule]['discount']; } else{ $discount[$rate] = round(($discount_total * $total / $taxable_total),0); From 11d0556364a40128b1b82128d774c30bfd6a6d4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:26:48 +0000 Subject: [PATCH 33/44] Bump @babel/core from 7.21.3 to 7.23.9 Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.3 to 7.23.9. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.9/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 312 +++++++++++++++++++++++++-------------------------- 2 files changed, 151 insertions(+), 163 deletions(-) diff --git a/package.json b/package.json index 563ab435e7..3672280162 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "webpack": "^5.76.0" }, "devDependencies": { - "@babel/core": "^7.21.3", + "@babel/core": "^7.23.9", "@babel/preset-env": "^7.20.2", "@faker-js/faker": "^7.6.0", "@playwright/test": "^1.29.2", diff --git a/yarn.lock b/yarn.lock index a7401514af..c4fb89cf74 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,19 +10,12 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.22.13": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" - integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== dependencies: - "@babel/highlight" "^7.22.13" + "@babel/highlight" "^7.23.4" chalk "^2.4.2" "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1": @@ -30,48 +23,38 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== -"@babel/compat-data@^7.20.5": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298" - integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g== +"@babel/compat-data@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" + integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.3.tgz#cf1c877284a469da5d1ce1d1e53665253fae712e" - integrity sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw== +"@babel/core@^7.23.9": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" + integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.3" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.3" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.3" - "@babel/types" "^7.21.3" - convert-source-map "^1.7.0" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helpers" "^7.23.9" + "@babel/parser" "^7.23.9" + "@babel/template" "^7.23.9" + "@babel/traverse" "^7.23.9" + "@babel/types" "^7.23.9" + convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.0" - -"@babel/generator@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce" - integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA== - dependencies: - "@babel/types" "^7.21.3" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" + json5 "^2.2.3" + semver "^6.3.1" -"@babel/generator@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" - integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== +"@babel/generator@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" + integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== dependencies: - "@babel/types" "^7.23.0" + "@babel/types" "^7.23.6" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -91,16 +74,16 @@ "@babel/helper-explode-assignable-expression" "^7.18.6" "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" - integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" + integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" + "@babel/compat-data" "^7.23.5" + "@babel/helper-validator-option" "^7.23.5" + browserslist "^4.22.2" lru-cache "^5.1.1" - semver "^6.3.0" + semver "^6.3.1" "@babel/helper-create-class-features-plugin@^7.18.6": version "7.19.0" @@ -196,19 +179,23 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" - integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== +"@babel/helper-module-imports@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" + integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.2" - "@babel/types" "^7.21.2" + "@babel/types" "^7.22.15" + +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" + integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-validator-identifier" "^7.22.20" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -243,13 +230,20 @@ "@babel/traverse" "^7.19.1" "@babel/types" "^7.19.0" -"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2": +"@babel/helper-simple-access@^7.19.4": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: "@babel/types" "^7.20.2" +"@babel/helper-simple-access@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" + integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" @@ -271,17 +265,12 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" + integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== -"@babel/helper-string-parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" - integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": +"@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== @@ -296,6 +285,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== +"@babel/helper-validator-option@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" + integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== + "@babel/helper-wrap-function@^7.18.9": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1" @@ -306,42 +300,28 @@ "@babel/traverse" "^7.19.0" "@babel/types" "^7.19.0" -"@babel/helpers@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" - integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== +"@babel/helpers@^7.23.9": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d" + integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ== dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" + "@babel/template" "^7.23.9" + "@babel/traverse" "^7.23.9" + "@babel/types" "^7.23.9" -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.22.13": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" - integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== +"@babel/highlight@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" + integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== dependencies: "@babel/helper-validator-identifier" "^7.22.20" chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.7.0": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3" - integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== - -"@babel/parser@^7.22.15", "@babel/parser@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" - integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== +"@babel/parser@^7.23.9", "@babel/parser@^7.7.0": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b" + integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -950,55 +930,37 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.18.10", "@babel/template@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/template@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" - integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== +"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.23.9": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a" + integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA== dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" + "@babel/code-frame" "^7.23.5" + "@babel/parser" "^7.23.9" + "@babel/types" "^7.23.9" -"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3", "@babel/traverse@^7.7.0": - version "7.23.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" - integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== +"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.23.9", "@babel/traverse@^7.7.0": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950" + integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg== dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.23.0" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.0" - "@babel/types" "^7.23.0" - debug "^4.1.0" + "@babel/parser" "^7.23.9" + "@babel/types" "^7.23.9" + debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05" - integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg== +"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" + integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q== dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" - integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== - dependencies: - "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-string-parser" "^7.23.4" "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" @@ -1683,7 +1645,7 @@ browser-sync-webpack-plugin@^2.3.0: dependencies: lodash "^4" -browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4: +browserslist@^4.14.5, browserslist@^4.21.4: version "4.21.4" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== @@ -1693,6 +1655,16 @@ browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4: node-releases "^2.0.6" update-browserslist-db "^1.0.9" +browserslist@^4.22.2: + version "4.22.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6" + integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A== + dependencies: + caniuse-lite "^1.0.30001580" + electron-to-chromium "^1.4.648" + node-releases "^2.0.14" + update-browserslist-db "^1.0.13" + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -1716,12 +1688,17 @@ caniuse-lite@^1.0.30001400: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz#5f1715e506e71860b4b07c50060ea6462217611e" integrity sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg== +caniuse-lite@^1.0.30001580: + version "1.0.30001581" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4" + integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1813,12 +1790,10 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== core-js-compat@^3.25.1: version "3.25.5" @@ -1884,7 +1859,7 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1950,6 +1925,11 @@ electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.270.tgz#2c6ea409b45cdb5c3e0cb2c08cf6c0ba7e0f2c26" integrity sha512-KNhIzgLiJmDDC444dj9vEOpZEgsV96ult9Iff98Vanumn+ShJHd5se8aX6KeVxdc0YQeqdrezBZv89rleDbvSg== +electron-to-chromium@^1.4.648: + version "1.4.648" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4" + integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg== + emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" @@ -2925,7 +2905,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.2: +json5@^2.1.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -3116,6 +3096,11 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +node-releases@^2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" + integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== + node-releases@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" @@ -3524,11 +3509,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-regex-test@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" @@ -3561,7 +3541,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== @@ -3904,6 +3884,14 @@ unicode-property-aliases-ecmascript@^2.0.0: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== +update-browserslist-db@^1.0.13: + version "1.0.13" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" + integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + update-browserslist-db@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18" From 61c481c17e6e0cce3baf99752084bec42f0dcfef Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 29 Jan 2024 22:34:50 +0900 Subject: [PATCH 34/44] Update data/class/SC_Fpdf.php Co-authored-by: bbkids <58061209+bbkids@users.noreply.github.com> --- data/class/SC_Fpdf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/class/SC_Fpdf.php b/data/class/SC_Fpdf.php index 886c328372..fb7995fc13 100644 --- a/data/class/SC_Fpdf.php +++ b/data/class/SC_Fpdf.php @@ -345,7 +345,7 @@ private function setOrderData() $this->SetX(20); $message = SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total); - $this->MultiCell($width, 4, $message, 0, 'R', 0, ''); + $this->MultiCell($width, 4, $message, 0, 'R', ''); } /** From 6ce52fadc8383bc29d63041353001224b7fbd189 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 07:18:07 +0000 Subject: [PATCH 35/44] Bump tar and @types/tar Bumps [tar](https://github.com/isaacs/node-tar) and [@types/tar](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tar). These dependencies needed to be updated together. Updates `tar` from 6.1.13 to 6.2.0 - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.13...v6.2.0) Updates `@types/tar` from 6.1.4 to 6.1.11 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tar) --- updated-dependencies: - dependency-name: tar dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: "@types/tar" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 4 ++-- yarn.lock | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index c6a484d7e2..1677b839f2 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@playwright/test": "^1.29.2", "@types/date-fns": "^2.6.0", "@types/faker": "^6.6.9", - "@types/tar": "^6.1.4", + "@types/tar": "^6.1.11", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.55.0", "babel-eslint": "^10.0.3", @@ -34,7 +34,7 @@ "eslint": "^8.36.0", "eslint-config-jquery": "^3.0.0", "eslint-plugin-import": "^2.27.5", - "tar": "^6.1.13", + "tar": "^6.2.0", "typescript": "^5.3.3", "webpack-cli": "^4.10.0", "zaproxy": "^1.0.1" diff --git a/yarn.lock b/yarn.lock index b9ecc89f0c..de7114230d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1203,10 +1203,10 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== -"@types/tar@^6.1.4": - version "6.1.4" - resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.4.tgz#cf8497e1ebdc09212fd51625cd2eb5ca18365ad1" - integrity sha512-Cp4oxpfIzWt7mr2pbhHT2OTXGMAL0szYCzuf8lRWyIMCgsx6/Hfc3ubztuhvzXHXgraTQxyOCmmg7TDGIMIJJQ== +"@types/tar@^6.1.11": + version "6.1.11" + resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.11.tgz#48de9ccee8db37efb0d5a9f288567fc0378cb734" + integrity sha512-ThA1WD8aDdVU4VLuyq5NEqriwXErF5gEIJeyT6gHBWU7JtSmW2a5qjNv3/vR82O20mW+1vhmeZJfBQPT3HCugg== dependencies: "@types/node" "*" minipass "^4.0.0" @@ -3067,6 +3067,11 @@ minipass@^4.0.0: dependencies: yallist "^4.0.0" +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -3732,14 +3737,14 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.1.13: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== +tar@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" + integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" From d68e8266f402f64f652eebd117a88707579054f6 Mon Sep 17 00:00:00 2001 From: shinya Date: Thu, 1 Feb 2024 18:55:25 +0900 Subject: [PATCH 36/44] =?UTF-8?q?=E8=87=AA=E5=8B=95=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=81=AE=E4=BB=95=E7=B5=84=E3=81=BF=E3=82=92=E5=B0=8E?= =?UTF-8?q?=E5=85=A5=EF=BC=88=E8=A9=A6=E8=A1=8C=E9=8C=AF=E8=AA=A4=E5=89=8D?= =?UTF-8?q?=E6=8F=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 36 ++++++++++++++++++++++++++++++++ .github/workflows/e2e-tests.yml | 22 +++++++++---------- .github/workflows/main.yml | 22 +++++++++---------- .github/workflows/phpstan.yml | 4 ++++ 4 files changed, 60 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 0000000000..58b40697c8 --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,36 @@ +name: Auto-merge + +on: + workflow_run: + workflows: [E2E testing for EC-CUBE] + types: [completed] + +jobs: + check-and-merge: + runs-on: ubuntu-latest + if: | + github.event.workflow_run.conclusion == 'success' + permissions: + pull-requests: write + contents: write + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Approve PR + run: gh pr review "$PR_URL" --approve + ## いきなりマージするのが怖いので、一旦自動承認（↑）だけにする + #- name: Enable auto-merge + # run: gh pr merge --merge --auto "$PR_URL" + + failed: + runs-on: ubuntu-latest + if: | + github.event.workflow_run.conclusion == 'failure' + steps: + - name: failed + # 失敗したときにデバッグ用に情報を出力しておく + run: | + echo 'Haven't met the conditions to merge yet' + echo '${{ toJSON(github.event.workflow_run) }}' + exit 1 \ No newline at end of file diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 34c9b3dce1..dac9fd444e 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -1,21 +1,17 @@ name: E2E testing for EC-CUBE +run-name: E2E testing for EC-CUBE + on: - push: - branches: - - '*' - tags: - - '*' - paths: - - '**' - - '!*.md' - pull_request: - paths: - - '**' - - '!*.md' + workflow_run: + workflows: [CI/CD for EC-CUBE] + types: [completed] + jobs: run-on-linux: name: Run on Linux runs-on: ubuntu-22.04 + if: | + github.event.workflow_run.conclusion == 'success' strategy: fail-fast: false matrix: @@ -85,6 +81,8 @@ jobs: installer: name: Installer test runs-on: ubuntu-22.04 + if: | + github.event.workflow_run.conclusion == 'success' strategy: fail-fast: false matrix: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d33224d88..cc4ef800e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,21 +1,17 @@ name: CI/CD for EC-CUBE +run-name: CI/CD for EC-CUBE + on: - push: - branches: - - '*' - tags: - - '*' - paths: - - '**' - - '!*.md' - pull_request: - paths: - - '**' - - '!*.md' + workflow_run: + workflows: [PHPStan] + types: [completed] + jobs: run-on-linux: name: Run on Linux runs-on: ${{ matrix.operating-system }} + if: | + github.event.workflow_run.conclusion == 'success' strategy: fail-fast: false matrix: @@ -150,6 +146,8 @@ jobs: run-on-windows: name: Run on Windows runs-on: ${{ matrix.operating-system }} + if: | + github.event.workflow_run.conclusion == 'success' strategy: fail-fast: false matrix: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 1564e9aa39..19950eb471 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -1,4 +1,6 @@ name: PHPStan +run-name: PHPStan + on: push: branches: @@ -12,6 +14,8 @@ on: paths: - '**' - '!*.md' + pull_request_review: + types: [submitted] jobs: phpstan: From ae08724b83e1f1e4f50791803d15f9ffa9c9e977 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 5 Feb 2024 02:02:50 +0900 Subject: [PATCH 37/44] Fix divison by zero and format --- data/class/helper/SC_Helper_TaxRule.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index b34217ab5e..b0b5324097 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -76,7 +76,7 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr * @param int $discount_total 値引額合計 * @return array{8?:array{discount;int,total:int,tax:int}, 10?:array{discount;int,total:int,tax:int}} */ - public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array + public static function getTaxPerTaxRate($arrTaxableTotal, $discount_total = 0) { $arrDefaultTaxRule = static::getTaxRule(); @@ -89,28 +89,26 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_to // 按分後の値引額の合計（8%対象商品の按分後の値引額 ＋ 10%対象商品の按分後の値引額）が実際の値引額より＋－1円となる事への対処 // ①按分した値引き額を四捨五入で丸める foreach ($arrTaxableTotal as $rate => $total) { - $discount[$rate] = round(($discount_total * $total / $taxable_total),0); - $divide[$rate] = [ + $discount[$rate] = $taxable_total !== 0 ? round(($discount_total * $total / $taxable_total), 0) : 0; + $divide[$rate] = [ 'discount' => intval($discount[$rate]), ]; - $cf_discount += $divide[$rate]['discount']; - } + $cf_discount += $divide[$rate]['discount']; + } // ②四捨五入したとしても、四捨五入前の値引額がそれぞれ 16.5 + 75.5 の場合 →(四捨五入端数処理)→ 17 + 76 両方繰り上がる。事への対処 $defaultTaxRule = $arrDefaultTaxRule['calc_rule']; $diff = $discount_total - $cf_discount; - if($diff > 0) { + if ($diff > 0) { $divide[$defaultTaxRule]['discount'] += $diff; - } - elseif($diff < 0){ + } elseif ($diff < 0) { $divide[$defaultTaxRule]['discount'] -= $diff; } foreach ($arrTaxableTotal as $rate => $total) { - if($rate == $defaultTaxRule){ + if ($rate == $defaultTaxRule) { $discount[$rate] = $divide[$defaultTaxRule]['discount']; - } - else{ - $discount[$rate] = round(($discount_total * $total / $taxable_total),0); + } else { + $discount[$rate] = $taxable_total !== 0 ? round(($discount_total * $total / $taxable_total), 0) : 0; } $reduced_total = $total - $discount[$rate]; $tax = $reduced_total * ($rate / (100 + $rate)); From f99e6c0b3ec807229e6c62d639ddac780366dbce Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 5 Feb 2024 02:03:47 +0900 Subject: [PATCH 38/44] =?UTF-8?q?=E5=86=8D=E7=8F=BE=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676 --- .../SC_Helper_TaxRule_getTaxDetailTest.php | 168 +++++++++++++++++- 1 file changed, 166 insertions(+), 2 deletions(-) diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php index d0e9112b3a..be84e71581 100644 --- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php @@ -41,10 +41,12 @@ public function testGetTaxPerTaxRateWithRound() self::assertSame( [ 8 => [ + 'discount' => 596, 'total' => 65160, 'tax' => 4827 ], 10 => [ + 'discount' => 6563, 'total' => 717868, 'tax' => 65261 ] @@ -86,10 +88,12 @@ public function testGetTaxPerTaxRateWithZero() self::assertSame( [ 8 => [ + 'discount' => 0, 'total' => 0, 'tax' => 0 ], 10 => [ + 'discount' => 0, 'total' => 0, 'tax' => 0 ] @@ -137,16 +141,20 @@ public function testGetTaxPerTaxRateWithFloor() self::assertSame( [ 8 => [ + 'discount' => 596, 'total' => 65160, 'tax' => 4826 ], 10 => [ - 'total' => 717867, + 'discount' => 6563, + 'total' => 717868, 'tax' => 65260 ] ], $actual ); + + self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']); } /** @@ -182,16 +190,172 @@ public function testGetTaxPerTaxRateWithCeil() self::assertSame( [ 8 => [ - 'total' => 65161, + 'discount' => 596, + 'total' => 65160, 'tax' => 4827 ], 10 => [ + 'discount' => 6563, 'total' => 717868, 'tax' => 65261 ] ], $actual ); + + self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']); + } + + /** + * @see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676 + */ + public function testGetTaxPerTaxRateWithRound2() + { + $this->setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '1', + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 1595, + 8 => 7398, + ]; + $discount_total = 92; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'discount' => 76, + 'total' => 7322, + 'tax' => 542 + ], + 10 => [ + 'discount' => 16, + 'total' => 1579, + 'tax' => 144 + ] + ], + $actual + ); + + self::assertSame( + '(8%対象: 7,322円 内消費税: 542円)'.PHP_EOL. + '(10%対象: 1,579円 内消費税: 144円)'.PHP_EOL, + SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total) + ); + + self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']); + } + + /** + * @see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676 + * @runInSeparateProcess + * @preserveGlobalState disabled + */ + public function testGetTaxPerTaxRateWithFloor2() + { + self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly'); + + $this->setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '2', // floor + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 1595, + 8 => 7398, + ]; + $discount_total = 92; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'discount' => 76, + 'total' => 7322, + 'tax' => 542 + ], + 10 => [ + 'discount' => 16, + 'total' => 1579, + 'tax' => 143 + ] + ], + $actual + ); + + self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']); + } + + /** + * @see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676 + * @runInSeparateProcess + * @preserveGlobalState disabled + */ + public function testGetTaxPerTaxRateWithCeil2() + { + self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly'); + + $this->setUpTaxRule([ + [ + 'tax_rule_id' => 1004, + 'apply_date' => '2019-10-01 00:00:00', + 'tax_rate' => '10', + 'calc_rule' => '3', // ceil + 'product_id' => '0', + 'product_class_id' => '0', + 'del_flg' => '0', + 'member_id' => 1, + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + ], + ]); + + $arrTaxableTotal = [ + 10 => 1595, + 8 => 7398, + ]; + $discount_total = 92; + + $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total); + self::assertSame( + [ + 8 => [ + 'discount' => 76, + 'total' => 7322, + 'tax' => 543 + ], + 10 => [ + 'discount' => 16, + 'total' => 1579, + 'tax' => 144 + ] + ], + $actual + ); + + self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']); } protected function setUpTaxRule(array $taxs = []) From e90cdb144bc4588097100246f70dd00a43428934 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Mon, 5 Feb 2024 16:13:25 +0900 Subject: [PATCH 39/44] =?UTF-8?q?PHPStan=20=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=82=92=20phpstan.neon.dist=20=E3=81=AE=20ignoreErrors=20?= =?UTF-8?q?=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - #816 で revert を想定している。 --- phpstan.neon.dist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 1252320d97..9d2d392744 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -40,3 +40,6 @@ parameters: - message: "#^Variable \\$SJIS_widths might not be defined\\.$#" path: data/class/helper/SC_Helper_FPDI.php + - + message: "#^Inner named functions are not supported by PHPStan\\.#" + path: data/class/SC_Initial.php From 95c85b7e0f724c925c7fcc7b8a10e7e5a326bdc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 09:32:04 +0000 Subject: [PATCH 40/44] Bump eslint from 8.36.0 to 8.56.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.36.0 to 8.56.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.36.0...v8.56.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 154 +++++++++++++++++++++++++-------------------------- 2 files changed, 77 insertions(+), 79 deletions(-) diff --git a/package.json b/package.json index eba638e5eb..423c24c19f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "babel-eslint": "^10.0.3", "babel-loader": "^8.2.5", "browser-sync-webpack-plugin": "^2.3.0", - "eslint": "^8.36.0", + "eslint": "^8.56.0", "eslint-config-jquery": "^3.0.0", "eslint-plugin-import": "^2.27.5", "tar": "^6.2.0", diff --git a/yarn.lock b/yarn.lock index 8c550e58b0..8243125d2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + "@ampproject/remapping@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" @@ -976,19 +981,19 @@ dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.1.tgz#087cb8d9d757bb22e9c9946c9c0c2bf8806830f1" - integrity sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw== +"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" + integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== -"@eslint/eslintrc@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.1.tgz#7888fe7ec8f21bc26d646dbd2c11cd776e21192d" - integrity sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw== +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.5.0" + espree "^9.6.0" globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -996,23 +1001,23 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.36.0": - version "8.36.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.36.0.tgz#9837f768c03a1e4a30bd304a64fb8844f0e72efe" - integrity sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg== +"@eslint/js@8.56.0": + version "8.56.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" + integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== "@faker-js/faker@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07" integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw== -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.11.13": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": @@ -1020,10 +1025,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" + integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== "@jridgewell/gen-mapping@^0.1.0": version "0.1.1" @@ -1291,6 +1296,11 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" +"@ungap/structured-clone@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" + integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -1449,17 +1459,22 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^8.5.0, acorn@^8.7.1: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== +acorn@^8.9.0: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2109,10 +2124,10 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== +eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -2122,32 +2137,33 @@ eslint-visitor-keys@^1.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@^8.36.0: - version "8.36.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.36.0.tgz#1bd72202200a5492f91803b113fb8a83b11285cf" - integrity sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw== +eslint@^8.56.0: + version "8.56.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" + integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.1" - "@eslint/js" "8.36.0" - "@humanwhocodes/config-array" "^0.11.8" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.56.0" + "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-visitor-keys "^3.3.0" - espree "^9.5.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -2155,32 +2171,29 @@ eslint@^8.36.0: find-up "^5.0.0" glob-parent "^6.0.2" globals "^13.19.0" - grapheme-splitter "^1.0.4" + graphemer "^1.4.0" ignore "^5.2.0" - import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" - js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.1.2" natural-compare "^1.4.0" - optionator "^0.9.1" + optionator "^0.9.3" strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" text-table "^0.2.0" -espree@^9.5.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.0.tgz#3646d4e3f58907464edba852fa047e6a27bdf113" - integrity sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw== +espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== dependencies: - acorn "^8.8.0" + acorn "^8.9.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.1" esquery@^1.4.2: version "1.5.0" @@ -2491,11 +2504,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== -grapheme-splitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" - integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== - graphemer@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" @@ -2584,7 +2592,7 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== -import-fresh@^3.0.0, import-fresh@^3.2.1: +import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -2835,11 +2843,6 @@ jquery@*, jquery@3, jquery@>=1.3.2: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f" integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ== -js-sdsl@^4.1.4: - version "4.1.5" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" - integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -3161,17 +3164,17 @@ once@^1.3.0: dependencies: wrappy "1" -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== +optionator@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" - word-wrap "^1.2.3" p-limit@^2.2.0: version "2.3.0" @@ -3676,7 +3679,7 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -4033,11 +4036,6 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -word-wrap@^1.2.3: - version "1.2.5" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" - integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" From 6d2f611f50e361c8c7b489c503424693e07272fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 09:32:35 +0000 Subject: [PATCH 41/44] Bump @playwright/test from 1.29.2 to 1.41.2 Bumps [@playwright/test](https://github.com/microsoft/playwright) from 1.29.2 to 1.41.2. - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.29.2...v1.41.2) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 33 +++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index eba638e5eb..5047a73f19 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@babel/core": "^7.23.9", "@babel/preset-env": "^7.20.2", "@faker-js/faker": "^7.6.0", - "@playwright/test": "^1.29.2", + "@playwright/test": "^1.41.2", "@types/date-fns": "^2.6.0", "@types/faker": "^6.6.9", "@types/tar": "^6.1.11", diff --git a/yarn.lock b/yarn.lock index 8c550e58b0..77b3ee7458 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1102,13 +1102,12 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@playwright/test@^1.29.2": - version "1.29.2" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.29.2.tgz#c48184721d0f0b7627a886e2ec42f1efb2be339d" - integrity sha512-+3/GPwOgcoF0xLz/opTnahel1/y42PdcgZ4hs+BZGIUjtmEFSXGg+nFoaH3NSmuc7a6GSFwXDJ5L7VXpqzigNg== +"@playwright/test@^1.41.2": + version "1.41.2" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.41.2.tgz#bd9db40177f8fd442e16e14e0389d23751cdfc54" + integrity sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg== dependencies: - "@types/node" "*" - playwright-core "1.29.2" + playwright "1.41.2" "@types/date-fns@^2.6.0": version "2.6.0" @@ -2359,6 +2358,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fsevents@2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -3260,10 +3264,19 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -playwright-core@1.29.2: - version "1.29.2" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.29.2.tgz#2e8347e7e8522409f22b244e600e703b64022406" - integrity sha512-94QXm4PMgFoHAhlCuoWyaBYKb92yOcGVHdQLoxQ7Wjlc7Flg4aC/jbFW7xMR52OfXMVkWicue4WXE7QEegbIRA== +playwright-core@1.41.2: + version "1.41.2" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.2.tgz#db22372c708926c697acc261f0ef8406606802d9" + integrity sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA== + +playwright@1.41.2: + version "1.41.2" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.2.tgz#4e760b1c79f33d9129a8c65cc27953be6dd35042" + integrity sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A== + dependencies: + playwright-core "1.41.2" + optionalDependencies: + fsevents "2.3.2" postcss-modules-extract-imports@^3.0.0: version "3.0.0" From 4fa87c10088b458d6ffed85b6ed219480c574e05 Mon Sep 17 00:00:00 2001 From: shinya Date: Tue, 6 Feb 2024 10:59:24 +0900 Subject: [PATCH 42/44] =?UTF-8?q?checkout=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 58b40697c8..73ff4c9ecb 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -17,6 +17,10 @@ jobs: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: + - name: Checkout repository with preceding commits + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Approve PR run: gh pr review "$PR_URL" --approve ## いきなりマージするのが怖いので、一旦自動承認（↑）だけにする @@ -30,7 +34,7 @@ jobs: steps: - name: failed # 失敗したときにデバッグ用に情報を出力しておく - run: | + run: | echo 'Haven't met the conditions to merge yet' echo '${{ toJSON(github.event.workflow_run) }}' - exit 1 \ No newline at end of file + exit 1 From fffa6d9983c01a4fe910611caa0389e56c2b9df9 Mon Sep 17 00:00:00 2001 From: shinya Date: Thu, 8 Feb 2024 10:44:41 +0900 Subject: [PATCH 43/44] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E5=87=BA?= =?UTF-8?q?=E5=8A=9B=E6=96=B9=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 73ff4c9ecb..346976993b 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -33,8 +33,10 @@ jobs: github.event.workflow_run.conclusion == 'failure' steps: - name: failed + env: + WORKFLOW_RUN_CONTEXT: ${{ toJson(github.event.workflow_run) }} # 失敗したときにデバッグ用に情報を出力しておく run: | - echo 'Haven't met the conditions to merge yet' - echo '${{ toJSON(github.event.workflow_run) }}' + echo "Haven't met the conditions to merge yet" + echo "$WORKFLOW_RUN_CONTEXT" exit 1 From b11d670eef05c8579dc6347b14511f2cc2928096 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 13 Feb 2024 02:29:08 +0900 Subject: [PATCH 44/44] =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=20dockerbuild/php.ini=20=E5=89=8A?= =?UTF-8?q?=E9=99=A4=20#839?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dockerbuild/php.ini | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 dockerbuild/php.ini diff --git a/dockerbuild/php.ini b/dockerbuild/php.ini deleted file mode 100644 index 8482f7ea93..0000000000 --- a/dockerbuild/php.ini +++ /dev/null @@ -1,5 +0,0 @@ -; Optimizations for Symfony, as documented on http://symfony.com/doc/current/performance.html -opcache.max_accelerated_files = 20000 -opcache.memory_consumption=256 -realpath_cache_size = 4096K -realpath_cache_ttl = 600