Changeset 2817601
- Timestamp:
- 11/14/2022 10:44:34 AM (3 years ago)
- Location:
- leyka/trunk
- Files:
-
- 7 edited
-
README.txt (modified) (2 diffs)
-
gateways/demirbank/leyka-class-demirbank-gateway.php (modified) (2 diffs)
-
gateways/yandex/leyka-class-yandex-gateway.php (modified) (2 diffs)
-
inc/admin-lists/leyka-class-recurring-subscriptions-list-table.php (modified) (5 diffs)
-
inc/leyka-admin.php (modified) (5 diffs)
-
leyka.php (modified) (2 diffs)
-
procedures/leyka-import-recurring-subscriptions-cp.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
leyka/trunk/README.txt
r2791996 r2817601 5 5 Tags: лейка, crowdfunding, fundraising, donations, recurring donations, charity, leyka, recurring, cloudpayments, webmoney, robokassa, rbk, rbkmoney, rbk-money, yoomoney, chronopay, sms, yookassa, миксплат, mixplat, paypal, paymaster, qiwi, киви, stripe, страйп, gds, google data studio 6 6 Requires at least: 3.6.1 7 Tested up to: 6. 0.27 Tested up to: 6.1 8 8 Stable tag: 3.29 9 9 License: GPLv2 or later … … 84 84 85 85 == Changelog == 86 = 3.29.1 = 87 * Fix: YooKassa compatibility fix for WP 6.1. 88 * Fix: Demirbank notices bug fixed. 89 * Fix: the custom admin info pages access error bug fixed. 90 * Fix: small fixes. 91 86 92 = 3.29 = 87 93 * New: Muli-currencies system added. -
leyka/trunk/gateways/demirbank/leyka-class-demirbank-gateway.php
r2791882 r2817601 193 193 protected function _set_success_page_content() { 194 194 195 add_filter('the_content', function ($content){195 add_filter('the_content', function($content){ 196 196 197 197 global $wp_query; 198 198 199 if((url_to_postid(leyka_get_success_page_url()) !== $wp_query->post->ID) || empty($_POST)) { 199 if( 200 empty($_POST) 201 || empty($_POST['donation_id']) 202 || (empty($wp_query) && empty($wp_query->post)) 203 || url_to_postid(leyka_get_success_page_url()) !== $wp_query->post->ID 204 ) { 200 205 return $content; 201 206 } … … 218 223 ], 219 224 [ 220 __( "Save", 'leyka'),221 __( "Send", 'leyka'),225 __('Save', 'leyka'), 226 __('Send', 'leyka'), 222 227 $donation->id, 223 228 sprintf(__("Card-check has been sent to <b> %s </b>", 'leyka'), $donation->donor_email), -
leyka/trunk/gateways/yandex/leyka-class-yandex-gateway.php
r2765108 r2817601 256 256 try { 257 257 258 $return_page_id = leyka_options()->opt('yandex_return_url'); 259 $home_url = home_url(); 260 $return_url = $return_page_id ? // Due to strange YooKassa SDK bug - it doesn't accept URLs w/o "/" at the end 261 get_post_permalink($return_page_id) : 262 (mb_substr($home_url, -1, 1) === '/' ? $home_url : $home_url.'/'); 263 258 264 $payment_data = [ 259 265 'amount' => [ … … 263 269 'confirmation' => [ 264 270 'type' => 'redirect', 265 'return_url' => get_post_permalink(leyka_options()->opt('yandex_return_url')),271 'return_url' => $return_url, 266 272 ], 267 273 'capture' => true, // Make payment at once, don't wait for shop confirmation -
leyka/trunk/inc/admin-lists/leyka-class-recurring-subscriptions-list-table.php
r2749335 r2817601 198 198 */ 199 199 function get_columns() { 200 return [200 return apply_filters('leyka_admin_recurring_subscriptions_list_columns', [ 201 201 'donation_id' => __('ID'), 202 202 'campaign' => __('Campaign', 'leyka'), … … 207 207 'amount' => __('Amount', 'leyka'), 208 208 'gateway_pm' => _x('Method', 'Recurring subscriptions list page: table column', 'leyka') 209 ] ;209 ]); 210 210 } 211 211 … … 214 214 */ 215 215 public function get_sortable_columns() { 216 return [216 return apply_filters('leyka_admin_recurring_subscriptions_list_sortable_columns', [ 217 217 'donation_id' => ['donation_id', true], 218 218 'donor' => ['donor_name', false], … … 221 221 'amount' => ['amount', true], 222 222 'gateway_pm' => ['gateway_pm', true] 223 ] ;223 ]); 224 224 } 225 225 … … 282 282 283 283 default: // Show the whole item array for troubleshooting purposes 284 return leyka_options()->opt('plugin_debug_mode') ? 285 '<pre>'.print_r($item, true).'</pre>' : // Show the whole array for troubleshooting purposes 286 apply_filters("leyka_admin_recurring_subscription_{$column_name}_column_content", '', $item); 284 return apply_filters("leyka_admin_recurring_subscription_{$column_name}_column_content", '', $item); 287 285 } 288 286 } -
leyka/trunk/inc/leyka-admin.php
r2750481 r2817601 484 484 // Fake pages: 485 485 add_submenu_page( 486 NULL,486 'leyka_donations', 487 487 __('New correctional donation', 'leyka'), 488 488 _x('Add new', '[donation]', 'leyka'), … … 493 493 494 494 add_submenu_page( 495 NULL,495 'leyka_recurring_subscriptions', 496 496 __('Recurring subscription info', 'leyka'), 497 497 __('Recurring subscription info', 'leyka'), … … 502 502 503 503 add_submenu_page( 504 NULL,504 'leyka_settings', 505 505 __('Leyka Wizard', 'leyka'), 506 506 __('Leyka Wizard', 'leyka'), … … 511 511 512 512 add_submenu_page( 513 NULL,513 'leyka_donors', 514 514 __("Donor's info", 'leyka'), 515 515 __("Donor's info", 'leyka'), … … 520 520 521 521 add_submenu_page( 522 NULL,522 'leyka_settings', 523 523 __('Extension settings', 'leyka'), 524 524 __('Extension settings', 'leyka'), -
leyka/trunk/leyka.php
r2791882 r2817601 5 5 * Plugin URI: https://leyka.te-st.ru/ 6 6 * Description: Donations management system for your WP site. For NGOs and social projects. 7 * Version: 3.29 7 * Version: 3.29.1 8 8 * Author: Teplitsa of social technologies 9 9 * Author URI: https://te-st.ru … … 40 40 // Leyka plugin version: 41 41 if( !defined('LEYKA_VERSION') ) { 42 define('LEYKA_VERSION', '3.29 ');42 define('LEYKA_VERSION', '3.29.1'); 43 43 } 44 44 -
leyka/trunk/procedures/leyka-import-recurring-subscriptions-cp.php
r2791882 r2817601 48 48 continue; 49 49 } 50 if( !in_array($subscription_data[2], ['Работает', ]) ) {50 if( !in_array($subscription_data[2], ['Работает','Просрочена',]) ) { // "Просроченные" subscriptions are still active 51 51 continue; 52 52 } … … 54 54 // $subscription_data[0] - CP subscription ID 55 55 // $subscription_data[1] - Date/time of subscription creation (and for it's rebills) 56 // $subscription_data[2] - Subscription status (in russian, i.e. "Работает ")56 // $subscription_data[2] - Subscription status (in russian, i.e. "Работает/Просрочена") 57 57 // $subscription_data[3] - Subscription amount 58 58 // $subscription_data[4] - Subscription currency (CP symbols, i.e. "₽")
Note: See TracChangeset
for help on using the changeset viewer.