Changeset 3263998
- Timestamp:
- 03/30/2025 05:43:56 AM (11 months ago)
- Location:
- ht-pay-jp-for-kintone
- Files:
-
- 10 edited
- 1 copied
-
tags/1.7.0 (copied) (copied from ht-pay-jp-for-kintone/trunk)
-
tags/1.7.0/ht-payjp-for-kintone.php (modified) (2 diffs)
-
tags/1.7.0/includes/class-ht-payjp-for-kintone-Admin.php (modified) (6 diffs)
-
tags/1.7.0/includes/class-ht-payjp-for-kintone-Payment.php (modified) (6 diffs)
-
tags/1.7.0/includes/class-ht-payjp-for-kintone-shortcode.php (modified) (1 diff)
-
tags/1.7.0/readme.txt (modified) (3 diffs)
-
trunk/ht-payjp-for-kintone.php (modified) (2 diffs)
-
trunk/includes/class-ht-payjp-for-kintone-Admin.php (modified) (6 diffs)
-
trunk/includes/class-ht-payjp-for-kintone-Payment.php (modified) (6 diffs)
-
trunk/includes/class-ht-payjp-for-kintone-shortcode.php (modified) (1 diff)
-
trunk/readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ht-pay-jp-for-kintone/tags/1.7.0/ht-payjp-for-kintone.php
r3195125 r3263998 8 8 * Text Domain: ht-pay-jp-for-kintone 9 9 * Domain Path: /languages 10 * Version: 1. 6.110 * Version: 1.7.0 11 11 * 12 12 * @package HT_Payjp_For_Kintone … … 54 54 $my_update_checker->setAuthentication( GITHUB_ACCESS_TOKEN ); 55 55 $my_update_checker->getVcsApi()->enableReleaseAssets(); 56 57 56 } 58 57 } -
ht-pay-jp-for-kintone/tags/1.7.0/includes/class-ht-payjp-for-kintone-Admin.php
r3195125 r3263998 84 84 85 85 if ( ! empty( $_POST ) && check_admin_referer( $this->nonce ) ) { 86 87 86 if ( $this->update() ) { 88 87 echo '<div class="updated notice is-dismissible"><p><strong>Success</strong></p></div>'; … … 270 269 'payjpforkintone-enabled' => 'disable', 271 270 'live-enabled' => false, 272 'three-d-secure' => 'disabled',273 271 ) 274 272 ); 275 273 276 274 $payjpforkintone_enabled = $payjpforkintone_setting_data['payjpforkintone-enabled']; 277 $three_d_secure = $payjpforkintone_setting_data['three-d-secure'];278 275 279 276 $payjpforkintone_language = 'ja'; 280 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) && $payjpforkintone_setting_data['payjpforkintone-language'] !== '' ){277 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) && $payjpforkintone_setting_data['payjpforkintone-language'] !== '' ) { 281 278 $payjpforkintone_language = $payjpforkintone_setting_data['payjpforkintone-language']; 282 279 } … … 345 342 </div> 346 343 <?php endif; ?> 347 348 <div class="field-wrap field-wrap-use-external-url">349 <lable>■ <?php esc_html_e( 'Setting 3D Secure', 'payjp-for-kintone' ); ?> (<a href="https://ht79.info/release/ht-pay-jp-for-kintone-1-6-0/" target="_blank">Setting Guide</a>)</lable>350 <fieldset>351 <select name="ht_payjpforkintone_setting_data[three-d-secure]" id="three-d-secure">352 <option value="disabled" <?php selected( $three_d_secure, 'disabled' ); ?>><?php esc_html_e( '3D Secure Disabled', 'payjp-for-kintone' ); ?></option>353 <option value="prerelease" <?php selected( $three_d_secure, 'prerelease' ); ?>><?php esc_html_e( '3D Secure with Prerelease (Available until April 30, 2025)', 'payjp-for-kintone' ); ?></option>354 <option value="enabled" <?php selected( $three_d_secure, 'enabled' ); ?>><?php esc_html_e( '3D Secure Enabled (Available from February 4, 2025)', 'payjp-for-kintone' ); ?></option>355 </select>356 </fieldset>357 </div>358 344 359 345 <div id="payjpforkintone-language-blocked" class="field-wrap field-wrap-use-external-url"> … … 423 409 <select name="ht_payjpforkintone_setting_data[payjp-fixed-subscription-month]" id="payjp-fixed-subscription-month"> 424 410 <option value="">month / day</option> 425 <?php for ( $month = 1; $month <= 12; $month ++ ) : ?>411 <?php for ( $month = 1; $month <= 12; $month ++ ) : ?> 426 412 <option value="<?php echo sprintf( '%02d', $month ); ?>-01" <?php selected( sprintf( '%02d', $month ) . '-01', $payjp_fixed_subscription_month ) ?>><?php echo sprintf( '%02d', $month ); ?>/01</option> 427 413 <?php endfor; ?> … … 430 416 <select name="ht_payjpforkintone_setting_data[payjp-fixed-subscription-time]" id="payjp-fixed-subscription-time"> 431 417 <option value="">time</option> 432 <?php for ( $hour = 0; $hour <= 23; $hour ++ ) : ?>418 <?php for ( $hour = 0; $hour <= 23; $hour ++ ) : ?> 433 419 <option value="<?php echo sprintf( '%02d', $hour ); ?>" <?php selected( sprintf( '%02d', $hour ), $payjp_fixed_subscription_time ) ?>><?php echo sprintf( '%02d', $hour ); ?>:00</option> 434 420 <?php endfor; ?> … … 602 588 } 603 589 } 604 -
ht-pay-jp-for-kintone/tags/1.7.0/includes/class-ht-payjp-for-kintone-Payment.php
r3190331 r3263998 92 92 93 93 if ( isset( $posted_data['payjp-token'] ) && '' !== $posted_data['payjp-token'] ) { 94 95 94 $token = sanitize_text_field( wp_unslash( $posted_data['payjp-token'] ) ); 96 95 … … 120 119 // 都度決済. 121 120 try { 122 123 121 \Payjp\Payjp::setApiKey( $secret_key ); 124 122 … … 131 129 ) 132 130 ); 133 131 // 予期せぬエラーが発生するようにして 134 132 $this->payjp_charged_id = $charge->id; 135 133 // captured_at はUTCなので+9時間をする. … … 169 167 ) 170 168 ); 171 172 169 } catch ( \Payjp\Error\Card $e ) { 173 170 // カード決済エラーの場合 … … 175 172 $submission->set_response( $contact_form->filter_message( __( 'Card payment failed. Please check your card information.', 'payjp-for-kintone' ) ) ); 176 173 ht_payjp_for_kintone_send_error_mail( $contact_form, $e->getMessage() ); 177 178 174 } catch ( \Payjp\Error\InvalidRequest $e ) { 179 175 // その他のPAY.JPエラーの場合 … … 181 177 $submission->set_response( $contact_form->filter_message( $e->getMessage() ) ); 182 178 ht_payjp_for_kintone_send_error_mail( $contact_form, $e->getMessage() ); 183 184 } 179 } 185 180 } else { 186 181 // Error. -
ht-pay-jp-for-kintone/tags/1.7.0/includes/class-ht-payjp-for-kintone-shortcode.php
r3195121 r3263998 62 62 63 63 $payjpforkintone_language = 'ja'; 64 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) ) {64 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) ) { 65 65 $payjpforkintone_language= $payjpforkintone_setting_data['payjpforkintone-language']; 66 66 } 67 67 68 $three_d_secure = 'disabled'; 69 if ( isset( $payjpforkintone_setting_data['three-d-secure'] ) ) { 70 $three_d_secure = $payjpforkintone_setting_data['three-d-secure']; 71 } 72 73 if ( 'disabled' === $three_d_secure ) { 74 $html = '<script type="text/javascript" src="https://checkout.pay.jp/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" ></script > '; 75 } elseif ( 'prerelease' === $three_d_secure ) { 76 $html = '<script type="text/javascript" src="https://checkout.pay.jp/prerelease/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" data-payjp-three-d-secure="true" data-payjp-three-d-secure-workflow="subwindow" data-payjp-extra-attribute-email data-payjp-extra-attribute-phone ></script > '; 77 } else { 78 $html = '<script type="text/javascript" src="https://checkout.pay.jp/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" data-payjp-three-d-secure="true" data-payjp-three-d-secure-workflow="subwindow" data-payjp-extra-attribute-email data-payjp-extra-attribute-phone ></script > '; 79 } 68 $html = '<script type="text/javascript" src="https://checkout.pay.jp/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" data-payjp-three-d-secure="true" data-payjp-three-d-secure-workflow="subwindow" data-payjp-extra-attribute-email data-payjp-extra-attribute-phone ></script > '; 80 69 81 70 return $html; -
ht-pay-jp-for-kintone/tags/1.7.0/readme.txt
r3195125 r3263998 6 6 Tested up to: 6.7 7 7 Requires PHP: 7.4 8 Stable tag: 1. 6.18 Stable tag: 1.7.0 9 9 License: GPLv2 or later 10 10 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 55 55 == Changelog == 56 56 57 = 1.7.0( 2025-03-30 ) = 58 59 * Forced migration to 3D Secure 60 57 61 = 1.6.1( 2024-11-24 ) = 58 62 … … 73 77 74 78 * [Fixed]Handle case where 'description' setting is not provided 75 76 79 77 80 = 1.4.0( 2023-11-03 ) = -
ht-pay-jp-for-kintone/trunk/ht-payjp-for-kintone.php
r3195125 r3263998 8 8 * Text Domain: ht-pay-jp-for-kintone 9 9 * Domain Path: /languages 10 * Version: 1. 6.110 * Version: 1.7.0 11 11 * 12 12 * @package HT_Payjp_For_Kintone … … 54 54 $my_update_checker->setAuthentication( GITHUB_ACCESS_TOKEN ); 55 55 $my_update_checker->getVcsApi()->enableReleaseAssets(); 56 57 56 } 58 57 } -
ht-pay-jp-for-kintone/trunk/includes/class-ht-payjp-for-kintone-Admin.php
r3195125 r3263998 84 84 85 85 if ( ! empty( $_POST ) && check_admin_referer( $this->nonce ) ) { 86 87 86 if ( $this->update() ) { 88 87 echo '<div class="updated notice is-dismissible"><p><strong>Success</strong></p></div>'; … … 270 269 'payjpforkintone-enabled' => 'disable', 271 270 'live-enabled' => false, 272 'three-d-secure' => 'disabled',273 271 ) 274 272 ); 275 273 276 274 $payjpforkintone_enabled = $payjpforkintone_setting_data['payjpforkintone-enabled']; 277 $three_d_secure = $payjpforkintone_setting_data['three-d-secure'];278 275 279 276 $payjpforkintone_language = 'ja'; 280 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) && $payjpforkintone_setting_data['payjpforkintone-language'] !== '' ){277 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) && $payjpforkintone_setting_data['payjpforkintone-language'] !== '' ) { 281 278 $payjpforkintone_language = $payjpforkintone_setting_data['payjpforkintone-language']; 282 279 } … … 345 342 </div> 346 343 <?php endif; ?> 347 348 <div class="field-wrap field-wrap-use-external-url">349 <lable>■ <?php esc_html_e( 'Setting 3D Secure', 'payjp-for-kintone' ); ?> (<a href="https://ht79.info/release/ht-pay-jp-for-kintone-1-6-0/" target="_blank">Setting Guide</a>)</lable>350 <fieldset>351 <select name="ht_payjpforkintone_setting_data[three-d-secure]" id="three-d-secure">352 <option value="disabled" <?php selected( $three_d_secure, 'disabled' ); ?>><?php esc_html_e( '3D Secure Disabled', 'payjp-for-kintone' ); ?></option>353 <option value="prerelease" <?php selected( $three_d_secure, 'prerelease' ); ?>><?php esc_html_e( '3D Secure with Prerelease (Available until April 30, 2025)', 'payjp-for-kintone' ); ?></option>354 <option value="enabled" <?php selected( $three_d_secure, 'enabled' ); ?>><?php esc_html_e( '3D Secure Enabled (Available from February 4, 2025)', 'payjp-for-kintone' ); ?></option>355 </select>356 </fieldset>357 </div>358 344 359 345 <div id="payjpforkintone-language-blocked" class="field-wrap field-wrap-use-external-url"> … … 423 409 <select name="ht_payjpforkintone_setting_data[payjp-fixed-subscription-month]" id="payjp-fixed-subscription-month"> 424 410 <option value="">month / day</option> 425 <?php for ( $month = 1; $month <= 12; $month ++ ) : ?>411 <?php for ( $month = 1; $month <= 12; $month ++ ) : ?> 426 412 <option value="<?php echo sprintf( '%02d', $month ); ?>-01" <?php selected( sprintf( '%02d', $month ) . '-01', $payjp_fixed_subscription_month ) ?>><?php echo sprintf( '%02d', $month ); ?>/01</option> 427 413 <?php endfor; ?> … … 430 416 <select name="ht_payjpforkintone_setting_data[payjp-fixed-subscription-time]" id="payjp-fixed-subscription-time"> 431 417 <option value="">time</option> 432 <?php for ( $hour = 0; $hour <= 23; $hour ++ ) : ?>418 <?php for ( $hour = 0; $hour <= 23; $hour ++ ) : ?> 433 419 <option value="<?php echo sprintf( '%02d', $hour ); ?>" <?php selected( sprintf( '%02d', $hour ), $payjp_fixed_subscription_time ) ?>><?php echo sprintf( '%02d', $hour ); ?>:00</option> 434 420 <?php endfor; ?> … … 602 588 } 603 589 } 604 -
ht-pay-jp-for-kintone/trunk/includes/class-ht-payjp-for-kintone-Payment.php
r3190331 r3263998 92 92 93 93 if ( isset( $posted_data['payjp-token'] ) && '' !== $posted_data['payjp-token'] ) { 94 95 94 $token = sanitize_text_field( wp_unslash( $posted_data['payjp-token'] ) ); 96 95 … … 120 119 // 都度決済. 121 120 try { 122 123 121 \Payjp\Payjp::setApiKey( $secret_key ); 124 122 … … 131 129 ) 132 130 ); 133 131 // 予期せぬエラーが発生するようにして 134 132 $this->payjp_charged_id = $charge->id; 135 133 // captured_at はUTCなので+9時間をする. … … 169 167 ) 170 168 ); 171 172 169 } catch ( \Payjp\Error\Card $e ) { 173 170 // カード決済エラーの場合 … … 175 172 $submission->set_response( $contact_form->filter_message( __( 'Card payment failed. Please check your card information.', 'payjp-for-kintone' ) ) ); 176 173 ht_payjp_for_kintone_send_error_mail( $contact_form, $e->getMessage() ); 177 178 174 } catch ( \Payjp\Error\InvalidRequest $e ) { 179 175 // その他のPAY.JPエラーの場合 … … 181 177 $submission->set_response( $contact_form->filter_message( $e->getMessage() ) ); 182 178 ht_payjp_for_kintone_send_error_mail( $contact_form, $e->getMessage() ); 183 184 } 179 } 185 180 } else { 186 181 // Error. -
ht-pay-jp-for-kintone/trunk/includes/class-ht-payjp-for-kintone-shortcode.php
r3195121 r3263998 62 62 63 63 $payjpforkintone_language = 'ja'; 64 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) ) {64 if ( isset( $payjpforkintone_setting_data['payjpforkintone-language'] ) ) { 65 65 $payjpforkintone_language= $payjpforkintone_setting_data['payjpforkintone-language']; 66 66 } 67 67 68 $three_d_secure = 'disabled'; 69 if ( isset( $payjpforkintone_setting_data['three-d-secure'] ) ) { 70 $three_d_secure = $payjpforkintone_setting_data['three-d-secure']; 71 } 72 73 if ( 'disabled' === $three_d_secure ) { 74 $html = '<script type="text/javascript" src="https://checkout.pay.jp/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" ></script > '; 75 } elseif ( 'prerelease' === $three_d_secure ) { 76 $html = '<script type="text/javascript" src="https://checkout.pay.jp/prerelease/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" data-payjp-three-d-secure="true" data-payjp-three-d-secure-workflow="subwindow" data-payjp-extra-attribute-email data-payjp-extra-attribute-phone ></script > '; 77 } else { 78 $html = '<script type="text/javascript" src="https://checkout.pay.jp/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" data-payjp-three-d-secure="true" data-payjp-three-d-secure-workflow="subwindow" data-payjp-extra-attribute-email data-payjp-extra-attribute-phone ></script > '; 79 } 68 $html = '<script type="text/javascript" src="https://checkout.pay.jp/" class="payjp-button" data-key="' . $public_key . '" data-partial="true" data-lang="'.$payjpforkintone_language.'" data-payjp-three-d-secure="true" data-payjp-three-d-secure-workflow="subwindow" data-payjp-extra-attribute-email data-payjp-extra-attribute-phone ></script > '; 80 69 81 70 return $html; -
ht-pay-jp-for-kintone/trunk/readme.txt
r3195125 r3263998 6 6 Tested up to: 6.7 7 7 Requires PHP: 7.4 8 Stable tag: 1. 6.18 Stable tag: 1.7.0 9 9 License: GPLv2 or later 10 10 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 55 55 == Changelog == 56 56 57 = 1.7.0( 2025-03-30 ) = 58 59 * Forced migration to 3D Secure 60 57 61 = 1.6.1( 2024-11-24 ) = 58 62 … … 73 77 74 78 * [Fixed]Handle case where 'description' setting is not provided 75 76 79 77 80 = 1.4.0( 2023-11-03 ) =
Note: See TracChangeset
for help on using the changeset viewer.